diff options
author | Ryan <fauxpark@gmail.com> | 2020-12-11 13:45:24 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-11 13:45:24 +1100 |
commit | 501f2fdef115314713e94428d409e5c3b5bfc1c2 (patch) | |
tree | e454192658ed0000d1d814e2eab492410febe98f /quantum | |
parent | 5b5d74a2677c281d12cd69825d2e252842786667 (diff) | |
download | qmk_firmware-501f2fdef115314713e94428d409e5c3b5bfc1c2.tar.gz qmk_firmware-501f2fdef115314713e94428d409e5c3b5bfc1c2.zip |
Normalise include statements in core code (#11153)
* Normalise include statements in core code
* Missed one
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/audio/audio_chibios.c | 4 | ||||
-rw-r--r-- | quantum/audio/luts.h | 4 | ||||
-rw-r--r-- | quantum/fauxclicky.c | 6 | ||||
-rw-r--r-- | quantum/fauxclicky.h | 2 | ||||
-rw-r--r-- | quantum/keymap.h | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_key_lock.c | 4 | ||||
-rw-r--r-- | quantum/quantum.h | 2 | ||||
-rw-r--r-- | quantum/rgb_matrix.c | 2 | ||||
-rw-r--r-- | quantum/rgblight.c | 6 | ||||
-rw-r--r-- | quantum/serial_link/system/serial_link.c | 2 | ||||
-rw-r--r-- | quantum/serial_link/system/serial_link.h | 2 | ||||
-rw-r--r-- | quantum/split_common/split_util.c | 2 | ||||
-rw-r--r-- | quantum/split_common/transport.h | 2 | ||||
-rw-r--r-- | quantum/via.h | 2 | ||||
-rw-r--r-- | quantum/visualizer/lcd_backlight.h | 2 | ||||
-rw-r--r-- | quantum/visualizer/led_backlight_keyframes.c | 2 | ||||
-rw-r--r-- | quantum/visualizer/visualizer.c | 2 |
17 files changed, 24 insertions, 24 deletions
diff --git a/quantum/audio/audio_chibios.c b/quantum/audio/audio_chibios.c index fba7c5987..1f147f2c9 100644 --- a/quantum/audio/audio_chibios.c +++ b/quantum/audio/audio_chibios.c | |||
@@ -15,8 +15,8 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "audio.h" | 17 | #include "audio.h" |
18 | #include "ch.h" | 18 | #include <ch.h> |
19 | #include "hal.h" | 19 | #include <hal.h> |
20 | 20 | ||
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include "print.h" | 22 | #include "print.h" |
diff --git a/quantum/audio/luts.h b/quantum/audio/luts.h index 117d74cd0..6fdd3b463 100644 --- a/quantum/audio/luts.h +++ b/quantum/audio/luts.h | |||
@@ -19,8 +19,8 @@ | |||
19 | # include <avr/interrupt.h> | 19 | # include <avr/interrupt.h> |
20 | # include <avr/pgmspace.h> | 20 | # include <avr/pgmspace.h> |
21 | #else | 21 | #else |
22 | # include "ch.h" | 22 | # include <ch.h> |
23 | # include "hal.h" | 23 | # include <hal.h> |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #ifndef LUTS_H | 26 | #ifndef LUTS_H |
diff --git a/quantum/fauxclicky.c b/quantum/fauxclicky.c index a57e2ed07..53499c9c1 100644 --- a/quantum/fauxclicky.c +++ b/quantum/fauxclicky.c | |||
@@ -15,10 +15,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
15 | 15 | ||
16 | #include <avr/interrupt.h> | 16 | #include <avr/interrupt.h> |
17 | #include <avr/io.h> | 17 | #include <avr/io.h> |
18 | #include <timer.h> | 18 | #include "timer.h" |
19 | #include <fauxclicky.h> | 19 | #include "fauxclicky.h" |
20 | #include <stdbool.h> | 20 | #include <stdbool.h> |
21 | #include <musical_notes.h> | 21 | #include "musical_notes.h" |
22 | 22 | ||
23 | bool fauxclicky_enabled = true; | 23 | bool fauxclicky_enabled = true; |
24 | uint16_t note_start = 0; | 24 | uint16_t note_start = 0; |
diff --git a/quantum/fauxclicky.h b/quantum/fauxclicky.h index 5c056918a..bfaacf909 100644 --- a/quantum/fauxclicky.h +++ b/quantum/fauxclicky.h | |||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #include "musical_notes.h" | 20 | #include "musical_notes.h" |
21 | #include "stdbool.h" | 21 | #include <stdbool.h> |
22 | 22 | ||
23 | __attribute__((weak)) float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_D4, 0.25); | 23 | __attribute__((weak)) float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_D4, 0.25); |
24 | __attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125); | 24 | __attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125); |
diff --git a/quantum/keymap.h b/quantum/keymap.h index de3bece11..90a2398ba 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
25 | # include <avr/pgmspace.h> | 25 | # include <avr/pgmspace.h> |
26 | #elif defined PROTOCOL_CHIBIOS | 26 | #elif defined PROTOCOL_CHIBIOS |
27 | // We need to ensure that chibios is include before redefining reset | 27 | // We need to ensure that chibios is include before redefining reset |
28 | # include "ch.h" | 28 | # include <ch.h> |
29 | #endif | 29 | #endif |
30 | #include "keycode.h" | 30 | #include "keycode.h" |
31 | #include "action_macro.h" | 31 | #include "action_macro.h" |
diff --git a/quantum/process_keycode/process_key_lock.c b/quantum/process_keycode/process_key_lock.c index 602127a74..4bd58f0c1 100644 --- a/quantum/process_keycode/process_key_lock.c +++ b/quantum/process_keycode/process_key_lock.c | |||
@@ -14,8 +14,8 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "inttypes.h" | 17 | #include <inttypes.h> |
18 | #include "stdint.h" | 18 | #include <stdint.h> |
19 | #include "process_key_lock.h" | 19 | #include "process_key_lock.h" |
20 | 20 | ||
21 | #define BV_64(shift) (((uint64_t)1) << (shift)) | 21 | #define BV_64(shift) (((uint64_t)1) << (shift)) |
diff --git a/quantum/quantum.h b/quantum/quantum.h index cb0af306a..3e09df4f8 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h | |||
@@ -21,7 +21,7 @@ | |||
21 | # include <avr/interrupt.h> | 21 | # include <avr/interrupt.h> |
22 | #endif | 22 | #endif |
23 | #if defined(PROTOCOL_CHIBIOS) | 23 | #if defined(PROTOCOL_CHIBIOS) |
24 | # include "hal.h" | 24 | # include <hal.h> |
25 | # include "chibios_config.h" | 25 | # include "chibios_config.h" |
26 | #endif | 26 | #endif |
27 | 27 | ||
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c index f239bd582..c756857ae 100644 --- a/quantum/rgb_matrix.c +++ b/quantum/rgb_matrix.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <string.h> | 23 | #include <string.h> |
24 | #include <math.h> | 24 | #include <math.h> |
25 | 25 | ||
26 | #include "lib/lib8tion/lib8tion.h" | 26 | #include <lib/lib8tion/lib8tion.h> |
27 | 27 | ||
28 | #ifndef RGB_MATRIX_CENTER | 28 | #ifndef RGB_MATRIX_CENTER |
29 | const point_t k_rgb_matrix_center = {112, 32}; | 29 | const point_t k_rgb_matrix_center = {112, 32}; |
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 7f9e330d3..e6f14487c 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c | |||
@@ -24,7 +24,7 @@ | |||
24 | # include "eeprom.h" | 24 | # include "eeprom.h" |
25 | #endif | 25 | #endif |
26 | #ifdef STM32_EEPROM_ENABLE | 26 | #ifdef STM32_EEPROM_ENABLE |
27 | # include "hal.h" | 27 | # include <hal.h> |
28 | # include "eeprom_stm32.h" | 28 | # include "eeprom_stm32.h" |
29 | #endif | 29 | #endif |
30 | #include "wait.h" | 30 | #include "wait.h" |
@@ -34,7 +34,7 @@ | |||
34 | #include "color.h" | 34 | #include "color.h" |
35 | #include "debug.h" | 35 | #include "debug.h" |
36 | #include "led_tables.h" | 36 | #include "led_tables.h" |
37 | #include "lib/lib8tion/lib8tion.h" | 37 | #include <lib/lib8tion/lib8tion.h> |
38 | #ifdef VELOCIKEY_ENABLE | 38 | #ifdef VELOCIKEY_ENABLE |
39 | # include "velocikey.h" | 39 | # include "velocikey.h" |
40 | #endif | 40 | #endif |
@@ -983,7 +983,7 @@ void rgblight_task(void) { | |||
983 | # ifndef RGBLIGHT_BREATHE_TABLE_SIZE | 983 | # ifndef RGBLIGHT_BREATHE_TABLE_SIZE |
984 | # define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64 | 984 | # define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64 |
985 | # endif | 985 | # endif |
986 | # include <rgblight_breathe_table.h> | 986 | # include "rgblight_breathe_table.h" |
987 | # endif | 987 | # endif |
988 | 988 | ||
989 | __attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; | 989 | __attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; |
diff --git a/quantum/serial_link/system/serial_link.c b/quantum/serial_link/system/serial_link.c index c59c06894..f77483ad8 100644 --- a/quantum/serial_link/system/serial_link.c +++ b/quantum/serial_link/system/serial_link.c | |||
@@ -24,7 +24,7 @@ SOFTWARE. | |||
24 | #include "report.h" | 24 | #include "report.h" |
25 | #include "host_driver.h" | 25 | #include "host_driver.h" |
26 | #include "serial_link/system/serial_link.h" | 26 | #include "serial_link/system/serial_link.h" |
27 | #include "hal.h" | 27 | #include <hal.h> |
28 | #include "serial_link/protocol/byte_stuffer.h" | 28 | #include "serial_link/protocol/byte_stuffer.h" |
29 | #include "serial_link/protocol/transport.h" | 29 | #include "serial_link/protocol/transport.h" |
30 | #include "serial_link/protocol/frame_router.h" | 30 | #include "serial_link/protocol/frame_router.h" |
diff --git a/quantum/serial_link/system/serial_link.h b/quantum/serial_link/system/serial_link.h index f48fbe9ea..b6a473957 100644 --- 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); | |||
36 | void serial_link_update(void); | 36 | void serial_link_update(void); |
37 | 37 | ||
38 | #if defined(PROTOCOL_CHIBIOS) | 38 | #if defined(PROTOCOL_CHIBIOS) |
39 | # include "ch.h" | 39 | # include <ch.h> |
40 | 40 | ||
41 | static inline void serial_link_lock(void) { chSysLock(); } | 41 | static inline void serial_link_lock(void) { chSysLock(); } |
42 | 42 | ||
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index e8e944d71..97d49961d 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #ifdef PROTOCOL_VUSB | 14 | #ifdef PROTOCOL_VUSB |
15 | # include "usbdrv.h" | 15 | # include <usbdrv/usbdrv.h> |
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #ifdef EE_HANDS | 18 | #ifdef EE_HANDS |
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index ccce57e44..f3e752bf9 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | 2 | ||
3 | #include <common/matrix.h> | 3 | #include "common/matrix.h" |
4 | 4 | ||
5 | void transport_master_init(void); | 5 | void transport_master_init(void); |
6 | void transport_slave_init(void); | 6 | void transport_slave_init(void); |
diff --git a/quantum/via.h b/quantum/via.h index 373843f90..d0510fcab 100644 --- a/quantum/via.h +++ b/quantum/via.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #pragma once | 17 | #pragma once |
18 | 18 | ||
19 | #include <tmk_core/common/eeconfig.h> // for EECONFIG_SIZE | 19 | #include "tmk_core/common/eeconfig.h" // for EECONFIG_SIZE |
20 | 20 | ||
21 | // Keyboard level code can change where VIA stores the magic. | 21 | // Keyboard level code can change where VIA stores the magic. |
22 | // The magic is the build date YYMMDD encoded as BCD in 3 bytes, | 22 | // The magic is the build date YYMMDD encoded as BCD in 3 bytes, |
diff --git a/quantum/visualizer/lcd_backlight.h b/quantum/visualizer/lcd_backlight.h index 7b0b6a9fd..0a1535edf 100644 --- a/quantum/visualizer/lcd_backlight.h +++ b/quantum/visualizer/lcd_backlight.h | |||
@@ -24,7 +24,7 @@ SOFTWARE. | |||
24 | 24 | ||
25 | #ifndef LCD_BACKLIGHT_H_ | 25 | #ifndef LCD_BACKLIGHT_H_ |
26 | #define LCD_BACKLIGHT_H_ | 26 | #define LCD_BACKLIGHT_H_ |
27 | #include "stdint.h" | 27 | #include <stdint.h> |
28 | 28 | ||
29 | // Helper macros for storing hue, staturation and intensity as unsigned integers | 29 | // Helper macros for storing hue, staturation and intensity as unsigned integers |
30 | #define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity) | 30 | #define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity) |
diff --git a/quantum/visualizer/led_backlight_keyframes.c b/quantum/visualizer/led_backlight_keyframes.c index d81117d2b..338ada522 100644 --- 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 | |||
22 | SOFTWARE. | 22 | SOFTWARE. |
23 | */ | 23 | */ |
24 | #include "gfx.h" | 24 | #include "gfx.h" |
25 | #include "math.h" | 25 | #include <math.h> |
26 | #include "led_backlight_keyframes.h" | 26 | #include "led_backlight_keyframes.h" |
27 | 27 | ||
28 | static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) { | 28 | static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) { |
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 9e9cb6d41..709affbb7 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c | |||
@@ -26,7 +26,7 @@ SOFTWARE. | |||
26 | #include "visualizer.h" | 26 | #include "visualizer.h" |
27 | #include <string.h> | 27 | #include <string.h> |
28 | #ifdef PROTOCOL_CHIBIOS | 28 | #ifdef PROTOCOL_CHIBIOS |
29 | # include "ch.h" | 29 | # include <ch.h> |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include "gfx.h" | 32 | #include "gfx.h" |