forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corralled image files

Browse Source
pull/1213/head
nstickney 8 years ago
parent 29e7003fc2
commit fa44e8d4dc
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

0
keyboards/ergodox/keymaps/familiar/HNTR.svg → keyboards/ergodox/keymaps/familiar/img/HNTR.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

0
keyboards/ergodox/keymaps/familiar/familiar.json → keyboards/ergodox/keymaps/familiar/img/familiar.json
Unescape View File

0
keyboards/ergodox/keymaps/familiar/familiar.png → keyboards/ergodox/keymaps/familiar/img/familiar.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

0
keyboards/ergodox/keymaps/familiar/familiar.svg → keyboards/ergodox/keymaps/familiar/img/familiar.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 640 KiB

After

Width:  |  Height:  |  Size: 640 KiB

0
keyboards/ergodox/keymaps/familiar/familiar_stick.svg → keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

0
keyboards/ergodox/keymaps/familiar/hntr.json → keyboards/ergodox/keymaps/familiar/img/hntr.json
Unescape View File

0
keyboards/ergodox/keymaps/familiar/hntr.png → keyboards/ergodox/keymaps/familiar/img/hntr.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

26
keyboards/ergodox/keymaps/familiar/keymap.c
Unescape View File

@ -37,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-------------. ,-------------. * ,-------------. ,-------------.
* |PRTSCR| ESC | | VOL- | VOL+ | * |PRTSCR| ESC | | VOL- | VOL+ |
* ,------|------|------| |------+------+------. * ,------|------|------| |------+------+------.
* | ALT/ | | NUMLK| | MUTE | | ALT/ | * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ |
* | SPC | SLASH|------| |------|WHACK | SPC | * | SPC |MO(1)/|------| |------|MO(1)/| SPC |
* | | | LAY3 | | LAY2 | | | * | |TG(1) | LAY3 | | LAY2 |TG(1) | |
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
[BASE] = KEYMAP( [BASE] = KEYMAP(
@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * | | | 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| | | | * |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_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
_______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, KC_INS,
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
_______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_HOME, KC_PGDN, KC_END,
_______, _______, _______, _______,
_______, _______,
_______, _______, _______ _______, _______, _______
@ -200,7 +200,7 @@ typedef struct {
bool sticky; bool sticky;
} td_ta_state_t; } 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; td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
if (td_ta->sticky) { 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; td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
if (!td_ta->layer_toggle) 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); 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; td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
if (td_ta->sticky) { 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; td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
if (!td_ta->layer_toggle) 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[] = { qk_tap_dance_action_t tap_dance_actions[] = {
[SLASH] = { [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 }) .user_data = (void *)&((td_ta_state_t) { false, false })
}, },
[WHACK] = { [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 }) .user_data = (void *)&((td_ta_state_t) { false, false })
} }
}; };

Write Preview
Loading…
Cancel
Save