[Keyboard] RM_Numpad: Fix layout bug (qmk#16857)

Co-authored-by: jason <[email protected]>
Idobao · May 17, 2022 · a9a873d · a9a873d
1 parent 5461611
commit a9a873d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json
@@ -18,19 +18,19 @@
                 {"label": "7", "x": 0, "y": 2.25},
                 {"label": "8", "x": 1, "y": 2.25},
                 {"label": "9", "x": 2, "y": 2.25},
-                {"label": "+", "x": 3, "y": 2.25, "h": 2},
 
                 {"label": "4", "x": 0, "y": 3.25},
                 {"label": "5", "x": 1, "y": 3.25},
                 {"label": "6", "x": 2, "y": 3.25},
+                {"label": "+", "x": 3, "y": 2.25, "h": 2},
 
                 {"label": "1", "x": 0, "y": 4.25},
                 {"label": "2", "x": 1, "y": 4.25},
                 {"label": "3", "x": 2, "y": 4.25},
-                {"label": "Enter", "x": 3, "y": 4.25, "h": 2},
 
                 {"label": "0", "x": 0, "y": 5.25, "w": 2},
-                {"label": ".", "x": 2, "y": 5.25}
+                {"label": ".", "x": 2, "y": 5.25},
+                {"label": "Enter", "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_plus_6x4": {
@@ -58,10 +58,10 @@
                 {"label": "1", "x": 0, "y": 4.25},
                 {"label": "2", "x": 1, "y": 4.25},
                 {"label": "3", "x": 2, "y": 4.25},
-                {"label": "Enter", "x": 3, "y": 4.25, "h": 2},
 
                 {"label": "0", "x": 0, "y": 5.25, "w": 2},
-                {"label": ".", "x": 2, "y": 5.25}
+                {"label": ".", "x": 2, "y": 5.25},
+                {"label": "Enter", "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_ortho_6x4": {

diff --git a/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c b/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c
@@ -22,10 +22,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_numpad_6x4(
         KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
         KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
-        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        KC_P4,   KC_P5,   KC_P6,    
-        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-           KC_P0,      KC_PDOT
+        KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
+        KC_P1,   KC_P2,   KC_P3,
+           KC_P0,      KC_PDOT,    KC_PENT
     )
 
 };

diff --git a/keyboards/rmkeebs/rm_numpad/keymaps/split_plus/keymap.c b/keyboards/rmkeebs/rm_numpad/keymaps/split_plus/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
         KC_P7,   KC_P8,   KC_P9,   KC_EQL,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
-        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-           KC_P0,      KC_PDOT
+        KC_P1,   KC_P2,   KC_P3,
+           KC_P0,      KC_PDOT,    KC_PENT
     )
 };
 
diff --git a/keyboards/rmkeebs/rm_numpad/rm_numpad.h b/keyboards/rmkeebs/rm_numpad/rm_numpad.h
@@ -48,7 +48,7 @@
     k00, k01, k02, k03, \
     k10, k11, k12, k13, \
     k20, k21, k22, \
-    k30, k31, k32, k24, \
+    k30, k31, k32, k24,\
     k40, k41, k42, \
        k51,   k53, k44 \
 ) { \
@@ -114,8 +114,8 @@
     k10, k11, k12, k13, \
     k20, k21, k22, k23, \
     k30, k31, k32, k33, \
-    k40, k41, k42, k44, \
-    k51,      k53 \
+    k40, k41, k42, \
+    k51,      k53, k44 \
 ) { \
     { k00, k01, k02, k03, ___ }, \
     { k10, k11, k12, k13, ___ }, \