From b97489dc43bba499fbfcf057aa916a4b1324e427 Mon Sep 17 00:00:00 2001 From: Dylan Khor Date: Sun, 28 Mar 2021 01:10:58 -0400 Subject: [PATCH 1/4] remove kc keymap/layout per #12160 --- .../keebio/chocopad/keymaps/khord/keymap.c | 59 +++++-------------- 1 file changed, 15 insertions(+), 44 deletions(-) diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c index 2c871c4e820a..349aa088600b 100644 --- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c +++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c @@ -4,22 +4,8 @@ #define _FN1 1 #define _FN2 2 -// Fillers to make layering more clear -#define KC_ KC_TRNS -#define KC_XX KC_NO - #define KC_L1 LT(1, KC_P0) #define KC_L2 LT(2, KC_SPC) -#define KC_RST RESET -#define KC_BSTP BL_STEP -#define KC_RTOG RGB_TOG -#define KC_RMOD RGB_MOD -#define KC_RHUI RGB_HUI -#define KC_RHUD RGB_HUD -#define KC_RSAI RGB_SAI -#define KC_RSAD RGB_SAD -#define KC_RVAI RGB_VAI -#define KC_RVAD RGB_VAD #define KC_MAC1 ADMIN #define KC_MAC2 SMSPC #define KC_M192 M192 @@ -35,40 +21,25 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_kc( - //,----+----+----+----. - P7 , P8 , P9 ,BSPC, - //|----+----+----+----| - P4 , P5 , P6 ,TAB , - //|----+----+----+----| - P1 , P2 , P3 ,PENT, - //|----+----+----+----| - L1 , L2 ,PDOT,PSLS - //`----+----+----+----' + [_BASE] = LAYOUT_ortho_4x4( + KC_P7, KC_P8, KC_P9, KC_BSPC, \ + KC_P4, KC_P5, KC_P6, KC_TAB , \ + KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_L1, KC_L2, KC_PDOT, KC_PSLS \ ), - [_FN1] = LAYOUT_kc( - //,----+----+----+----. - ESC ,MAC1,MAC2,DEL , - //|----+----+----+----| - LEFT,DOWN, UP ,RGHT, - //|----+----+----+----| - M192,M255, XX , XX , - //|----+----+----+----| - , XX , , XX - //`----+----+----+----' + [_FN1] = LAYOUT_ortho_4x4( + KC_ESC, KC_MAC1, KC_MAC2, KC_DEL , \ + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ + KC_M192, KC_M255, XXXXXXX, XXXXXXX, \ + _______, XXXXXXX, _______, XXXXXXX \ ), - [_FN2] = LAYOUT_kc( - //,----+----+----+----. - RST , XX , XX , XX , - //|----+----+----+----| - RTOG,RHUI,RSAI,RVAI, - //|----+----+----+----| - RMOD,RHUD,RSAD,RVAD, - //|----+----+----+----| - BSTP, , XX , XX - //`----+----+----+----' + [_FN2] = LAYOUT_ortho_4x4( + RESET, XXXXXXX, XXXXXXX, XXXXXXX, \ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, \ + BL_STEP, _______, XXXXXXX, XXXXXXX \ ) }; From 97b48dd010c184de16e511ef672aa8e783f35968 Mon Sep 17 00:00:00 2001 From: Dylan Khor Date: Tue, 30 Mar 2021 15:03:03 -0400 Subject: [PATCH 2/4] Update keyboards/keebio/chocopad/keymaps/khord/keymap.c Co-authored-by: Ryan --- keyboards/keebio/chocopad/keymaps/khord/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c index 349aa088600b..aa11f9937428 100644 --- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c +++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c @@ -22,10 +22,10 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ortho_4x4( - KC_P7, KC_P8, KC_P9, KC_BSPC, \ - KC_P4, KC_P5, KC_P6, KC_TAB , \ - KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_L1, KC_L2, KC_PDOT, KC_PSLS \ + KC_P7, KC_P8, KC_P9, KC_BSPC, + KC_P4, KC_P5, KC_P6, KC_TAB , + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_L1, KC_L2, KC_PDOT, KC_PSLS ), [_FN1] = LAYOUT_ortho_4x4( From 3555aea53f87e5af9d2fbe7015517a959de9e582 Mon Sep 17 00:00:00 2001 From: Dylan Khor Date: Tue, 30 Mar 2021 15:03:13 -0400 Subject: [PATCH 3/4] Update keyboards/keebio/chocopad/keymaps/khord/keymap.c Co-authored-by: Ryan --- keyboards/keebio/chocopad/keymaps/khord/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c index aa11f9937428..de9553be4b8e 100644 --- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c +++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c @@ -29,10 +29,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_ortho_4x4( - KC_ESC, KC_MAC1, KC_MAC2, KC_DEL , \ - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ - KC_M192, KC_M255, XXXXXXX, XXXXXXX, \ - _______, XXXXXXX, _______, XXXXXXX \ + KC_ESC, KC_MAC1, KC_MAC2, KC_DEL , + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_M192, KC_M255, XXXXXXX, XXXXXXX, + _______, XXXXXXX, _______, XXXXXXX ), [_FN2] = LAYOUT_ortho_4x4( From 31f95df783bf3988ec0802ca05a64334a5b4ce02 Mon Sep 17 00:00:00 2001 From: Dylan Khor Date: Tue, 30 Mar 2021 15:03:19 -0400 Subject: [PATCH 4/4] Update keyboards/keebio/chocopad/keymaps/khord/keymap.c Co-authored-by: Ryan --- keyboards/keebio/chocopad/keymaps/khord/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c index de9553be4b8e..04811dfb4f9e 100644 --- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c +++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c @@ -36,10 +36,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN2] = LAYOUT_ortho_4x4( - RESET, XXXXXXX, XXXXXXX, XXXXXXX, \ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, \ - BL_STEP, _______, XXXXXXX, XXXXXXX \ + RESET, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + BL_STEP, _______, XXXXXXX, XXXXXXX ) };