summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-07-31 09:35:06 +1000
committerGitHub <noreply@github.com>2023-07-31 09:35:06 +1000
commitf407d9059878087bdc458479247d908c88f8d89d (patch)
tree5675943404a5f68a06fae402b85685600d47e4f3
parentcc3bd728f00d95c2360bca9326de2ba30078c274 (diff)
keycode aliases: work around ChibiOS ch.h include guard (#21497)
-rw-r--r--lib/python/qmk/cli/generate/keycodes.py5
-rw-r--r--quantum/keymap_extras/keymap_swiss_de.h2
-rw-r--r--quantum/keymap_extras/keymap_swiss_fr.h2
3 files changed, 9 insertions, 0 deletions
diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py
index 3b69b17ed1..ed8b6827bd 100644
--- a/lib/python/qmk/cli/generate/keycodes.py
+++ b/lib/python/qmk/cli/generate/keycodes.py
@@ -96,6 +96,11 @@ def _generate_helpers(lines, keycodes):
def _generate_aliases(lines, keycodes):
+ # Work around ChibiOS ch.h include guard
+ if 'CH_H' in [value['key'] for value in keycodes['aliases'].values()]:
+ lines.append('')
+ lines.append('#undef CH_H')
+
lines.append('')
lines.append('// Aliases')
for key, value in keycodes["aliases"].items():
diff --git a/quantum/keymap_extras/keymap_swiss_de.h b/quantum/keymap_extras/keymap_swiss_de.h
index 69bba7293e..c22191dd4e 100644
--- a/quantum/keymap_extras/keymap_swiss_de.h
+++ b/quantum/keymap_extras/keymap_swiss_de.h
@@ -27,6 +27,8 @@
#include "keycodes.h"
// clang-format off
+#undef CH_H
+
// Aliases
#define CH_SECT KC_GRV // §
#define CH_1 KC_1 // 1
diff --git a/quantum/keymap_extras/keymap_swiss_fr.h b/quantum/keymap_extras/keymap_swiss_fr.h
index 1e2f833db1..e0e8e52c9c 100644
--- a/quantum/keymap_extras/keymap_swiss_fr.h
+++ b/quantum/keymap_extras/keymap_swiss_fr.h
@@ -27,6 +27,8 @@
#include "keycodes.h"
// clang-format off
+#undef CH_H
+
// Aliases
#define CH_SECT KC_GRV // §
#define CH_1 KC_1 // 1