Major Tweaks

- Changed how config layer is activated
- moved function keys to opposite side to match numbers
- Updated keymap image
This commit is contained in:
Victor 2024-05-01 21:53:25 -05:00
parent b7468905a1
commit 5e74da734e
Failed to generate hash of commit
5 changed files with 26 additions and 27 deletions

View file

@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
[_CONFIG] = { ENCODER_CCW_CW(BASELYR, RBSELYR), ENCODER_CCW_CW(TR_RMOD, TR_RRMD) } [_CONFIG] = { ENCODER_CCW_CW(TR_RMOD, TR_RRMD), ENCODER_CCW_CW(BASELYR, RBSELYR) }
}; };
#endif #endif

View file

@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMOUT, ZOOMIN), ENCODER_CCW_CW(___x___, ___x___) }, [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMOUT, ZOOMIN), ENCODER_CCW_CW(___x___, ___x___) },
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
[_CONFIG] = { ENCODER_CCW_CW(RBSELYR, BASELYR), ENCODER_CCW_CW(TR_RRMD, TR_RMOD) } [_CONFIG] = { ENCODER_CCW_CW(TR_RRMD, TR_RMOD), ENCODER_CCW_CW(RBSELYR, BASELYR) }
}; };
#endif //ENCODER_MAP_ENABLE #endif //ENCODER_MAP_ENABLE

View file

@ -27,18 +27,18 @@ layers:
- [Ctrl, A, S, D, F, G, "4", "5" ,"6", "`"] - [Ctrl, A, S, D, F, G, "4", "5" ,"6", "`"]
- [Z, X, C, V, B, Alt, "1", "2" ,"3", Combo Toggle] - [Z, X, C, V, B, Alt, "1", "2" ,"3", Combo Toggle]
- {t: Enter, type: ghost} - {t: Enter, type: ghost}
- Shift
- Space - Space
- Shift
- Space - Space
- {h: "NAV", t: "0"} - {h: "NAV", t: "0"}
- {t: Mute, type: ghost} - {t: Mute, type: ghost}
NAV: NAV:
- [Escape, Home, ▲, End, Page Up, Mouse Wheel Up, null, Sniper Toggle, Sniper DPI, Pointer DPI ] - [null, Home, ▲, End, Page Up, Mouse Wheel Up, null, Sniper Toggle, Sniper DPI, Pointer DPI ]
- [Caps Lock, ◄, ▼, ►, Page Down, Mouse Wheel down, Shift, Ctrl, Alt, Gui ] - [null, ◄, ▼, ►, Page Down, Mouse Wheel down, Shift, Ctrl, Alt, Gui ]
- [Undo, Cut, Copy, Paste, Redo, null, App, Vol-, Vol+, Mute ] - [Undo, Cut, Copy, Paste, Redo, null, App, Vol-, Vol+, Mute ]
- {t: Zoom Reset, type: ghost} - {t: Zoom Reset, type: ghost}
- NUM - NUM
- Enter - Space
- null - null
- {type: held} - {type: held}
- {t: Mute, type: ghost} - {t: Mute, type: ghost}
@ -51,9 +51,9 @@ layers:
- null - null
- Space - Space
- {h: "NAV", t: "0"} - {h: "NAV", t: "0"}
- {type: ghost} - {t: Mute, type: ghost}
SYM: SYM:
- [null, null, "@", "$", {h: "~", t: "`"}, {h: "==", t: "="}, "#", "*", null, {h: "\"\"", t: "\""}] - [CONFIG, null, "@", "$", {h: "~", t: "`"}, {h: "==", t: "="}, "#", "*", null, {h: "\"\"", t: "\""}]
- ["&", {h: "{}", t: "{"}, "}", {h: "||", t: "|"}, {h: ":", t: ";"}, {h: "++", t: "+"}, "?", {h: "[]", t: "]"}, "]", {h: "''", t: "'"}] - ["&", {h: "{}", t: "{"}, "}", {h: "||", t: "|"}, {h: ":", t: ";"}, {h: "++", t: "+"}, "?", {h: "[]", t: "]"}, "]", {h: "''", t: "'"}]
- [{h: "^", t: "%"}, {h: "<>", t: "<"}, ">", "\\", {h: "!=", t: "!"}, null, "/", {h: "()", t: "("}, ")", {h: "_", t: "-"}] - [{h: "^", t: "%"}, {h: "<>", t: "<"}, ">", "\\", {h: "!=", t: "!"}, null, "/", {h: "()", t: "("}, ")", {h: "_", t: "-"}]
- {type: ghost} - {type: ghost}
@ -63,27 +63,26 @@ layers:
- {type: held} - {type: held}
- {type: ghost} - {type: ghost}
CONFIG: CONFIG:
- [F10, F7, F8, F9, null, null, null, null, EEPROM Clear, Boot Loader] - [{type: held}, null, null, null, null, null, F7, F8, F9, F10]
- [F11, F4, F5, F6, null, Base Layer Toggle, Shift, null, null, RGB Mode] - [null, null, null, Shift, null, Caps Lock, F4, F5, F6, F11]
- [F12, F1, F2, F3, null, RGB Hue, RGB Sat, RGB Vib, RGB Spd, RGB Toggle ] - [RGB Hue, RGB Sat, RGB Vib, RGB Spd, null, null, F1, F2, F3, F12]
- {type: ghost} - {t: RGB Toggle, type: ghost}
- Macro Record - EEPROM Clear
- Boot Loader
- Macro Play - Macro Play
- {type: held} - Macro Rec
- {type: held} - {t: Base Layer, type: ghost}
- {type: ghost}
combos: combos:
- { p: [0, 1], k: Esc, l: [base_QWERTY] } - { p: [0, 1], k: Esc, l: [base_QWERTY] }
- { p: [12, 13], k: MB1, l: [base_QWERTY] } - { p: [12, 13], k: MB1, l: [base_QWERTY] }
- { p: [11, 12], k: MB2, l: [base_QWERTY] } - { p: [11, 12], k: MB2, l: [base_QWERTY] }
- { p: [13, 14], k: MB3, l: [base_QWERTY] } - { p: [14, 24], k: MB3, l: [base_QWERTY] }
- { p: [3, 13], k: MB4, l: [base_QWERTY] } - { p: [3, 13], k: MB4, l: [base_QWERTY] }
- { p: [4, 14], k: MB5, l: [base_QWERTY] } - { p: [4, 14], k: MB5, l: [base_QWERTY] }
- { p: [22, 23], k: DrgScr Tog, l: [base_QWERTY] } - { p: [21, 22], k: DrgScr Tog, l: [base_QWERTY] }
- { p: [6, 7], k: Tab, l: [base_QWERTY] } - { p: [6, 7], k: Tab, l: [base_QWERTY] }
- { p: [21, 22], k: Enter, l: [base_QWERTY] } - { p: [22, 23], k: Enter, l: [base_QWERTY] }
- { p: [26, 27], k: Bksp, l: [base_QWERTY] } - { p: [26, 27], k: Bksp, l: [base_QWERTY] }
- { p: [27, 28], k: Del, l: [base_QWERTY] } - { p: [27, 28], k: Del, l: [base_QWERTY] }
- { p: [33, 34], k: CONFIG, l: [base_QWERTY], align: top }
draw_config: draw_config:
small_pad: 6 small_pad: 6

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 133 KiB

