Merge remote-tracking branch 'upstream/master' into develop

2021-07-25 12:17:15 +10:00
parent fdf3ce3cd1 b69e7431aa
commit 4ec8764c70
20 changed files with 307 additions and 42 deletions
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -15,16 +15,7 @@
 */
 #pragma once

-#if defined(__AVR__)
-#    include <avr/pgmspace.h>
-#    include <avr/io.h>
-#    include <avr/interrupt.h>
-#endif
-#if defined(PROTOCOL_CHIBIOS)
-#    include <hal.h>
-#    include "chibios_config.h"
-#endif
-
+#include "platform.h"
 #include "wait.h"
 #include "matrix.h"
 #include "keymap.h"