diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-09 08:56:17 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-09 08:56:17 +0000 |
| commit | 5689df74902ca0e6c484c8c10dc7f21571d18d22 (patch) | |
| tree | ca1f3ec6325898ed8db690c933dd5d250da1fc8d /platforms | |
| parent | cc14d32941f603f8ea9da8778f3537f971cc849c (diff) | |
| parent | 01c7108db52677c2a4210bcda0afd2b1d3f7619f (diff) | |
| download | qmk_firmware-5689df74902ca0e6c484c8c10dc7f21571d18d22.tar.gz qmk_firmware-5689df74902ca0e6c484c8c10dc7f21571d18d22.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'platforms')
4 files changed, 4 insertions, 4 deletions
diff --git a/platforms/chibios/keyboard-config-templates/board.h b/platforms/chibios/keyboard-config-templates/board.h index 967ec13a1..5b840c389 100644 --- a/platforms/chibios/keyboard-config-templates/board.h +++ b/platforms/chibios/keyboard-config-templates/board.h | |||
| @@ -15,6 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #pragma once | 16 | #pragma once |
| 17 | 17 | ||
| 18 | #include_next "board.h" | 18 | #include_next <board.h> |
| 19 | 19 | ||
| 20 | // #undef STM32_HSE_BYPASS | 20 | // #undef STM32_HSE_BYPASS |
diff --git a/platforms/chibios/keyboard-config-templates/chconf.h b/platforms/chibios/keyboard-config-templates/chconf.h index 7c2af93f5..fca444747 100644 --- a/platforms/chibios/keyboard-config-templates/chconf.h +++ b/platforms/chibios/keyboard-config-templates/chconf.h | |||
| @@ -17,4 +17,4 @@ | |||
| 17 | 17 | ||
| 18 | // #define CH_CFG_OPTIMIZE_SPEED TRUE | 18 | // #define CH_CFG_OPTIMIZE_SPEED TRUE |
| 19 | 19 | ||
| 20 | #include_next "chconf.h" | 20 | #include_next <chconf.h> |
diff --git a/platforms/chibios/keyboard-config-templates/halconf.h b/platforms/chibios/keyboard-config-templates/halconf.h index ab5f738f9..456020f16 100644 --- a/platforms/chibios/keyboard-config-templates/halconf.h +++ b/platforms/chibios/keyboard-config-templates/halconf.h | |||
| @@ -17,4 +17,4 @@ | |||
| 17 | 17 | ||
| 18 | // #define HAL_USE_DAC TRUE | 18 | // #define HAL_USE_DAC TRUE |
| 19 | 19 | ||
| 20 | #include_next "halconf.h" | 20 | #include_next <halconf.h> |
diff --git a/platforms/chibios/keyboard-config-templates/mcuconf.h b/platforms/chibios/keyboard-config-templates/mcuconf.h index 5b42747b9..c690b02f4 100644 --- a/platforms/chibios/keyboard-config-templates/mcuconf.h +++ b/platforms/chibios/keyboard-config-templates/mcuconf.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #pragma once | 16 | #pragma once |
| 17 | 17 | ||
| 18 | #include_next "mcuconf.h" | 18 | #include_next <mcuconf.h> |
| 19 | 19 | ||
| 20 | // #undef STM32_HSE_ENABLED | 20 | // #undef STM32_HSE_ENABLED |
| 21 | // #define STM32_HSE_ENABLED FALSE | 21 | // #define STM32_HSE_ENABLED FALSE |