Normalise include statements in core code (#11153)

* Normalise include statements in core code * Missed one
2020-12-11 13:45:24 +11:00
parent 63d0fe05bb
commit 8d5fa95f4f
48 changed files with 67 additions and 67 deletions
--- a/drivers/chibios/analog.c
+++ b/drivers/chibios/analog.c
@@ -16,7 +16,7 @@

 #include "quantum.h"
 #include "analog.h"
-#include "ch.h"
+#include <ch.h>
 #include <hal.h>

 #if !HAL_USE_ADC
--- a/drivers/chibios/i2c_master.h
+++ b/drivers/chibios/i2c_master.h
@@ -24,7 +24,7 @@
 */
 #pragma once

-#include "ch.h"
+#include <ch.h>
 #include <hal.h>

 #ifdef I2C1_BANK
--- a/drivers/chibios/serial.c
+++ b/drivers/chibios/serial.c
@@ -6,7 +6,7 @@
 #include "serial.h"
 #include "wait.h"

-#include "hal.h"
+#include <hal.h>

 // TODO: resolve/remove build warnings
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG)
--- a/drivers/chibios/serial_usart.c
+++ b/drivers/chibios/serial_usart.c
@@ -2,8 +2,8 @@
 #include "serial.h"
 #include "printf.h"

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #ifndef USART_CR1_M0
 #    define USART_CR1_M0 USART_CR1_M  // some platforms (f1xx) dont have this so
--- a/drivers/chibios/spi_master.h
+++ b/drivers/chibios/spi_master.h
@@ -18,7 +18,7 @@

 #include <ch.h>
 #include <hal.h>
-#include <quantum.h>
+#include "quantum.h"

 #ifndef SPI_DRIVER
 #    define SPI_DRIVER SPID2
--- a/drivers/chibios/ws2812.c
+++ b/drivers/chibios/ws2812.c
@@ -1,7 +1,7 @@
 #include "quantum.h"
 #include "ws2812.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */

--- a/drivers/chibios/ws2812_pwm.c
+++ b/drivers/chibios/ws2812_pwm.c
@@ -1,6 +1,6 @@
 #include "ws2812.h"
 #include "quantum.h"
-#include "hal.h"
+#include <hal.h>

 /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */

--- a/drivers/eeprom/eeprom_stm32_L0_L1.c
+++ b/drivers/eeprom/eeprom_stm32_L0_L1.c
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <string.h>

-#include "hal.h"
+#include <hal.h>
 #include "eeprom_driver.h"
 #include "eeprom_stm32_L0_L1.h"

--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <timer.h>
+#include "timer.h"
 #include "solenoid.h"
 #include "haptic.h"

--- a/drivers/qwiic/micro_oled.c
+++ b/drivers/qwiic/micro_oled.c
@@ -28,7 +28,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "micro_oled.h"
-#include <print.h>
+#include "print.h"
 #include <stdlib.h>
 #include "util/font5x7.h"
 #include "util/font8x16.h"
--- a/platforms/chibios/GENERIC_STM32_F042X6/board/board.c
+++ b/platforms/chibios/GENERIC_STM32_F042X6/board/board.c
@@ -19,8 +19,8 @@
 * generator plugin. Do not edit manually.
 */

-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>

 /*===========================================================================*/
 /* Driver local definitions.                                                 */
--- a/platforms/chibios/IC_TEENSY_3_1/board/board.c
+++ b/platforms/chibios/IC_TEENSY_3_1/board/board.c
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
-#include "hal.h"
+#include <hal.h>

 #if HAL_USE_PAL || defined(__DOXYGEN__)
 /**
--- a/platforms/chibios/STM32_F103_STM32DUINO/board/board.c
+++ b/platforms/chibios/STM32_F103_STM32DUINO/board/board.c
@@ -14,7 +14,7 @@
    limitations under the License.
 */

-#include "hal.h"
+#include <hal.h>

 // Value to place in RTC backup register 10 for persistent bootloader mode
 #define RTC_BOOTLOADER_FLAG 0x424C
--- a/quantum/audio/audio_chibios.c
+++ b/quantum/audio/audio_chibios.c
@@ -15,8 +15,8 @@
 */

 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #include <string.h>
 #include "print.h"
--- a/quantum/audio/luts.h
+++ b/quantum/audio/luts.h
@@ -19,8 +19,8 @@
 #    include <avr/interrupt.h>
 #    include <avr/pgmspace.h>
 #else
-#    include "ch.h"
-#    include "hal.h"
+#    include <ch.h>
+#    include <hal.h>
 #endif

 #ifndef LUTS_H
--- a/quantum/fauxclicky.c
+++ b/quantum/fauxclicky.c
@@ -15,10 +15,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include <timer.h>
-#include <fauxclicky.h>
+#include "timer.h"
+#include "fauxclicky.h"
 #include <stdbool.h>
