summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-03-03 17:50:40 +0000
committerGitHub <noreply@github.com>2023-03-03 17:50:40 +0000
commit3be5d90b6d1c4534bcfce9725808e8c4d469a845 (patch)
treecc9c2ae2ead9a4fbdc2f9c7d1d3f3682e08b2d46
parentc3c40dfda89d3d10bef90e08bf0600d1f4b1cd0e (diff)
Remove some use of keymap.h (#20006)
-rw-r--r--keyboards/capsunlocked/cu75/cu75.c1
-rw-r--r--keyboards/gboards/butterstick/sten.h3
-rw-r--r--keyboards/gboards/engine/engine.h3
-rw-r--r--keyboards/gboards/g/engine.h4
-rw-r--r--keyboards/gboards/georgi/sten.h2
-rw-r--r--keyboards/handwired/arrow_pad/arrow_pad.h7
-rw-r--r--keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c1
-rw-r--r--keyboards/lfkeyboards/lfk87/lfk87.c1
-rw-r--r--keyboards/lfkeyboards/mini1800/mini1800.c1
-rw-r--r--keyboards/lfkeyboards/smk65/revb/revb.c1
-rw-r--r--quantum/bootmagic/magic.c2
-rw-r--r--quantum/command.c1
-rw-r--r--quantum/dynamic_keymap.c2
-rw-r--r--quantum/keymap_common.h2
-rw-r--r--quantum/keymap_introspection.h1
-rw-r--r--tests/test_common/test_fixture.cpp1
16 files changed, 11 insertions, 22 deletions
diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c
index fff0c10ef6..c894d18602 100644
--- a/keyboards/capsunlocked/cu75/cu75.c
+++ b/keyboards/capsunlocked/cu75/cu75.c
@@ -2,7 +2,6 @@
#include <avr/timer_avr.h>
#include <avr/wdt.h>
#include "cu75.h"
-#include "keymap.h"
#include "debug.h"
#include "../lfkeyboards/issi.h"
#include "../lfkeyboards/TWIlib.h"
diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
index 0d5c58df21..84c54c9e2e 100644
--- a/keyboards/gboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
@@ -5,9 +5,10 @@
//
// Amen.
+#pragma once
+
#include QMK_KEYBOARD_H
#include "mousekey.h"
-#include "keymap.h"
#include "keymap_steno.h"
#include "wait.h"
diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h
index 5b9d5b0ecb..5b2da811d8 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -10,9 +10,8 @@
crap is removed where possible
*/
-#include QMK_KEYBOARD_H
#pragma once
-#include "keymap.h"
+#include QMK_KEYBOARD_H
#include <string.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index 547ea09fdd..e166ba37d2 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -10,9 +10,9 @@
crap is removed where possible
*/
-#include QMK_KEYBOARD_H
#pragma once
-#include "keymap.h"
+
+#include QMK_KEYBOARD_H
#include <string.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 320c49514c..05d518efac 100644
--- a/keyboards/gboards/georgi/sten.h
+++ b/keyboards/gboards/georgi/sten.h
@@ -4,10 +4,10 @@
// the slave and the master. Until we return from main.
//
// Amen.
+#pragma once
#include QMK_KEYBOARD_H
#include "mousekey.h"
-#include "keymap.h"
#include "keymap_steno.h"
#include "wait.h"
diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h
index 2d677beb5c..489dae2a4e 100644
--- a/keyboards/handwired/arrow_pad/arrow_pad.h
+++ b/keyboards/handwired/arrow_pad/arrow_pad.h
@@ -1,13 +1,6 @@
#pragma once
#include "quantum.h"
-#include "matrix.h"
-#include "keymap.h"
-#ifdef BACKLIGHT_ENABLE
- #include "backlight.h"
-#endif
-#include <avr/io.h>
-#include <stddef.h>
#define XXX KC_NO
diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
index 3d273e8aec..47ad655ddc 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
@@ -2,7 +2,6 @@
#include <avr/timer_avr.h>
#include <avr/wdt.h>
#include "lfk65_hs.h"
-#include "keymap.h"
bool process_record_kb(uint16_t keycode, keyrecord_t* record)
{
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index ce81aa7d27..58dcfde46d 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -3,7 +3,6 @@
#include <avr/timer_avr.h>
#include <avr/wdt.h>
#include "lfk87.h"
-#include "keymap.h"
#include "issi.h"
#include "TWIlib.h"
#include "lighting.h"
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index f435f55677..adccd8c278 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -3,7 +3,6 @@
#include <avr/timer_avr.h>
#include <avr/wdt.h>
#include "mini1800.h"
-#include "keymap.h"
#include "issi.h"
#include "TWIlib.h"
#include "lighting.h"
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 858305244a..a1d9f61284 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/timer_avr.h>
#include <avr/wdt.h>
#include "smk65.h"
-#include "keymap.h"
#include "debug.h"
#include "issi.h"
#include "TWIlib.h"
diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c
index f1cb11c395..d68df3fa58 100644
--- a/quantum/bootmagic/magic.c
+++ b/quantum/bootmagic/magic.c
@@ -19,7 +19,7 @@
#include "matrix.h"
#include "bootloader.h"
#include "debug.h"
-#include "keymap.h"
+#include "keycode_config.h"
#include "host.h"
#include "action_layer.h"
#include "eeconfig.h"
diff --git a/quantum/command.c b/quantum/command.c
index 84757b9b01..aa64b75064 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "wait.h"
#include "keycode.h"
#include "host.h"
-#include "keymap.h"
#include "print.h"
#include "debug.h"
#include "util.h"
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index c406be4585..90a0f20838 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "keymap.h" // to get keymaps[][][]
+#include "keymap_introspection.h" // to get keymaps[][][]
#include "eeprom.h"
#include "progmem.h" // to read default from flash
#include "quantum.h" // for send_string()
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
index 24fe9af6fe..20e70263f3 100644
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@@ -3,5 +3,7 @@
#pragma once
+#include <stdint.h>
+
// translates key to keycode
uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h
index a8df3928a6..201de937cb 100644
--- a/quantum/keymap_introspection.h
+++ b/quantum/keymap_introspection.h
@@ -3,6 +3,7 @@
#pragma once
#include <stdint.h>
+#include <stdbool.h>
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Key mapping
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 76daa625ad..72763d0bc0 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -22,7 +22,6 @@ extern "C" {
#include "debug.h"
#include "eeconfig.h"
#include "keyboard.h"
-#include "keymap.h"
void set_time(uint32_t t);
void advance_time(uint32_t ms);