Before After
Before After

View file

@ -216,8 +216,8 @@ enum keycodes {
#define LAYER_NAVIGATION \ #define LAYER_NAVIGATION \
___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, TR_MWHU, ___x___, TR_SNIP, TR_SDPI, TR_PDPI, \ ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, TR_MWHU, ___x___, TR_SNIP, TR_SDPI, TR_PDPI, \
KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TR_MWHD, _SCAG_MODS________________________, \ ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TR_MWHD, _SCAG_MODS________________________, \
_UCCPR_L___________________________________, CONFIG, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ _UCCPR_L___________________________________, ___x___, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \
ZOOMRST, _______, KC_SPC, _LAYER_TRANS_____________ ZOOMRST, _______, KC_SPC, _LAYER_TRANS_____________
@ -229,17 +229,17 @@ enum keycodes {
#define LAYER_SYMBOL \ #define LAYER_SYMBOL \
___x___, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \ CONFIG, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \
KC_AMPR, TR_LCBR, KC_RCBR, TR_PIPE, TR_SCLN, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \ KC_AMPR, TR_LCBR, KC_RCBR, TR_PIPE, TR_SCLN, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \
TR_PERC, TR_LABK, KC_RABK, KC_BSLS, TR_EXLM, ___x___, KC_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \ TR_PERC, TR_LABK, KC_RABK, KC_BSLS, TR_EXLM, ___x___, KC_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \
_LAYER_TRANS_____________, _LAYER_TRANS_____________ _LAYER_TRANS_____________, _LAYER_TRANS_____________
#define LAYER_CONFIG \ #define LAYER_CONFIG \
KC_F10, KC_F7, KC_F8, KC_F9, ___x___, ___x___, ___x___, ___x___, EE_CLR, QK_BOOT, \ _______, ___x___, ___x___, ___x___, ___x___, ___x___, KC_F7, KC_F8, KC_F9, KC_F10, \
KC_F11, KC_F4, KC_F5, KC_F6, ___x___, ___x___, TR_LSFT, ___x___, ___x___, TR_RMOD, \ ___x___, ___x___, ___x___, TR_LSFT, ___x___, KC_CAPS, KC_F4, KC_F5, KC_F6, KC_F11, \
KC_F12, KC_F1, KC_F2, KC_F3, ___x___, _______, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, \ TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, ___x___, KC_F1, KC_F2, KC_F3, KC_F12, \
BASELYR, TR_DMR1, TR_DMP1, TR_RMOD, _______, TR_RTOG TR_RTOG, EE_CLR, QK_BOOT, TR_DMP1, TR_DMR1, BASELYR
/* /*
If I was going to combine number and symbols together, it'd look like this If I was going to combine number and symbols together, it'd look like this