-#include <musical_notes.h>
+#include "musical_notes.h"

 bool     fauxclicky_enabled = true;
 uint16_t note_start         = 0;
--- a/quantum/fauxclicky.h
+++ b/quantum/fauxclicky.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif

 #include "musical_notes.h"
-#include "stdbool.h"
+#include <stdbool.h>

 __attribute__((weak)) float fauxclicky_pressed_note[2]  = MUSICAL_NOTE(_D4, 0.25);
 __attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125);
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include <avr/pgmspace.h>
 #elif defined PROTOCOL_CHIBIOS
 // We need to ensure that chibios is include before redefining reset
-#    include "ch.h"
+#    include <ch.h>
 #endif
 #include "keycode.h"
 #include "action_macro.h"
--- a/quantum/process_keycode/process_key_lock.c
+++ b/quantum/process_keycode/process_key_lock.c
@@ -14,8 +14,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "inttypes.h"
-#include "stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 #include "process_key_lock.h"

 #define BV_64(shift) (((uint64_t)1) << (shift))
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -21,7 +21,7 @@
 #    include <avr/interrupt.h>
 #endif
 #if defined(PROTOCOL_CHIBIOS)
-#    include "hal.h"
+#    include <hal.h>
 #    include "chibios_config.h"
 #endif

--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <math.h>

-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>

 #ifndef RGB_MATRIX_CENTER
 const point_t k_rgb_matrix_center = {112, 32};
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -24,7 +24,7 @@
 #    include "eeprom.h"
 #endif
 #ifdef STM32_EEPROM_ENABLE
-#    include "hal.h"
+#    include <hal.h>
 #    include "eeprom_stm32.h"
 #endif
 #include "wait.h"
@@ -34,7 +34,7 @@
 #include "color.h"
 #include "debug.h"
 #include "led_tables.h"
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
 #ifdef VELOCIKEY_ENABLE
 #    include "velocikey.h"
 #endif
