From 6d1e6ec1deb8f941790d15db87385bd7ce9f9ba9 Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Wed, 25 Sep 2019 11:49:08 +0200 Subject: [PATCH 1/8] Remodel FN to NUM layer --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index 9889b9d7051..caeafb903b9 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -13,7 +13,7 @@ enum layer_names { _COLEMAKDHM, _GAMING, _GAMING_EXT, - _FN, + _NUM, _SYM, _NAV, _UTIL @@ -34,7 +34,7 @@ enum custom_keycodes { #define KC_T_SYM TT(_SYM) #define KC_S_SYM MO(_SYM) -#define KC_FNTAB LT(_FN, KC_TAB) +#define KC_NMTAB LT(_NUM, KC_TAB) #define KC_GMSFT LT(_GAMING_EXT, KC_LSHIFT) @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------. ,-----------------------------------------. ESC, Q, W, F, P, B, J, L, U, Y, SCLN, BSPC,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - FNTAB, A, R, S, T, G, M, N, E, I, O, QUOT,\ + NMTAB, A, R, S, T, G, M, N, E, I, O, QUOT,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| LCTBR, Z, X, C, D, V, K, H, COMM, DOT, SLSH, RCTBR,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| @@ -111,11 +111,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SYM] = LAYOUT_kc( \ //,-----------------------------------------. ,-----------------------------------------. - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSLS,\ + GRV, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, BSLS,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - TILD, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE,\ + TILD, XXXXX, XXXXX, XXXXX, EUR, XXXXX, XXXXX, MINS, UNDS, PLUS, EQL, PIPE,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, XXXXX, XXXXX, XXXXX, EUR, PLUS, MINS, UNDS, LT, GT, EQL, _____,\ + _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| _____, S_SYM, _____, _____, _____, _____ \ //`--------------------' `--------------------' @@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------------------' `--------------------' ), - [_FN] = LAYOUT_kc( \ + [_NUM] = LAYOUT_kc( \ //,-----------------------------------------. ,-----------------------------------------. - ESC, F1, F2, F3, F4, F5, XXXXX, 7, 8, 9, SLSH, ASTR,\ + ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, SLSH,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F6, F7, F8, F9, F10, CAPS, 4, 5, 6, MINS, PLUS,\ + _____, F1, F2, F3, F4, F5, F11, 4, 5, 6, MINS, PLUS,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F11, F12, XXXXX, XXXXX, PSCR, XXXXX, 1, 2, 3, XXXXX, ENT,\ + _____, F6, F7, F8, F9, F10, F12, 1, 2, 3, ASTR, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, _____, _____, 0, DOT, COMM \ + _____, _____, _____, _____, 0, DOT \ //`--------------------' `--------------------' ), @@ -219,7 +219,7 @@ void render_status(void) { case 0: oled_write_P(PSTR(" "), false); break; - case _FN: + case _NUM: oled_write_P(PSTR("Stage"), false); break; case _SYM: From dcbd19c50ba36455bb8ed246b6747dad44f96f19 Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Wed, 25 Sep 2019 15:11:57 +0200 Subject: [PATCH 2/8] Swap SYM and NUM layers --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index caeafb903b9..8849c38c127 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -31,10 +31,11 @@ enum custom_keycodes { #define KC_T_NAV TT(_NAV) #define KC_S_NAV MO(_NAV) -#define KC_T_SYM TT(_SYM) -#define KC_S_SYM MO(_SYM) +#define KC_T_NUM TT(_NUM) +#define KC_S_NUM MO(_NUM) -#define KC_NMTAB LT(_NUM, KC_TAB) +#define KC_SYMTB LT(_SYM, KC_TAB) +#define KC_0_NAV LT(_NAV, KC_0) #define KC_GMSFT LT(_GAMING_EXT, KC_LSHIFT) @@ -77,11 +78,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------. ,-----------------------------------------. ESC, Q, W, F, P, B, J, L, U, Y, SCLN, BSPC,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - NMTAB, A, R, S, T, G, M, N, E, I, O, QUOT,\ + SYMTB, A, R, S, T, G, M, N, E, I, O, QUOT,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| LCTBR, Z, X, C, D, V, K, H, COMM, DOT, SLSH, RCTBR,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - LALT, T_SYM, SFSPC, SFENT, T_NAV, RGUI \ + LALT, T_NUM, SFSPC, SFENT, T_NAV, RGUI \ //`--------------------' `--------------------' ), @@ -117,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|------+------+------+------+------+------| |------+------+------+------+------+------| _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, S_SYM, _____, _____, _____, _____ \ + _____, S_NUM, _____, _____, _____, _____ \ //`--------------------' `--------------------' ), @@ -141,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|------+------+------+------+------+------| |------+------+------+------+------+------| _____, F6, F7, F8, F9, F10, F12, 1, 2, 3, ASTR, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, _____, _____, _____, 0, DOT \ + _____, S_NUM, _____, _____, 0_NAV, DOT \ //`--------------------' `--------------------' ), @@ -175,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { uint32_t layer_state_set_user(uint32_t state) { switch (biton32(default_layer_state)) { case _COLEMAKDHM: - state = update_tri_layer_state(state, _SYM, _NAV, _UTIL); + state = update_tri_layer_state(state, _NUM, _NAV, _UTIL); break; case _GAMING: state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL); From 49323dc30b41932519597a9f37f2610be4b88af0 Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Wed, 25 Sep 2019 16:14:51 +0200 Subject: [PATCH 3/8] Update layers --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index 8849c38c127..f41feb6a58c 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------. ,-----------------------------------------. GRV, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, BSLS,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - TILD, XXXXX, XXXXX, XXXXX, EUR, XXXXX, XXXXX, MINS, UNDS, PLUS, EQL, PIPE,\ + _____, XXXXX, XXXXX, XXXXX, EUR, XXXXX, XXXXX, MINS, UNDS, PLUS, EQL, PIPE,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| @@ -136,11 +136,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUM] = LAYOUT_kc( \ //,-----------------------------------------. ,-----------------------------------------. - ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, SLSH,\ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F11,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F1, F2, F3, F4, F5, F11, 4, 5, 6, MINS, PLUS,\ + TILD, F1, F2, F3, F4, F5, SLSH, 4, 5, 6, MINS, F12,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F6, F7, F8, F9, F10, F12, 1, 2, 3, ASTR, _____,\ + _____, F6, F7, F8, F9, F10, ASTR, 1, 2, 3, PLUS, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| _____, S_NUM, _____, _____, 0_NAV, DOT \ //`--------------------' `--------------------' From 1d82b7cca71701f2cd6e41d4b87f1b389af17fe1 Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Wed, 25 Sep 2019 17:13:26 +0200 Subject: [PATCH 4/8] Remove unused key --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index f41feb6a58c..0d7f3cb4fb6 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -42,8 +42,6 @@ enum custom_keycodes { #define KC_TBFWD LCTL(KC_TAB) #define KC_TBBCK LCTL(LSFT(KC_TAB)) -#define KC_CTENT RCTL_T(KC_ENTER) - #define KC_RCTBR RCTL_T(KC_RBRACKET) #define KC_LCTBR LCTL_T(KC_LBRACKET) From 8792d0662019018dca49e157929ce716e8b5b9ef Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Thu, 26 Sep 2019 09:23:55 +0200 Subject: [PATCH 5/8] Change up layers --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index 0d7f3cb4fb6..141b92baf7d 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -14,7 +14,7 @@ enum layer_names { _GAMING, _GAMING_EXT, _NUM, - _SYM, + _FN, _NAV, _UTIL }; @@ -34,8 +34,9 @@ enum custom_keycodes { #define KC_T_NUM TT(_NUM) #define KC_S_NUM MO(_NUM) -#define KC_SYMTB LT(_SYM, KC_TAB) +#define KC_FNTAB LT(_FN, KC_TAB) #define KC_0_NAV LT(_NAV, KC_0) +#define KC_CTAST RCTL_T(KC_ASTR) #define KC_GMSFT LT(_GAMING_EXT, KC_LSHIFT) @@ -76,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------. ,-----------------------------------------. ESC, Q, W, F, P, B, J, L, U, Y, SCLN, BSPC,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - SYMTB, A, R, S, T, G, M, N, E, I, O, QUOT,\ + FNTAB, A, R, S, T, G, M, N, E, I, O, QUOT,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| LCTBR, Z, X, C, D, V, K, H, COMM, DOT, SLSH, RCTBR,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| @@ -108,15 +109,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------------------' `--------------------' ), - [_SYM] = LAYOUT_kc( \ + [_FN] = LAYOUT_kc( \ //,-----------------------------------------. ,-----------------------------------------. - GRV, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, BSLS,\ + GRV, F1, F2, F3, F4, F5, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, BSLS,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, XXXXX, XXXXX, XXXXX, EUR, XXXXX, XXXXX, MINS, UNDS, PLUS, EQL, PIPE,\ + _____, F6, F7, F8, F9, F10, XXXXX, UNDS, LPRN, RPRN, PLUS, PIPE,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, _____,\ + _____, F11, F12, XXXXX, CAPS, PSCR, XXXXX, MINS, LT, GT, EQL, PLUS,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, S_NUM, _____, _____, _____, _____ \ + _____, _____, _____, _____, _____, _____ \ //`--------------------' `--------------------' ), @@ -128,17 +129,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|------+------+------+------+------+------| |------+------+------+------+------+------| _____, XXXXX, WH_L, XXXXX, WH_R, XXXXX, XXXXX, ACL0, ACL1, ACL2, XXXXX, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+-----+-------| - _____, _____, SPACE, _____, S_NAV, _____ \ + _____, _____, _____, _____, S_NAV, _____ \ //`--------------------' `--------------------' ), [_NUM] = LAYOUT_kc( \ //,-----------------------------------------. ,-----------------------------------------. - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F11,\ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, _____,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - TILD, F1, F2, F3, F4, F5, SLSH, 4, 5, 6, MINS, F12,\ + TILD, EXLM, AT, HASH, DLR, PERC, EUR, 4, 5, 6, MINS, PLUS,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F6, F7, F8, F9, F10, ASTR, 1, 2, 3, PLUS, _____,\ + _____, CIRC, AMPR, ASTR, LPRN, RPRN, SLSH, 1, 2, 3, ASTR, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| _____, S_NUM, _____, _____, 0_NAV, DOT \ //`--------------------' `--------------------' @@ -221,7 +222,7 @@ void render_status(void) { case _NUM: oled_write_P(PSTR("Stage"), false); break; - case _SYM: + case _FN: oled_write_P(PSTR("Comm "), false); break; case _NAV: From 75193140412e0891f892c24d162321af9c8cb80f Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Thu, 26 Sep 2019 09:37:01 +0200 Subject: [PATCH 6/8] Rename indicators --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index 141b92baf7d..413d904593d 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -220,13 +220,13 @@ void render_status(void) { oled_write_P(PSTR(" "), false); break; case _NUM: - oled_write_P(PSTR("Stage"), false); - break; - case _FN: oled_write_P(PSTR("Comm "), false); break; + case _FN: + oled_write_P(PSTR("Stage"), false); + break; case _NAV: - oled_write_P(PSTR("Gyro "), false); + oled_write_P(PSTR("Fuel "), false); break; case _GAMING_EXT: oled_write_P(PSTR("Ext "), false); From 97481ea3d6484c5c7d137d897fce7d3d5fd004db Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Thu, 26 Sep 2019 09:45:54 +0200 Subject: [PATCH 7/8] Change up numpad --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index 413d904593d..7fd6c6d6ab6 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------. ,-----------------------------------------. GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, _____,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - TILD, EXLM, AT, HASH, DLR, PERC, EUR, 4, 5, 6, MINS, PLUS,\ + TILD, EXLM, AT, HASH, DLR, PERC, MINS, 4, 5, 6, PLUS, EUR,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| _____, CIRC, AMPR, ASTR, LPRN, RPRN, SLSH, 1, 2, 3, ASTR, _____,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| From 0178c8c5a45731442a0dae52e1b71e5755cd5a6a Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Thu, 26 Sep 2019 09:48:35 +0200 Subject: [PATCH 8/8] Rework FN layer --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index 7fd6c6d6ab6..a334d72998e 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -111,11 +111,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_kc( \ //,-----------------------------------------. ,-----------------------------------------. - GRV, F1, F2, F3, F4, F5, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, BSLS,\ + GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, BSLS,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F6, F7, F8, F9, F10, XXXXX, UNDS, LPRN, RPRN, PLUS, PIPE,\ + _____, F11, F12, XXXXX, XXXXX, XXXXX, XXXXX, MINS, LPRN, RPRN, PLUS, PIPE,\ //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, F11, F12, XXXXX, CAPS, PSCR, XXXXX, MINS, LT, GT, EQL, PLUS,\ + _____, XXXXX, XXXXX, XXXXX, CAPS, PSCR, XXXXX, UNDS, LT, GT, EQL, XXXXX,\ //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| _____, _____, _____, _____, _____, _____ \ //`--------------------' `--------------------'