summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-11 02:46:19 +0000
committerQMK Bot <hello@qmk.fm>2020-12-11 02:46:19 +0000
commitfdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch)
tree9524405fef6cc3b16965517735dc0ef315f67ab1 /tmk_core
parented76f4394fd95413f7da11e2342b0965182ccb95 (diff)
parent501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action.c2
-rw-r--r--tmk_core/common/chibios/bootloader.c4
-rw-r--r--tmk_core/common/chibios/eeprom_stm32.h4
-rw-r--r--tmk_core/common/chibios/eeprom_teensy.c4
-rw-r--r--tmk_core/common/chibios/flash_stm32.h4
-rw-r--r--tmk_core/common/chibios/sleep_led.c4
-rw-r--r--tmk_core/common/chibios/suspend.c4
-rw-r--r--tmk_core/common/chibios/timer.c2
-rw-r--r--tmk_core/common/eeconfig.c2
-rw-r--r--tmk_core/common/wait.h2
-rw-r--r--tmk_core/protocol/chibios/main.c4
-rw-r--r--tmk_core/protocol/chibios/usb_driver.c2
-rw-r--r--tmk_core/protocol/chibios/usb_driver.h2
-rw-r--r--tmk_core/protocol/chibios/usb_main.c4
-rw-r--r--tmk_core/protocol/chibios/usb_main.h4
-rw-r--r--tmk_core/protocol/lufa/lufa.c2
-rw-r--r--tmk_core/protocol/midi/bytequeue/interrupt_setting.c2
-rw-r--r--tmk_core/protocol/usb_descriptor.h2
18 files changed, 27 insertions, 27 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 77da0139f2..a7432bae59 100644
--- 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
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index f6d016ec9d..6cabcc4b81 100644
--- 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 */
diff --git a/tmk_core/common/chibios/eeprom_stm32.h b/tmk_core/common/chibios/eeprom_stm32.h
index ea0ce06400..373325cd2f 100644
--- 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
diff --git a/tmk_core/common/chibios/eeprom_teensy.c b/tmk_core/common/chibios/eeprom_teensy.c
index d436d0cb95..e135e19a21 100644
--- 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"
diff --git a/tmk_core/common/chibios/flash_stm32.h b/tmk_core/common/chibios/flash_stm32.h
index 33ab7867da..8a874f6065 100644
--- 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;
diff --git a/tmk_core/common/chibios/sleep_led.c b/tmk_core/common/chibios/sleep_led.c
index df1a1b5fcd..18c6d6e170 100644
--- 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"
diff --git a/tmk_core/common/chibios/suspend.c b/tmk_core/common/chibios/suspend.c
index 64dfc05abc..24efb0ac4c 100644
--- 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"
diff --git a/tmk_core/common/chibios/timer.c b/tmk_core/common/chibios/timer.c
index ac5a5af638..9f664e1f79 100644
--- 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"
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c
index e15897552f..5e3ebe6ee6 100644
--- a/tmk_core/common/eeconfig.c
+++ b/tmk_core/common/eeconfig.c
@@ -5,7 +5,7 @@
#include "action_layer.h"
#ifdef STM32_EEPROM_ENABLE
-# include "hal.h"
+# include <hal.h>
# include "eeprom_stm32.h"
#endif
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index c82cd2d65a..f5ef12ac07 100644
--- 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) { \
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 400c0b8f53..b99a40f1e0 100644
--- 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"
diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c
index 22d3c91f5a..cc0ce7600f 100644
--- 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>
diff --git a/tmk_core/protocol/chibios/usb_driver.h b/tmk_core/protocol/chibios/usb_driver.h
index 77dff80669..6d71bcec4f 100644
--- 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. */
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index bb4bf6a580..096e6e676e 100644
--- 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"
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index d8813f4801..1381d07654 100644
--- 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
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 878be7d342..8fd4be8af5 100644
--- 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
diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
index 1be1fee973..407cc65f49 100644
--- 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();
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index aa8863f43f..1b43cbf3b2 100644
--- 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
/*