qmk_firmware

commit f407d9059878087bdc458479247d908c88f8d89d
parent cc3bd728f00d95c2360bca9326de2ba30078c274
Author: Ryan <fauxpark@gmail.com>
Date:   Mon, 31 Jul 2023 09:35:06 +1000

keycode aliases: work around ChibiOS ch.h include guard (#21497)


Diffstat:
M
lib/python/qmk/cli/generate/keycodes.py
 | 
5
+++++
M
quantum/keymap_extras/keymap_swiss_de.h
 | 
2
++
M
quantum/keymap_extras/keymap_swiss_fr.h
 | 
2
++

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
@@ -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
@@ -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
@@ -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