Fix Rocketboard-16 QMK Configurator Implementation (qmk#15028)

* rename LAYOUT_default to LAYOUT Only one layout is supported. * refactor keymaps - use short-form keycodes
baseonmars · Nov 3, 2021 · 6d807af · 6d807af
1 parent 87fc950
commit 6d807af
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
@@ -2,6 +2,9 @@
     "keyboard_name": "Rocketboard-16",
     "url": "",
     "maintainer": "fl3tching101",
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/rocketboard_16/keymaps/default/keymap.c b/keyboards/rocketboard_16/keymaps/default/keymap.c
@@ -33,19 +33,19 @@ enum custom_keycodes {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_default(
-        RGB_MODE_FORWARD,                KC_NUMLOCK,
-        KC_KP_7, KC_KP_8, KC_KP_9,       KC_DELETE,
-        KC_KP_4, KC_KP_5, KC_KP_6,       KC_END,
-        KC_KP_1, KC_KP_2, KC_KP_3,       KC_F13,
-        KC_KP_0, MO(1),   KC_KP_DOT,     KC_KP_ENTER
+    [_BASE] = LAYOUT(
+        RGB_MOD,                   KC_NLCK,
+        KC_P7,   KC_P8,   KC_P9,   KC_DEL,
+        KC_P4,   KC_P5,   KC_P6,   KC_END,
+        KC_P1,   KC_P2,   KC_P3,   KC_F13,
+        KC_P0,   MO(1),   KC_PDOT, KC_PENT
     ),
-    [_SPEC] = LAYOUT_default(
-        RGB_MODE_REVERSE,               KC_AUDIO_MUTE,
-        KC_NO,   KC_NO,   KC_NO,         KC_EXAM,
-        KC_NO,   KC_NO,   KC_NO,         KC_NO,
-        RESET,   RGB_TOG, RGB_SPI,       RGB_SPD,
-        KC_NO,   _______, KC_NO,         KC_NO
+    [_SPEC] = LAYOUT(
+        RGB_RMOD,                   KC_MUTE,
+        KC_NO,    KC_NO,   KC_NO,   KC_EXAM,
+        KC_NO,    KC_NO,   KC_NO,   KC_NO,
+        RESET,    RGB_TOG, RGB_SPI, RGB_SPD,
+        KC_NO,    _______, KC_NO,   KC_NO
     )
 };
 

diff --git a/keyboards/rocketboard_16/keymaps/via/keymap.c b/keyboards/rocketboard_16/keymaps/via/keymap.c
@@ -33,19 +33,19 @@ enum custom_keycodes {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_default(
-        RGB_MODE_FORWARD,                KC_NUMLOCK,
-        KC_KP_7, KC_KP_8, KC_KP_9,       KC_DELETE,
-        KC_KP_4, KC_KP_5, KC_KP_6,       KC_END,
-        KC_KP_1, KC_KP_2, KC_KP_3,       KC_F13,
-        KC_KP_0, MO(1),   KC_KP_DOT,     KC_KP_ENTER
+    [_BASE] = LAYOUT(
+        RGB_MOD,                   KC_NLCK,
+        KC_P7,   KC_P8,   KC_P9,   KC_DEL,
+        KC_P4,   KC_P5,   KC_P6,   KC_END,
+        KC_P1,   KC_P2,   KC_P3,   KC_F13,
+        KC_P0,   MO(1),   KC_PDOT, KC_PENT
     ),
-    [_SPEC] = LAYOUT_default(
-        RGB_MODE_REVERSE,               KC_AUDIO_MUTE,
-        KC_NO,   KC_NO,   KC_NO,         KC_EXAM,
-        KC_NO,   KC_NO,   KC_NO,         KC_NO,
-        RESET,   RGB_TOG, RGB_SPI,       RGB_SPD,
-        KC_NO,   _______, KC_NO,         KC_NO
+    [_SPEC] = LAYOUT(
+        RGB_RMOD,                   KC_MUTE,
+        KC_NO,    KC_NO,   KC_NO,   KC_EXAM,
+        KC_NO,    KC_NO,   KC_NO,   KC_NO,
+        RESET,    RGB_TOG, RGB_SPI, RGB_SPD,
+        KC_NO,    _______, KC_NO,   KC_NO
     )
 };
 

diff --git a/keyboards/rocketboard_16/rocketboard_16.h b/keyboards/rocketboard_16/rocketboard_16.h
@@ -4,7 +4,7 @@
 
 #define KNO KC_NO
 
-#define LAYOUT_default( \
+#define LAYOUT( \
   K00,           K01, \
   K02, K03, K04, K05, \
   K06, K07, K08, K09, \