diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
| commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
| tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /tmk_core/protocol | |
| parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
| parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) | |
| download | qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.tar.gz qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h | 4 | ||||
| -rw-r--r-- | tmk_core/protocol/chibios/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h b/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h index f59c8d1dd..22f882cbb 100644 --- a/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h +++ b/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include "progmem.h" | 1 | #include "progmem.h" |
| 2 | #include "stddef.h" | 2 | #include <stddef.h> |
| 3 | #include "inttypes.h" | 3 | #include <inttypes.h> |
| 4 | 4 | ||
| 5 | #define ATTR_PACKED __attribute__((packed)) | 5 | #define ATTR_PACKED __attribute__((packed)) |
| 6 | /** Concatenates the given input into a single token, via the C Preprocessor. | 6 | /** Concatenates the given input into a single token, via the C Preprocessor. |
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index b99a40f1e..e07c181fc 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include "led.h" | 31 | #include "led.h" |
| 32 | #include "sendchar.h" | 32 | #include "sendchar.h" |
| 33 | #include "debug.h" | 33 | #include "debug.h" |
| 34 | #include "printf.h" | 34 | #include "print.h" |
| 35 | 35 | ||
| 36 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP | 36 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP |
| 37 | // Change this to be TRUE once we've migrated keyboards to the new init system | 37 | // Change this to be TRUE once we've migrated keyboards to the new init system |