Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crkdb/jussaw #10

Closed
wants to merge 35 commits into from
Closed

Crkdb/jussaw #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d476b7c
Fix spacing
jussaw Aug 16, 2021
8bd7813
Fix errors
jussaw Aug 16, 2021
e89efc3
Fix ASCII for Adjust
jussaw Aug 19, 2021
76def7e
Add Colemak Mod-DH Layer
jussaw Aug 19, 2021
bedae5f
Add layer toggles
jussaw Aug 19, 2021
846df14
Fix CM Layer
jussaw Aug 19, 2021
3f6e128
Add Colemak Mod-DH layer
jussaw Aug 19, 2021
c967b53
Revert "Fix CM Layer"
jussaw Aug 19, 2021
df88eac
Revert "Add layer toggles"
jussaw Aug 19, 2021
5a98c8c
Revert "Add Colemak Mod-DH Layer"
jussaw Aug 19, 2021
df23b7f
Fixes CM layer
jussaw Aug 20, 2021
5858c9a
Merge pull request #2 from jussaw/crkbd/jussaw-colemakdh
jussaw Aug 20, 2021
9ade9df
Improve modularity
jussaw Aug 20, 2021
85c6d5e
Fix art
jussaw Aug 20, 2021
dc19d44
Improve layer references
jussaw Aug 28, 2021
d4cbde9
Fix ASCII art Adjust
jussaw Aug 28, 2021
18bf013
Merge branch 'qmk:master' into crkdb/jussaw
jussaw Aug 28, 2021
9d99ae5
Improves ASCII art
jussaw Aug 31, 2021
caf5a47
Merge branch 'crkdb/jussaw' of github.com:jussaw/qmk_firmware into cr…
jussaw Aug 31, 2021
46d730c
Merge branch 'master' into crkdb/jussaw
jussaw Aug 31, 2021
cd47265
Update crkbd F-keys
jussaw Mar 21, 2022
1a981e4
Merge branch 'crkdb/jussaw' of github.com:jussaw/qmk_firmware into cr…
jussaw Mar 21, 2022
750fc5e
Merge branch 'master' into crkdb/jussaw
jussaw Mar 21, 2022
81fd507
Update lib
jussaw Oct 4, 2022
1e979f9
Update gaming layer
jussaw Oct 4, 2022
e9a8732
Update ASCII art
jussaw Oct 4, 2022
7b4a6cc
Update gaming layer
jussaw Oct 5, 2022
d51706b
Update mouse settings
jussaw Oct 5, 2022
e5a2268
Merge branch 'qmk:master' into crkdb/jussaw
jussaw Oct 6, 2022
c7a4d63
Merge branch 'master' into crkdb/jussaw
jussaw Oct 6, 2022
fa82f38
Remove left column in game mode
jussaw Oct 8, 2022
d74c85e
Merge branch 'crkdb/jussaw' of github.com:jussaw/qmk_firmware into cr…
jussaw Oct 8, 2022
1b68c3d
Adjusts columns in Game layer
jussaw Oct 12, 2022
b5883ca
Add bottom bar to art
jussaw Mar 5, 2023
1418c28
Adjust layer overhaul
jussaw Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions keyboards/crkbd/keymaps/jussaw/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.


#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
38 changes: 19 additions & 19 deletions keyboards/crkbd/keymaps/jussaw/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -119,39 +119,39 @@ 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
),


/* Game
* ,-----------------------------------------------------. ,-----------------------------------------------------.
* | Bksp | 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 | ; | "" |
* |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
* | Enter | Ctrl | Z | X | C | V | | B | N | M | , | . | / |
* | B | Ctrl | Z | X | C | V | | N | M | , | . | / | Enter |
* |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
* | Esc | Alt | Space | | TG(4) |
* | Esc | Alt | Space | | | |TG(GAME)|
* `--------------------------' `--------------------------'
*/
[_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_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)
),
};

Expand Down