@@ -985,7 +985,7 @@ void rgblight_task(void) {
 #        ifndef RGBLIGHT_BREATHE_TABLE_SIZE
 #            define RGBLIGHT_BREATHE_TABLE_SIZE 256  // 256 or 128 or 64
 #        endif
-#        include <rgblight_breathe_table.h>
+#        include "rgblight_breathe_table.h"
 #    endif

 __attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
--- a/quantum/serial_link/system/serial_link.c
+++ b/quantum/serial_link/system/serial_link.c
@@ -24,7 +24,7 @@ SOFTWARE.
 #include "report.h"
 #include "host_driver.h"
 #include "serial_link/system/serial_link.h"
-#include "hal.h"
+#include <hal.h>
 #include "serial_link/protocol/byte_stuffer.h"
 #include "serial_link/protocol/transport.h"
 #include "serial_link/protocol/frame_router.h"
--- a/quantum/serial_link/system/serial_link.h
+++ b/quantum/serial_link/system/serial_link.h
@@ -36,7 +36,7 @@ host_driver_t* get_serial_link_driver(void);
 void           serial_link_update(void);

 #if defined(PROTOCOL_CHIBIOS)
-#    include "ch.h"
+#    include <ch.h>

 static inline void serial_link_lock(void) { chSysLock(); }

--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -12,7 +12,7 @@
 #endif

 #ifdef PROTOCOL_VUSB
-#    include "usbdrv.h"
+#    include <usbdrv/usbdrv.h>
 #endif

 #ifdef EE_HANDS
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -1,6 +1,6 @@
 #pragma once

-#include <common/matrix.h>
+#include "common/matrix.h"

 void transport_master_init(void);
 void transport_slave_init(void);
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -16,7 +16,7 @@

 #pragma once

-#include <tmk_core/common/eeconfig.h>  // for EECONFIG_SIZE
+#include "tmk_core/common/eeconfig.h"  // for EECONFIG_SIZE

 // Keyboard level code can change where VIA stores the magic.
 // The magic is the build date YYMMDD encoded as BCD in 3 bytes,
--- a/quantum/visualizer/lcd_backlight.h
+++ b/quantum/visualizer/lcd_backlight.h
@@ -24,7 +24,7 @@ SOFTWARE.

 #ifndef LCD_BACKLIGHT_H_
 #define LCD_BACKLIGHT_H_
-#include "stdint.h"
+#include <stdint.h>

 // Helper macros for storing hue, staturation and intensity as unsigned integers
 #define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity)
--- a/quantum/visualizer/led_backlight_keyframes.c
+++ b/quantum/visualizer/led_backlight_keyframes.c
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 #include "gfx.h"
-#include "math.h"
+#include <math.h>
 #include "led_backlight_keyframes.h"

 static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) {
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "visualizer.h"
 #include <string.h>
 #ifdef PROTOCOL_CHIBIOS
-#    include "ch.h"
+#    include <ch.h>
 #endif

 #include "gfx.h"
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -48,7 +48,7 @@ int retro_tapping_counter = 0;
 #endif

 #ifdef FAUXCLICKY_ENABLE
-#    include <fauxclicky.h>
+#    include "fauxclicky.h"
 #endif

 #ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -1,7 +1,7 @@
 #include "bootloader.h"

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "wait.h"

 /* This code should be checked whether it runs correctly on platforms */
--- a/tmk_core/common/chibios/eeprom_stm32.h
+++ b/tmk_core/common/chibios/eeprom_stm32.h
@@ -24,8 +24,8 @@
 #ifndef __EEPROM_H
 #define __EEPROM_H

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "flash_stm32.h"

 // HACK ALERT. This definition may not match your processor
--- a/tmk_core/common/chibios/eeprom_teensy.c
+++ b/tmk_core/common/chibios/eeprom_teensy.c
@@ -1,5 +1,5 @@
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #include "eeconfig.h"

--- a/tmk_core/common/chibios/flash_stm32.h
+++ b/tmk_core/common/chibios/flash_stm32.h
@@ -23,8 +23,8 @@
 extern "C" {
 #endif

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 typedef enum { FLASH_BUSY = 1, FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_ERROR_OPT, FLASH_COMPLETE, FLASH_TIMEOUT, FLASH_BAD_ADDRESS } FLASH_Status;

--- a/tmk_core/common/chibios/sleep_led.c
+++ b/tmk_core/common/chibios/sleep_led.c
@@ -1,5 +1,5 @@
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #include "led.h"
 #include "sleep_led.h"
--- a/tmk_core/common/chibios/suspend.c
+++ b/tmk_core/common/chibios/suspend.c
@@ -1,7 +1,7 @@
 /* TODO */

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #include "matrix.h"
 #include "action.h"
--- a/tmk_core/common/chibios/timer.c
+++ b/tmk_core/common/chibios/timer.c
@@ -1,4 +1,4 @@
-#include "ch.h"
+#include <ch.h>

 #include "timer.h"

--- a/tmk_core/common/eeconfig.c
+++ b/tmk_core/common/eeconfig.c
@@ -7,7 +7,7 @@
 #    include "oryx.h"
 #endif
 #ifdef STM32_EEPROM_ENABLE
-#    include "hal.h"
+#    include <hal.h>
 #    include "eeprom_stm32.h"
 #endif

--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -12,7 +12,7 @@ extern "C" {
 #    define wait_ms(ms) _delay_ms(ms)
 #    define wait_us(us) _delay_us(us)
 #elif defined PROTOCOL_CHIBIOS
-#    include "ch.h"
+#    include <ch.h>
 #    define wait_ms(ms)                     \
        do {                                \
            if (ms != 0) {                  \
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -15,8 +15,8 @@
 * GPL v2 or later.
 */

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #include "usb_main.h"

--- a/tmk_core/protocol/chibios/usb_driver.c
+++ b/tmk_core/protocol/chibios/usb_driver.c
@@ -22,7 +22,7 @@
 * @{
 */

-#include "hal.h"
+#include <hal.h>
 #include "usb_driver.h"
 #include <string.h>

--- a/tmk_core/protocol/chibios/usb_driver.h
+++ b/tmk_core/protocol/chibios/usb_driver.h
@@ -25,7 +25,7 @@
 #ifndef USB_DRIVER_H
 #    define USB_DRIVER_H

-#    include "hal_usb_cdc.h"
+#    include <hal_usb_cdc.h>

 /*===========================================================================*/
 /* Driver constants.                                                         */
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -25,8 +25,8 @@
 *   makes the assumption this is safe to avoid littering with preprocessor directives.
 */

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 #include "usb_main.h"

--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -21,8 +21,8 @@
 // TESTING
 // extern uint8_t blinkLed;

-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>

 /* -------------------------
 * General USB driver header
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -61,7 +61,7 @@ extern keymap_config_t keymap_config;
 #endif

 #ifdef AUDIO_ENABLE
-#    include <audio.h>
+#    include "audio.h"
 #endif

 #ifdef BLUETOOTH_ENABLE
--- a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
+++ b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
@@ -32,7 +32,7 @@ interrupt_setting_t store_and_clear_interrupt(void) {

 void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; }
 #elif defined(__arm__)
-#    include "ch.h"
+#    include <ch.h>

 interrupt_setting_t store_and_clear_interrupt(void) {
    chSysLock();
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -46,7 +46,7 @@
 #include <LUFA/Drivers/USB/USB.h>

 #ifdef PROTOCOL_CHIBIOS
-#    include "hal.h"
+#    include <hal.h>
 #endif
 #ifdef WEBUSB_ENABLE
 #include "webusb_descriptor.h"