From d476b7c432cbf449cdff33ab28a9958c9cd2f30b Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 16 Aug 2021 13:28:58 -0400 Subject: [PATCH 01/26] Fix spacing --- keyboards/crkbd/keymaps/jussaw/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index c68305047411..85bbe44fc945 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT,MO(3), KC_RALT + KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, MO(3), KC_RALT ), //,-----------------------------------------------------. ,-----------------------------------------------------. From 8bd7813da8865408ee93d936f4190f21dbefcd87 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 16 Aug 2021 15:50:59 -0400 Subject: [PATCH 02/26] Fix errors --- keyboards/crkbd/keymaps/jussaw/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 85bbe44fc945..18641871aab7 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -88,14 +88,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. //| Reset | | | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ | Ms Up |Ms Down |Ms Right|Ms Left |Ms Acc2 | + //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //|RGB Mode| Hue- | Sat- |Bright- |Effect+ |AG_NORM | | Vol- | M | , | . | / |Ms Acc3 | + //|RGB Mode| Hue- | Sat- |Bright- |Effect+ |AG_NORM | | Vol- | MsWl L | MsWl D | MsWl U | MsWl R |Ms Acc3 | //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_ADJUST] = LAYOUT_split_3x6_3( - RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(4) , KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, + RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX From e89efc3cc35df3df1cf6dd56242bd6835e15ddb0 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 00:54:38 -0400 Subject: [PATCH 03/26] Fix ASCII for Adjust --- keyboards/crkbd/keymaps/jussaw/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 18641871aab7..fb079a06a2c8 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -102,11 +102,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Bksp | Tab | Q | W | E | R | T | Y | U | I | O | P | + //| Bksp | Tab | Q | W | E | R | | T | Y | U | I | O | P | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| "" | Shift | A | S | D | F | G | H | J | K | L | ; | + //| "" | Shift | A | S | D | F | | G | H | J | K | L | ; | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Enter | Ctrl | Z | X | C | V | B | N | M | , | . | / | + //| Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / | //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| // | Esc | Alt | Space | | TG(4) | //`--------------------------' `--------------------------' From 76def7e8f7712f03e26dfdefb72745242b92f3ba Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 00:55:43 -0400 Subject: [PATCH 04/26] Add Colemak Mod-DH Layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index fb079a06a2c8..83b712526427 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -24,7 +24,8 @@ enum layers { _LOWER, _UPPER, _ADJUST, - _GAME + _GAME, + _COLEMAKDH }; enum custom_keycodes { @@ -32,7 +33,8 @@ enum custom_keycodes { LOWER, UPPER, ADJUST, - GAME + GAME, + COLEMAKDH }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -115,7 +117,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(4) - ) + ), + + //,-----------------------------------------------------. ,-----------------------------------------------------. + //| Tab | Q | W | F | P | B | | J | L | U | Y | ; | Bksp | + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + //| Esc | A | R | S | T | G | | M | N | E | I | O | "" | + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + //| Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + // | Ctrl | Lower | Space Shift | Upper | GUI | + //`--------------------------' `--------------------------' + [_COLEMAKDH] = LAYOUT_split_3x6_3( + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI + ), }; #ifdef OLED_DRIVER_ENABLE From bedae5fff349d94eefbb48f4c678961c55e9467d Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 00:58:50 -0400 Subject: [PATCH 05/26] Add layer toggles --- keyboards/crkbd/keymaps/jussaw/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 83b712526427..6d3de2ecb91f 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Reset | | | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | + //| Reset | DF(0) | DF(5) | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_ADJUST] = LAYOUT_split_3x6_3( - RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, + RESET, DF(0), DF(5), XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX From 846df14f6ca7eec3d108d9b7d260deb5f4b2ec0f Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 01:13:43 -0400 Subject: [PATCH 06/26] Fix CM Layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 6d3de2ecb91f..26456a78dc0a 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -129,8 +129,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_COLEMAKDH] = LAYOUT_split_3x6_3( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, + KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI ), From 3f6e128aebe062afb5290ebba8f1d6505b7ec85a Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 01:36:09 -0400 Subject: [PATCH 07/26] Add Colemak Mod-DH layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 30 ++++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index fb079a06a2c8..4d41af03aa57 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -24,7 +24,8 @@ enum layers { _LOWER, _UPPER, _ADJUST, - _GAME + _GAME, + _COLEMAKDH }; enum custom_keycodes { @@ -32,7 +33,8 @@ enum custom_keycodes { LOWER, UPPER, ADJUST, - GAME + GAME, + COLEMAKDH }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -53,6 +55,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI ), + //,-----------------------------------------------------. ,-----------------------------------------------------. + //| Tab | Q | W | F | P | B | | J | L | U | Y | ; | Bksp | + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + //| Esc | A | R | S | T | G | | M | N | E | I | O | "" | + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + //| Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + // | Ctrl | Lower | Space Shift | Upper | GUI | + //`--------------------------' `--------------------------' + [_COLEMAKDH] = LAYOUT_split_3x6_3( + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, + KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, + KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI + ), + //,-----------------------------------------------------. ,-----------------------------------------------------. //| Tab | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Bksp | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -75,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //| Del | | | | | | | | Left | Down | Up | Right | "" | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //| Alt | | | | | | | | Home |Pg Down | Pg Up | End | Enter | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + //|--------+--------+--------+--------+--------+--------+---q-----| |--------+--------+--------+--------+--------+--------+--------| // | Ctrl | Adjust | Space Shift | Trans | GUI | //`--------------------------' `--------------------------' [_UPPER] = LAYOUT_split_3x6_3( @@ -86,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Reset | | | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | + //| Reset | DF(0) | DF(5) | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -95,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_ADJUST] = LAYOUT_split_3x6_3( - RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, + RESET, DF(0), DF(5), XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX @@ -115,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(4) - ) + ), }; #ifdef OLED_DRIVER_ENABLE From c967b532eb13a2329e49511640ddd74b7ccd0a36 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 01:38:59 -0400 Subject: [PATCH 08/26] Revert "Fix CM Layer" This reverts commit 846df14f6ca7eec3d108d9b7d260deb5f4b2ec0f. --- keyboards/crkbd/keymaps/jussaw/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 26456a78dc0a..6d3de2ecb91f 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -129,8 +129,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_COLEMAKDH] = LAYOUT_split_3x6_3( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, - KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI ), From df88eac7f692594c7ac5f04a8cf2157b551bdc4b Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 01:39:25 -0400 Subject: [PATCH 09/26] Revert "Add layer toggles" This reverts commit bedae5fff349d94eefbb48f4c678961c55e9467d. --- keyboards/crkbd/keymaps/jussaw/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 6d3de2ecb91f..83b712526427 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Reset | DF(0) | DF(5) | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | + //| Reset | | | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_ADJUST] = LAYOUT_split_3x6_3( - RESET, DF(0), DF(5), XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, + RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX From 5a98c8c1235faf5da6e78966d50534345ea84c7a Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 01:39:32 -0400 Subject: [PATCH 10/26] Revert "Add Colemak Mod-DH Layer" This reverts commit 76def7e8f7712f03e26dfdefb72745242b92f3ba. --- keyboards/crkbd/keymaps/jussaw/keymap.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 83b712526427..fb079a06a2c8 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -24,8 +24,7 @@ enum layers { _LOWER, _UPPER, _ADJUST, - _GAME, - _COLEMAKDH + _GAME }; enum custom_keycodes { @@ -33,8 +32,7 @@ enum custom_keycodes { LOWER, UPPER, ADJUST, - GAME, - COLEMAKDH + GAME }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -117,23 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(4) - ), - - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Tab | Q | W | F | P | B | | J | L | U | Y | ; | Bksp | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Esc | A | R | S | T | G | | M | N | E | I | O | "" | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Ctrl | Lower | Space Shift | Upper | GUI | - //`--------------------------' `--------------------------' - [_COLEMAKDH] = LAYOUT_split_3x6_3( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI - ), + ) }; #ifdef OLED_DRIVER_ENABLE From df23b7fd605e3a1d1668e70f5dcb75c86c29a170 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 21:06:25 -0400 Subject: [PATCH 11/26] Fixes CM layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 4d41af03aa57..7e19bfeba387 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -21,20 +21,20 @@ along with this program. If not, see . enum layers { _QWERTY, + _COLEMAKDH, _LOWER, _UPPER, _ADJUST, _GAME, - _COLEMAKDH }; enum custom_keycodes { QWERTY = SAFE_RANGE, + COLEMAKDH, LOWER, UPPER, ADJUST, GAME, - COLEMAKDH }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI + KC_LCTL, MO(2), KC_SPC, KC_RSFT, MO(3), KC_RGUI ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_LCTL, MO(1), KC_SPC, KC_RSFT, MO(2), KC_RGUI + KC_LCTL, MO(2), KC_SPC, KC_RSFT, MO(3), KC_RGUI ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, MO(3), KC_RALT + KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, MO(4), KC_RALT ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_QUOT, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_ENT, - KC_LCTL, MO(3), KC_SPC, KC_RSFT, KC_TRNS, KC_RGUI + KC_LCTL, MO(4), KC_SPC, KC_RSFT, KC_TRNS, KC_RGUI ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_ADJUST] = LAYOUT_split_3x6_3( - RESET, DF(0), DF(5), XXXXXXX, XXXXXXX, TG(4), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, + RESET, DF(0), DF(1), XXXXXXX, XXXXXXX, TG(5), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX From 9ade9dfc5c6a4423afd7a93129921d1d7966d8d8 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Thu, 19 Aug 2021 23:40:53 -0400 Subject: [PATCH 12/26] Improve modularity --- keyboards/crkbd/keymaps/jussaw/keymap.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 7e19bfeba387..493799ec4033 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -37,6 +37,10 @@ enum custom_keycodes { GAME, }; +#define LOWER MO(_LOWER) +#define UPPER MO(_UPPER) +#define ADJUST MO(_ADJUST) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -52,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_LCTL, MO(2), KC_SPC, KC_RSFT, MO(3), KC_RGUI + KC_LCTL, LOWER, KC_SPC, KC_RSFT, UPPER, KC_RGUI ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -68,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_LCTL, MO(2), KC_SPC, KC_RSFT, MO(3), KC_RGUI + KC_LCTL, LOWER, KC_SPC, KC_RSFT, UPPER, KC_RGUI ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -84,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, MO(4), KC_RALT + KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, ADJUST, KC_RALT ), //,-----------------------------------------------------. ,-----------------------------------------------------. @@ -100,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_QUOT, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_ENT, - KC_LCTL, MO(4), KC_SPC, KC_RSFT, KC_TRNS, KC_RGUI + KC_LCTL, ADJUST, KC_SPC, KC_RSFT, KC_TRNS, KC_RGUI ), //,-----------------------------------------------------. ,-----------------------------------------------------. From 85c6d5ee62b1c237e7cf683292b4a1330f2aa040 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Fri, 20 Aug 2021 00:07:42 -0400 Subject: [PATCH 13/26] Fix art --- keyboards/crkbd/keymaps/jussaw/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 493799ec4033..80b5d8200db4 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //| Del | | | | | | | | Left | Down | Up | Right | "" | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //| Alt | | | | | | | | Home |Pg Down | Pg Up | End | Enter | - //|--------+--------+--------+--------+--------+--------+---q-----| |--------+--------+--------+--------+--------+--------+--------| + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| // | Ctrl | Adjust | Space Shift | Trans | GUI | //`--------------------------' `--------------------------' [_UPPER] = LAYOUT_split_3x6_3( From dc19d44ffa45ad998040547460075dfb00c39c8b Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Sat, 28 Aug 2021 12:26:54 -0400 Subject: [PATCH 14/26] Improve layer references --- keyboards/crkbd/keymaps/jussaw/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 80b5d8200db4..7f0fe11582c3 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // | Ctrl | Lower | Space Shift | Upper | GUI | //`--------------------------' `--------------------------' [_ADJUST] = LAYOUT_split_3x6_3( - RESET, DF(0), DF(1), XXXXXXX, XXXXXXX, TG(5), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, + RESET,DF(_QWERTY),DF(_COLEMAKDH),XXXXXXX, XXXXXXX,TG(_GAME), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX @@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(4) + KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(_GAME) ), }; From d4cbde977609559c9017634f0e594369aaf8b4f5 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Sat, 28 Aug 2021 14:02:43 -0400 Subject: [PATCH 15/26] Fix ASCII art Adjust --- keyboards/crkbd/keymaps/jussaw/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 7f0fe11582c3..52ac66704d42 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Reset | DF(0) | DF(5) | | | TG(4) | | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | + //| Reset |DF(QWRT)|DF(CMDH)| | |TG(GAME)| | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From 9d99ae55ffc4f6521ddbfed42d2d7e8e88ab7656 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 30 Aug 2021 20:13:53 -0400 Subject: [PATCH 16/26] Improves ASCII art --- keyboards/crkbd/keymaps/jussaw/keymap.c | 124 +++++++++++++----------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 52ac66704d42..240e9a089127 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -43,15 +43,17 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Esc | A | S | D | F | G | | H | J | K | L | ; | "" | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Alt | Z | X | C | V | B | | N | M | , | . | / | Enter | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Ctrl | Lower | Space Shift | Upper | GUI | - //`--------------------------' `--------------------------' + /* Qwerty + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Esc | A | S | D | F | G | | H | J | K | L | ; | "" | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Alt | Z | X | C | V | B | | N | M | , | . | / | Enter | + * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + * | Ctrl | Lower | Space Shift | Upper | GUI | + * `--------------------------' `--------------------------' + */ [_QWERTY] = LAYOUT_split_3x6_3( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, @@ -59,31 +61,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, LOWER, KC_SPC, KC_RSFT, UPPER, KC_RGUI ), - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Tab | Q | W | F | P | B | | J | L | U | Y | ; | Bksp | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Esc | A | R | S | T | G | | M | N | E | I | O | "" | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Ctrl | Lower | Space Shift | Upper | GUI | - //`--------------------------' `--------------------------' + /* Colemak Mod-DH + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | Tab | Q | W | F | P | B | | J | L | U | Y | ; | Bksp | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Esc | A | R | S | T | G | | M | N | E | I | O | "" | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | + * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + * | Ctrl | Lower | Space Shift | Upper | GUI | + * `--------------------------' `--------------------------' + */ [_COLEMAKDH] = LAYOUT_split_3x6_3( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, LOWER, KC_SPC, KC_RSFT, UPPER, KC_RGUI ), - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Tab | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Bksp | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| F1 | F2 | F3 | F4 | F5 | F6 | | ` | - | = | [ | ] | \ | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| F7 | F8 | F9 | F10 | F11 | F12 | | ~ | _ | + | { | } | | | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Ctrl | Trans | Space Shift | Adjust | Alt | - //`--------------------------' `--------------------------' + /* Lower + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | Tab | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Bksp | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | F1 | F2 | F3 | F4 | F5 | F6 | | ` | - | = | [ | ] | \ | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | F7 | F8 | F9 | F10 | F11 | F12 | | ~ | _ | + | { | } | | | + * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + * | Ctrl | Trans | Space Shift | Adjust | Alt | + * `--------------------------' `--------------------------' + */ [_LOWER] = LAYOUT_split_3x6_3( KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, @@ -91,15 +97,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, ADJUST, KC_RALT ), - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Tab | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Del | | | | | | | | Left | Down | Up | Right | "" | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Alt | | | | | | | | Home |Pg Down | Pg Up | End | Enter | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Ctrl | Adjust | Space Shift | Trans | GUI | - //`--------------------------' `--------------------------' + /* Upper + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | Tab | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Del | | | | | | | | Left | Down | Up | Right | "" | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Alt | | | | | | | | Home |Pg Down | Pg Up | End | Enter | + * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + * | Ctrl | Adjust | Space Shift | Trans | GUI | + * `--------------------------' `--------------------------' + */ [_UPPER] = LAYOUT_split_3x6_3( KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_QUOT, @@ -107,15 +115,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, ADJUST, KC_SPC, KC_RSFT, KC_TRNS, KC_RGUI ), - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Reset |DF(QWRT)|DF(CMDH)| | |TG(GAME)| | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //|RGB Mode| Hue- | Sat- |Bright- |Effect+ |AG_NORM | | Vol- | MsWl L | MsWl D | MsWl U | MsWl R |Ms Acc3 | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Ctrl | Lower | Space Shift | Upper | GUI | - //`--------------------------' `--------------------------' + /* Adjust + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | Reset |DF(QWRT)|DF(CMDH)| | |TG(GAME)| | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * |RGB Mode| Hue- | Sat- |Bright- |Effect+ |AG_NORM | | Vol- | MsWl L | MsWl D | MsWl U | MsWl R |Ms Acc3 | + * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + * | Ctrl | Lower | Space Shift | Upper | GUI | + * `--------------------------' `--------------------------' + */ [_ADJUST] = LAYOUT_split_3x6_3( RESET,DF(_QWERTY),DF(_COLEMAKDH),XXXXXXX, XXXXXXX,TG(_GAME), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, @@ -123,17 +133,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX ), - //,-----------------------------------------------------. ,-----------------------------------------------------. - //| Bksp | Tab | Q | W | E | R | | T | Y | U | I | O | P | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| "" | Shift | A | S | D | F | | G | H | J | K | L | ; | - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - //| Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / | - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - // | Esc | Alt | Space | | TG(4) | - //`--------------------------' `--------------------------' + /* Game + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | Bksp | Tab | Q | W | E | R | | T | Y | U | I | O | P | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | "" | Shift | A | S | D | F | | G | H | J | K | L | ; | + * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + * | Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / | + * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + * | Esc | Alt | Space | | TG(4) | + * `--------------------------' `--------------------------' + */ [_GAME] = LAYOUT_split_3x6_3( - KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(_GAME) From cd4726517b7b7938c8fc32012fadf95b6881839c Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 21 Mar 2022 18:13:15 -0500 Subject: [PATCH 17/26] Update crkbd F-keys --- keyboards/crkbd/keymaps/jussaw/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 240e9a089127..4c952ccccec9 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -83,17 +83,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------. ,-----------------------------------------------------. * | Tab | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Bksp | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | F1 | F2 | F3 | F4 | F5 | F6 | | ` | - | = | [ | ] | \ | + * | F11 | F1 | F2 | F3 | F4 | F5 | | ` | - | = | [ | ] | \ | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | F7 | F8 | F9 | F10 | F11 | F12 | | ~ | _ | + | { | } | | | + * | F12 | F6 | F7 | F8 | F9 | F10 | | ~ | _ | + | { | } | | | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| * | Ctrl | Trans | Space Shift | Adjust | Alt | * `--------------------------' `--------------------------' */ [_LOWER] = LAYOUT_split_3x6_3( KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + KC_F12, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LCTL, KC_TRNS, KC_SPC, KC_RSFT, ADJUST, KC_RALT ), From 81fd507dcc7d0e551f1622428a8261865981b6b7 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 3 Oct 2022 22:24:18 -0600 Subject: [PATCH 18/26] Update lib --- lib/chibios | 2 +- lib/chibios-contrib | 2 +- lib/googletest | 2 +- lib/lufa | 2 +- lib/pico-sdk | 1 + lib/printf | 2 +- lib/vusb | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 160000 lib/pico-sdk diff --git a/lib/chibios b/lib/chibios index ffe54d63cb10..f836d24b06d7 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit ffe54d63cb10a355add318f8e922e39f1c3d4bfd +Subproject commit f836d24b06d7265696a33d1cea010bd6a931791d diff --git a/lib/chibios-contrib b/lib/chibios-contrib index 61baa6b03613..d03aa9cc2f76 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 61baa6b036138c155f7cfc5646d833d9423f3243 +Subproject commit d03aa9cc2f76468e431c71421015102956dd6ad7 diff --git a/lib/googletest b/lib/googletest index ec44c6c1675c..e2239ee6043f 160000 --- a/lib/googletest +++ b/lib/googletest @@ -1 +1 @@ -Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 +Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 diff --git a/lib/lufa b/lib/lufa index ce10f7642b04..549b97320d51 160000 --- a/lib/lufa +++ b/lib/lufa @@ -1 +1 @@ -Subproject commit ce10f7642b0459e409839b23cc91498945119b4d +Subproject commit 549b97320d515bfca2f95c145a67bd13be968faa diff --git a/lib/pico-sdk b/lib/pico-sdk new file mode 160000 index 000000000000..07edde8e4989 --- /dev/null +++ b/lib/pico-sdk @@ -0,0 +1 @@ +Subproject commit 07edde8e49890d2172bbc272aacc119f999df063 diff --git a/lib/printf b/lib/printf index d3b984684bb8..c2e3b4e10d28 160000 --- a/lib/printf +++ b/lib/printf @@ -1 +1 @@ -Subproject commit d3b984684bb8a8bdc48cc7a1abecb93ce59bbe3e +Subproject commit c2e3b4e10d281e7f0f694d3ecbd9f320977288cc diff --git a/lib/vusb b/lib/vusb index bdb53e4c043d..819dbc1e5d59 160000 --- a/lib/vusb +++ b/lib/vusb @@ -1 +1 @@ -Subproject commit bdb53e4c043d089279d9891b68bea77614cb97ee +Subproject commit 819dbc1e5d5926b17e27e00ca6d3d2988adae04e From 1e979f9709890903e838e53fd2c52dcbd951c4cf Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 3 Oct 2022 22:24:39 -0600 Subject: [PATCH 19/26] Update gaming layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 9e1a0e42c06e..9d6861a36350 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -140,18 +140,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------. ,-----------------------------------------------------. * | Bksp | Tab | Q | W | E | R | | T | Y | U | I | O | P | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | "" | Shift | A | S | D | F | | G | H | J | K | L | ; | + * | "" | Esc | A | S | D | F | | G | H | J | K | L | ; | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / | + * | Enter | Shift | Z | X | C | V | | B | N | M | , | . | / | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Esc | Alt | Space | | TG(4) | + * | Ctrl | Space | Alt | | TG(4) | * `--------------------------' `--------------------------' */ [_GAME] = LAYOUT_split_3x6_3( KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(_GAME) + KC_QUOT, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_SPC, KC_LALT, XXXXXXX, XXXXXXX, TG(_GAME) ), }; From e9a873218b6897aa82356be16abdad4cbf847c4a Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Mon, 3 Oct 2022 22:25:34 -0600 Subject: [PATCH 20/26] Update ASCII art --- keyboards/crkbd/keymaps/jussaw/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 9d6861a36350..56ec06a8844e 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| * | Alt | Z | X | C | V | B | | N | M | , | . | / | Enter | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Lower | Space Shift | Upper | GUI | + * | Ctrl | Lower | Space | | Shift | Upper | GUI | * `--------------------------' `--------------------------' */ [_QWERTY] = LAYOUT_split_3x6_3( @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| * | Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Lower | Space Shift | Upper | GUI | + * | Ctrl | Lower | Space | | Shift | Upper | GUI | * `--------------------------' `--------------------------' */ [_COLEMAKDH] = LAYOUT_split_3x6_3( @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| * | F12 | F6 | F7 | F8 | F9 | F10 | | ~ | _ | + | { | } | | | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Trans | Space Shift | Adjust | Alt | + * | Ctrl | Trans | Space | | Shift | Adjust | Alt | * `--------------------------' `--------------------------' */ [_LOWER] = LAYOUT_split_3x6_3( @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| * | Alt | | | | | | | | Home |Pg Down | Pg Up | End | Enter | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Adjust | Space Shift | Trans | GUI | + * | Ctrl | Adjust | Space | | Shift | Trans | GUI | * `--------------------------' `--------------------------' */ [_UPPER] = LAYOUT_split_3x6_3( @@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| * |RGB Mode| Hue- | Sat- |Bright- |Effect+ |AG_NORM | | Vol- | MsWl L | MsWl D | MsWl U | MsWl R |Ms Acc3 | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Lower | Space Shift | Upper | GUI | + * | Ctrl | Lower | Space | | Shift | Upper | GUI | * `--------------------------' `--------------------------' */ [_ADJUST] = LAYOUT_split_3x6_3( @@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| * | Enter | Shift | Z | X | C | V | | B | N | M | , | . | / | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Space | Alt | | TG(4) | + * | Ctrl | Space | Alt | | | | TG(4) | * `--------------------------' `--------------------------' */ [_GAME] = LAYOUT_split_3x6_3( From 7b4a6cce91a421c671b60d2ff177f4c433211944 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Tue, 4 Oct 2022 20:27:09 -0600 Subject: [PATCH 21/26] Update gaming layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 56ec06a8844e..73f1679da873 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -140,18 +140,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------. ,-----------------------------------------------------. * | Bksp | Tab | Q | W | E | R | | T | Y | U | I | O | P | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | "" | Esc | A | S | D | F | | G | H | J | K | L | ; | + * | "" | Shift | A | S | D | F | | G | H | J | K | L | ; | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | Enter | Shift | Z | X | C | V | | B | N | M | , | . | / | + * | Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Space | Alt | | | | TG(4) | + * | Esc | Alt | Space | | | | TG(4) | * `--------------------------' `--------------------------' */ [_GAME] = LAYOUT_split_3x6_3( KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_QUOT, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LCTL, KC_SPC, KC_LALT, XXXXXXX, XXXXXXX, TG(_GAME) + KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(_GAME) ), }; From d51706bd512e11d79eb82e306a9e44fb794c0cc0 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Tue, 4 Oct 2022 20:30:41 -0600 Subject: [PATCH 22/26] Update mouse settings --- keyboards/crkbd/keymaps/jussaw/config.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/keyboards/crkbd/keymaps/jussaw/config.h b/keyboards/crkbd/keymaps/jussaw/config.h index a7eb87d6be9c..d13898f0c729 100644 --- a/keyboards/crkbd/keymaps/jussaw/config.h +++ b/keyboards/crkbd/keymaps/jussaw/config.h @@ -91,3 +91,15 @@ along with this program. If not, see . #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" + +// Mouse key speed and acceleration. +#undef MOUSEKEY_DELAY +#define MOUSEKEY_DELAY 0 +#undef MOUSEKEY_INTERVAL +#define MOUSEKEY_INTERVAL 16 +#undef MOUSEKEY_WHEEL_DELAY +#define MOUSEKEY_WHEEL_DELAY 0 +#undef MOUSEKEY_MAX_SPEED +#define MOUSEKEY_MAX_SPEED 6 +#undef MOUSEKEY_TIME_TO_MAX +#define MOUSEKEY_TIME_TO_MAX 64 From fa82f388e7e04916437564e5cf95bb5dde837b2a Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Sat, 8 Oct 2022 03:29:15 -0600 Subject: [PATCH 23/26] Remove left column in game mode --- keyboards/crkbd/keymaps/jussaw/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 73f1679da873..9434b494a094 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -138,19 +138,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Game * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | Bksp | Tab | Q | W | E | R | | T | Y | U | I | O | P | + * | | Tab | Q | W | E | R | | T | Y | U | I | O | P | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | "" | Shift | A | S | D | F | | G | H | J | K | L | ; | + * | | Shift | A | S | D | F | | G | H | J | K | L | ; | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / | + * | | Ctrl | Z | X | C | V | | B | N | M | , | . | / | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| * | Esc | Alt | Space | | | | TG(4) | * `--------------------------' `--------------------------' */ [_GAME] = LAYOUT_split_3x6_3( - KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + XXXXXXX, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + XXXXXXX, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(_GAME) ), }; From 1b68c3d0835cce8b0fe757054b8a98bb435cf9af Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Tue, 11 Oct 2022 18:11:03 -0600 Subject: [PATCH 24/26] Adjusts columns in Game layer --- keyboards/crkbd/keymaps/jussaw/keymap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 6d8ea0728bb8..d773d040909a 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -137,18 +137,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Game * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | | Tab | Q | W | E | R | | T | Y | U | I | O | P | + * | T | Tab | Q | W | E | R | | Y | U | I | O | P | Bksp | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | | Shift | A | S | D | F | | G | H | J | K | L | ; | + * | G | Shift | A | S | D | F | | H | J | K | L | ; | "" | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | | Ctrl | Z | X | C | V | | B | N | M | , | . | / | + * | B | Ctrl | Z | X | C | V | | N | M | , | . | / | Enter | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Esc | Alt | Space | | | | + * | Esc | Alt | Space | | | |TG(GAME)| + * `--------------------------' `--------------------------' */ [_GAME] = LAYOUT_split_3x6_3( - XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - XXXXXXX, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - XXXXXXX, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_T, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_G, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_B, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_ESC, KC_LALT, KC_SPC, XXXXXXX, XXXXXXX, TG(_GAME) ), }; From b5883ca7fafb660a94607b1e8cd3e6b84e17ecc3 Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Sat, 4 Mar 2023 21:57:50 -0700 Subject: [PATCH 25/26] Add bottom bar to art --- keyboards/crkbd/keymaps/jussaw/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index d773d040909a..1333133f82ae 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -70,6 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Alt | Z | X | C | D | V | | K | H | , | . | / | Enter | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| * | Ctrl | Lower | Space | | Shift | Upper | GUI | + * `--------------------------' `--------------------------' */ [_COLEMAKDH] = LAYOUT_split_3x6_3( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, From 1418c283d27158af5fdf43145779476e76f7b6ff Mon Sep 17 00:00:00 2001 From: Justin Sawyer Date: Sat, 4 Mar 2023 22:27:04 -0700 Subject: [PATCH 26/26] Adjust layer overhaul --- keyboards/crkbd/keymaps/jussaw/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/crkbd/keymaps/jussaw/keymap.c b/keyboards/crkbd/keymaps/jussaw/keymap.c index 1333133f82ae..5e2de0a70eac 100644 --- a/keyboards/crkbd/keymaps/jussaw/keymap.c +++ b/keyboards/crkbd/keymaps/jussaw/keymap.c @@ -119,19 +119,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Adjust * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | Reset |DF(QWRT)|DF(CMDH)| | |TG(GAME)| | Play | Mouse1 | Mouse2 | Mouse4 | Mouse5 |Ms Acc1 | + * | Reset |DF(QWRT)|DF(CMDH)| | |TG(GAME)| | Play | Prev | Next | | | | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * | RGB | Hue+ | Sat+ |Bright+ |Effect- |AG_SWAP | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right|Ms Acc2 | + * | RGB | | | Mouse2 | Mouse1 | | | Vol+ |Ms Left |Ms Down | Ms Up |Ms Right| | * |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - * |RGB Mode| Hue- | Sat- |Bright- |Effect+ |AG_NORM | | Vol- | MsWl L | MsWl D | MsWl U | MsWl R |Ms Acc3 | + * |RGB Mode| | | Mouse4 | Mouse5 | | | Vol- | MsWl L | MsWl D | MsWl U | MsWl R | | * |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - * | Ctrl | Lower | Space | | Shift | Upper | GUI | + * | | Lower | | | | Upper | | * `--------------------------' `--------------------------' */ [_ADJUST] = LAYOUT_split_3x6_3( - RESET,DF(_QWERTY),DF(_COLEMAKDH),XXXXXXX, XXXXXXX,TG(_GAME), KC_MPLY, KC_BTN1, KC_BTN2, KC_BTN4, KC_BTN5, KC_ACL0, - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, AG_SWAP, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, AG_NORM, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, + RESET,DF(_QWERTY),DF(_COLEMAKDH),XXXXXXX, XXXXXXX,TG(_GAME), KC_MPLY, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_TOG, XXXXXXX, XXXXXXX, KC_BTN2, KC_BTN1, XXXXXXX, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, + RGB_MOD, XXXXXXX, XXXXXXX, KC_BTN4, KC_BTN5, XXXXXXX, KC_VOLD, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX ),