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 | |
| 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')
| -rw-r--r-- | tmk_core/common/led.h | 4 | ||||
| -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 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h index 81c664d606..0fe38ea035 100644 --- a/tmk_core/common/led.h +++ b/tmk_core/common/led.h @@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "stdint.h" -#include "stdbool.h" +#include <stdint.h> +#include <stdbool.h> /* FIXME: Add doxygen comments here. */ 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 f59c8d1dda..22f882cbb8 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 @@ #include "progmem.h" -#include "stddef.h" -#include "inttypes.h" +#include <stddef.h> +#include <inttypes.h> #define ATTR_PACKED __attribute__((packed)) /** 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 b99a40f1e0..e07c181fc8 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c @@ -31,7 +31,7 @@ #include "led.h" #include "sendchar.h" #include "debug.h" -#include "printf.h" +#include "print.h" #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP // Change this to be TRUE once we've migrated keyboards to the new init system |