diff options
Diffstat (limited to 'keyboards/ergodox/keymaps/familiar')
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/HNTR.svg (renamed from keyboards/ergodox/keymaps/familiar/HNTR.svg) | 0 | ||||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/familiar.json (renamed from keyboards/ergodox/keymaps/familiar/familiar.json) | 0 | ||||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/familiar.png (renamed from keyboards/ergodox/keymaps/familiar/familiar.png) | bin | 102059 -> 102059 bytes | |||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/familiar.svg (renamed from keyboards/ergodox/keymaps/familiar/familiar.svg) | 0 | ||||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg (renamed from keyboards/ergodox/keymaps/familiar/familiar_stick.svg) | 0 | ||||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/hntr.json (renamed from keyboards/ergodox/keymaps/familiar/hntr.json) | 0 | ||||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/img/hntr.png (renamed from keyboards/ergodox/keymaps/familiar/hntr.png) | bin | 77473 -> 77473 bytes | |||
-rw-r--r-- | keyboards/ergodox/keymaps/familiar/keymap.c | 26 |
8 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/ergodox/keymaps/familiar/HNTR.svg b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg index a419e7ab8..a419e7ab8 100644 --- a/keyboards/ergodox/keymaps/familiar/HNTR.svg +++ b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg diff --git a/keyboards/ergodox/keymaps/familiar/familiar.json b/keyboards/ergodox/keymaps/familiar/img/familiar.json index e80f99e5f..e80f99e5f 100644 --- a/keyboards/ergodox/keymaps/familiar/familiar.json +++ b/keyboards/ergodox/keymaps/familiar/img/familiar.json diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/img/familiar.png Binary files differindex 4d61846eb..4d61846eb 100644 --- a/keyboards/ergodox/keymaps/familiar/familiar.png +++ b/keyboards/ergodox/keymaps/familiar/img/familiar.png diff --git a/keyboards/ergodox/keymaps/familiar/familiar.svg b/keyboards/ergodox/keymaps/familiar/img/familiar.svg index 94e7cae60..94e7cae60 100644 --- a/keyboards/ergodox/keymaps/familiar/familiar.svg +++ b/keyboards/ergodox/keymaps/familiar/img/familiar.svg diff --git a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg index 18ec937e2..18ec937e2 100644 --- a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg +++ b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg diff --git a/keyboards/ergodox/keymaps/familiar/hntr.json b/keyboards/ergodox/keymaps/familiar/img/hntr.json index c1aae552b..c1aae552b 100644 --- a/keyboards/ergodox/keymaps/familiar/hntr.json +++ b/keyboards/ergodox/keymaps/familiar/img/hntr.json diff --git a/keyboards/ergodox/keymaps/familiar/hntr.png b/keyboards/ergodox/keymaps/familiar/img/hntr.png Binary files differindex 519d152df..519d152df 100644 --- a/keyboards/ergodox/keymaps/familiar/hntr.png +++ b/keyboards/ergodox/keymaps/familiar/img/hntr.png diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index c4ecdee51..46069b0db 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -37,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. ,-------------. * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ | | NUMLK| | MUTE | | ALT/ | - * | SPC | SLASH|------| |------|WHACK | SPC | - * | | | LAY3 | | LAY2 | | | + * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | + * | SPC |MO(1)/|------| |------|MO(1)/| SPC | + * | |TG(1) | LAY3 | | LAY2 |TG(1) | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( @@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | UP | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | LEFT | DOWN | RIGHT | + * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * |SYSREQ| PAUSE| | | | @@ -98,8 +98,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, KC_UP, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, + _______, _______, _______, _______, _______, KC_PGUP, _______, + _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______ @@ -200,7 +200,7 @@ typedef struct { bool sticky; } td_ta_state_t; -static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_data) { +static void slash_finished (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (td_ta->sticky) { @@ -221,7 +221,7 @@ static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_da } } -static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) { +static void slash_reset (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (!td_ta->layer_toggle) @@ -230,7 +230,7 @@ static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) layer_off (ARRW); } -static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_data) { +static void whack_finished (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (td_ta->sticky) { @@ -251,7 +251,7 @@ static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_da } } -static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) { +static void whack_reset (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (!td_ta->layer_toggle) @@ -262,11 +262,11 @@ static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) qk_tap_dance_action_t tap_dance_actions[] = { [SLASH] = { - .fn = { NULL, ang_tap_dance_s_finished, ang_tap_dance_s_reset }, + .fn = { NULL, slash_finished, slash_reset }, .user_data = (void *)&((td_ta_state_t) { false, false }) }, [WHACK] = { - .fn = { NULL, ang_tap_dance_w_finished, ang_tap_dance_w_reset }, + .fn = { NULL, whack_finished, whack_reset }, .user_data = (void *)&((td_ta_state_t) { false, false }) } }; |