diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
| commit | fdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch) | |
| tree | 9524405fef6cc3b16965517735dc0ef315f67ab1 /platforms | |
| parent | ed76f4394fd95413f7da11e2342b0965182ccb95 (diff) | |
| parent | 501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff) | |
| download | qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_F042X6/board/board.c | 4 | ||||
| -rw-r--r-- | platforms/chibios/IC_TEENSY_3_1/board/board.c | 2 | ||||
| -rw-r--r-- | platforms/chibios/STM32_F103_STM32DUINO/board/board.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/platforms/chibios/GENERIC_STM32_F042X6/board/board.c b/platforms/chibios/GENERIC_STM32_F042X6/board/board.c index 7d93b68f9..3c6f54ef5 100644 --- a/platforms/chibios/GENERIC_STM32_F042X6/board/board.c +++ b/platforms/chibios/GENERIC_STM32_F042X6/board/board.c | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | * generator plugin. Do not edit manually. | 19 | * generator plugin. Do not edit manually. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "hal.h" | 22 | #include <hal.h> |
| 23 | #include "stm32_gpio.h" | 23 | #include <stm32_gpio.h> |
| 24 | 24 | ||
| 25 | /*===========================================================================*/ | 25 | /*===========================================================================*/ |
| 26 | /* Driver local definitions. */ | 26 | /* Driver local definitions. */ |
diff --git a/platforms/chibios/IC_TEENSY_3_1/board/board.c b/platforms/chibios/IC_TEENSY_3_1/board/board.c index 63e3f6492..36ae8051e 100644 --- a/platforms/chibios/IC_TEENSY_3_1/board/board.c +++ b/platforms/chibios/IC_TEENSY_3_1/board/board.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | See the License for the specific language governing permissions and | 13 | See the License for the specific language governing permissions and |
| 14 | limitations under the License. | 14 | limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | #include "hal.h" | 16 | #include <hal.h> |
| 17 | 17 | ||
| 18 | #if HAL_USE_PAL || defined(__DOXYGEN__) | 18 | #if HAL_USE_PAL || defined(__DOXYGEN__) |
| 19 | /** | 19 | /** |
diff --git a/platforms/chibios/STM32_F103_STM32DUINO/board/board.c b/platforms/chibios/STM32_F103_STM32DUINO/board/board.c index 9135f6136..8a34e81f2 100644 --- a/platforms/chibios/STM32_F103_STM32DUINO/board/board.c +++ b/platforms/chibios/STM32_F103_STM32DUINO/board/board.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | limitations under the License. | 14 | limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "hal.h" | 17 | #include <hal.h> |
| 18 | 18 | ||
| 19 | // Value to place in RTC backup register 10 for persistent bootloader mode | 19 | // Value to place in RTC backup register 10 for persistent bootloader mode |
| 20 | #define RTC_BOOTLOADER_FLAG 0x424C | 20 | #define RTC_BOOTLOADER_FLAG 0x424C |