feat: simplify porting further

veypatch · veypatch · commit d36870bab35f · 2026-04-29T11:28:53.000+02:00
diff --git a/docs/PORTING.md b/docs/PORTING.md
@@ -57,18 +57,7 @@ If the keyboard defines a split encoder, also override right-half pins:
 #endif
 ```
 
-## 3. Expand the Matrix
-
-In your keymap's `config.h`, override the column count when Halcyon is enabled. Create the file if needed.
-
-Determine the current column count by counting the number of pins from `keyboard.json`, then add 5:
-
-```c
-#undef MATRIX_COLS
-#define MATRIX_COLS 11  // original + 5
-```
-
-## 4. Define Halcyon Button Mappings
+## 3. Define Halcyon Button Mappings
 
 Update `keymap.c`, or create a new file if you're using the `keymap.json` (e.g. `halcyon_keys.c`).
 
@@ -104,7 +93,7 @@ const uint16_t right_halcyon_buttons[10][5] = {
 (Extend layers as needed; unused entries can remain `_______`.)
 
 
-## 5. Add extra encoder mapping
+## 4. Add extra encoder mapping
 
 Update the keymap to include two extra encoder mappings. Extend layers as needed.
 
@@ -128,7 +117,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 #endif
 ```
 
-## 6. Compile
+## 5. Compile
 
 Build using the standard userspace workflow described in the main [README](README.md).
 
diff --git a/keyboards/splitkb/aurora/corne/keymaps/default_hlc/config.h b/keyboards/splitkb/aurora/corne/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/aurora/corne/keymaps/vial_hlc/config.h b/keyboards/splitkb/aurora/corne/keymaps/vial_hlc/config.h
@@ -12,6 +12,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 11 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/aurora/helix/keymaps/default_hlc/config.h b/keyboards/splitkb/aurora/helix/keymaps/default_hlc/config.h
@@ -4,6 +4,3 @@
 #pragma once
 
 #define ENCODER_RESOLUTION 2
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 12  // original + 5
diff --git a/keyboards/splitkb/aurora/helix/keymaps/vial_hlc/config.h b/keyboards/splitkb/aurora/helix/keymaps/vial_hlc/config.h
@@ -14,6 +14,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 12  // original + 5
diff --git a/keyboards/splitkb/aurora/lily58/keymaps/default_hlc/config.h b/keyboards/splitkb/aurora/lily58/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/aurora/lily58/keymaps/vial_hlc/config.h b/keyboards/splitkb/aurora/lily58/keymaps/vial_hlc/config.h
@@ -12,6 +12,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 11 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/aurora/sofle_v2/keymaps/default_hlc/config.h b/keyboards/splitkb/aurora/sofle_v2/keymaps/default_hlc/config.h
@@ -4,6 +4,3 @@
 #pragma once
 
 #define ENCODER_RESOLUTION 2
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 11
diff --git a/keyboards/splitkb/aurora/sofle_v2/keymaps/vial_hlc/config.h b/keyboards/splitkb/aurora/sofle_v2/keymaps/vial_hlc/config.h
@@ -14,6 +14,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 11
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default_hlc/config.h b/keyboards/splitkb/aurora/sweep/keymaps/default_hlc/config.h
@@ -4,6 +4,3 @@
 #pragma once
 
 #define ENCODER_RESOLUTION 2
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 10 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/vial_hlc/config.h b/keyboards/splitkb/aurora/sweep/keymaps/vial_hlc/config.h
@@ -14,6 +14,3 @@
 #define ENCODER_RESOLUTION 2
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 10 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/config.h b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h
@@ -12,6 +12,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 11 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/config.h b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/config.h
@@ -15,6 +15,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 12 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/halcyon/ferris/keymaps/default_hlc/config.h b/keyboards/splitkb/halcyon/ferris/keymaps/default_hlc/config.h
@@ -4,6 +4,3 @@
 #pragma once
 
 #define ENCODER_RESOLUTION 2
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 10 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/halcyon/ferris/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/ferris/keymaps/vial_hlc/config.h
@@ -14,6 +14,3 @@
 #define ENCODER_RESOLUTION 2
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 10 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/config.h b/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/kyria/keymaps/vial_hlc/config.h
@@ -15,6 +15,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 12 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default_hlc/config.h b/keyboards/splitkb/halcyon/lily58/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/lily58/keymaps/vial_hlc/config.h
@@ -12,6 +12,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 11 // 5 extra columns for buttons
diff --git a/keyboards/splitkb/kyria/rev3/keymaps/default_hlc/config.h b/keyboards/splitkb/kyria/rev3/keymaps/default_hlc/config.h
diff --git a/keyboards/splitkb/kyria/rev3/keymaps/vial_hlc/config.h b/keyboards/splitkb/kyria/rev3/keymaps/vial_hlc/config.h
@@ -15,6 +15,3 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#undef MATRIX_COLS
-#define MATRIX_COLS 12 // 5 extra columns for buttons
diff --git a/users/halcyon_modules/splitkb/config.h b/users/halcyon_modules/splitkb/config.h
@@ -28,6 +28,32 @@
 // Make it easier to enter the bootloader
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 
+#if MATRIX_COLS == 3
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 8 // 5 extra columns for buttons
+#elif MATRIX_COLS == 4
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 9
+#elif MATRIX_COLS == 5
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 10
+#elif MATRIX_COLS == 6
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 11
+#elif MATRIX_COLS == 7
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 12
+#elif MATRIX_COLS == 8
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 13
+#elif MATRIX_COLS == 9
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 14
+#elif MATRIX_COLS == 10
+    #undef MATRIX_COLS
+    #define MATRIX_COLS 15
+#endif // May need to be expanded in the future
+
 //// VIK
 
 // GPIO1 = 27
