summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-07-25 12:17:15 +1000
committerNick Brassel <nick@tzarc.org>2021-07-25 12:17:15 +1000
commit4ec8764c70da13366f8cb7f8240e3124ea509da5 (patch)
treee5482bbd1f20e76a5b6dfa03a87d577c3e8d2ed7 /quantum
parentfdf3ce3cd1bbf931660678b0b5e138ce37c84e7c (diff)
parentb69e7431aa2e22b4f4662c64e84ed242caac055e (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio/luts.h10
-rw-r--r--quantum/audio/voices.h3
-rw-r--r--quantum/keymap_common.c4
-rw-r--r--quantum/quantum.h11
-rw-r--r--quantum/rgblight/rgblight.c14
-rw-r--r--quantum/rgblight/rgblight.h5
6 files changed, 7 insertions, 40 deletions
diff --git a/quantum/audio/luts.h b/quantum/audio/luts.h
index 74980b292e..8bb0454493 100644
--- a/quantum/audio/luts.h
+++ b/quantum/audio/luts.h
@@ -16,14 +16,8 @@
#pragma once
-#if defined(__AVR__)
-# include <avr/io.h>
-# include <avr/interrupt.h>
-# include <avr/pgmspace.h>
-#else
-# include <ch.h>
-# include <hal.h>
-#endif
+#include <float.h>
+#include <stdint.h>
#define VIBRATO_LUT_LENGTH 20
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 578350d337..1f402e7e12 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -18,9 +18,6 @@
#include <stdint.h>
#include <stdbool.h>
-#if defined(__AVR__)
-# include <avr/io.h>
-#endif
#include "wait.h"
#include "luts.h"
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 570d4798de..e0fd6d4793 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
#include "keycode.h"
#include "action_layer.h"
-#if defined(__AVR__)
-# include <util/delay.h>
-# include <stdio.h>
-#endif
#include "action.h"
#include "action_macro.h"
#include "debug.h"
diff --git a/quantum/quantum.h b/quantum/quantum.h
index b8c120ea2f..756a5603c1 100644
--- 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"
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 373dc08d3a..148dae78f4 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -16,17 +16,6 @@
#include <math.h>
#include <string.h>
#include <stdlib.h>
-#ifdef __AVR__
-# include <avr/eeprom.h>
-# include <avr/interrupt.h>
-#endif
-#ifdef EEPROM_ENABLE
-# include "eeprom.h"
-#endif
-#ifdef STM32_EEPROM_ENABLE
-# include <hal.h>
-# include "eeprom_stm32.h"
-#endif
#include "wait.h"
#include "progmem.h"
#include "sync_timer.h"
@@ -35,6 +24,9 @@
#include "debug.h"
#include "led_tables.h"
#include <lib/lib8tion/lib8tion.h>
+#ifdef EEPROM_ENABLE
+# include "eeprom.h"
+#endif
#ifdef VELOCIKEY_ENABLE
# include "velocikey.h"
#endif
diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h
index 49f82bdfc6..5b90b8f49e 100644
--- a/quantum/rgblight/rgblight.h
+++ b/quantum/rgblight/rgblight.h
@@ -169,15 +169,12 @@ enum RGBLIGHT_EFFECT_MODE {
#include <stdint.h>
#include <stdbool.h>
+#include "progmem.h"
#include "eeconfig.h"
#include "ws2812.h"
#include "color.h"
#include "rgblight_list.h"
-#if defined(__AVR__)
-# include <avr/pgmspace.h>
-#endif
-
#ifdef RGBLIGHT_LAYERS
typedef struct {
uint8_t index; // The first LED to light