From 030511ece33bfe08307ce519219fde9ab3077cff Mon Sep 17 00:00:00 2001
From: Ryan
Date: Mon, 31 Jul 2023 09:34:19 +1000
Subject: CLI: Improve error messages when layout key matrix row/col is OOB
 (#21640)

---
 lib/python/qmk/cli/generate/keyboard_h.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib/python/qmk/cli/generate')

diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index fa4036e39a..b9e89032b9 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -37,14 +37,19 @@ def _generate_layouts(keyboard, kb_info_json):
             row, col = key_data['matrix']
             identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}'
 
-            try:
-                layout_matrix[row][col] = identifier
-                layout_keys.append(identifier)
-            except IndexError:
+            if row >= row_num or col >= col_num:
                 key_name = key_data.get('label', identifier)
-                cli.log.error(f'{keyboard}/{layout_name}: Matrix data out of bounds at index {index} ({key_name}): [{row}, {col}]')
+                if row >= row_num:
+                    cli.log.error(f'{keyboard}/{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
+
+                if col >= col_num:
+                    cli.log.error(f'{keyboard}/{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
+
                 return []
 
+            layout_matrix[row][col] = identifier
+            layout_keys.append(identifier)
+
         lines.append('')
         lines.append(f'#define {layout_name}({", ".join(layout_keys)}) {{ \\')
 
-- 
cgit v1.2.3


From f407d9059878087bdc458479247d908c88f8d89d Mon Sep 17 00:00:00 2001
From: Ryan
Date: Mon, 31 Jul 2023 09:35:06 +1000
Subject: keycode aliases: work around ChibiOS ch.h include guard (#21497)

---
 lib/python/qmk/cli/generate/keycodes.py | 5 +++++
 quantum/keymap_extras/keymap_swiss_de.h | 2 ++
 quantum/keymap_extras/keymap_swiss_fr.h | 2 ++
 3 files changed, 9 insertions(+)

(limited to 'lib/python/qmk/cli/generate')

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
-- 
cgit v1.2.3