From e97b81d02426d1f496e2f491f6cae6d5fdcff861 Mon Sep 17 00:00:00 2001 From: jason Date: Sat, 16 Apr 2022 00:32:57 +0000 Subject: [PATCH 1/3] reverting suggested change from original PR --- keyboards/rmkeebs/rm_numpad/rm_numpad.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/rmkeebs/rm_numpad/rm_numpad.h b/keyboards/rmkeebs/rm_numpad/rm_numpad.h index 93fa9392e1a4..991879d5d03a 100644 --- a/keyboards/rmkeebs/rm_numpad/rm_numpad.h +++ b/keyboards/rmkeebs/rm_numpad/rm_numpad.h @@ -47,10 +47,10 @@ #define LAYOUT_numpad_6x4( \ k00, k01, k02, k03, \ k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k24, \ - k40, k41, k42, \ - k51, k53, k44 \ + k20, k21, k22, k24,\ + k30, k31, k32, \ + k40, k41, k42, k44,\ + k51, k53 \ ) { \ { k00, k01, k02, k03, ___ }, \ { k10, k11, k12, k13, ___ }, \ From 2dea277b74c72dcab78a0ce0347f8032a9f028f7 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 24 Apr 2022 21:08:41 +0000 Subject: [PATCH 2/3] fixing suggested changes --- keyboards/rmkeebs/rm_numpad/info.json | 6 +++--- keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c | 8 ++++---- .../rmkeebs/rm_numpad/keymaps/split_plus/keymap.c | 4 ++-- keyboards/rmkeebs/rm_numpad/rm_numpad.h | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json index f91c1ec6af34..20a8069274be 100644 --- 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": { diff --git a/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c b/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c index 240442558c02..fef4324f19f8 100644 --- 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 index 84fa6b2a6404..9c6939e4d6d7 100644 --- 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 index 991879d5d03a..b66a8b8249ad 100644 --- a/keyboards/rmkeebs/rm_numpad/rm_numpad.h +++ b/keyboards/rmkeebs/rm_numpad/rm_numpad.h @@ -47,10 +47,10 @@ #define LAYOUT_numpad_6x4( \ k00, k01, k02, k03, \ k10, k11, k12, k13, \ - k20, k21, k22, k24,\ - k30, k31, k32, \ - k40, k41, k42, k44,\ - k51, k53 \ + k20, k21, k22, \ + k30, k31, k32, k24,\ + k40, k41, k42, \ + k51, k53, k44 \ ) { \ { k00, k01, k02, k03, ___ }, \ { k10, k11, k12, k13, ___ }, \ @@ -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, ___ }, \ From e61c5d3b58645b0668d0198bc52eacfa43953337 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 28 Apr 2022 20:50:16 +0000 Subject: [PATCH 3/3] fixing split plus --- keyboards/rmkeebs/rm_numpad/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json index 20a8069274be..7ba9a6480580 100644 --- a/keyboards/rmkeebs/rm_numpad/info.json +++ b/keyboards/rmkeebs/rm_numpad/info.json @@ -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": {