Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
adf32da655
2 changed files with 287 additions and 280 deletions
|
@ -40,25 +40,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
KC_ESC, 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_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||||
CTRLTAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
CTRLTAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFTEN,
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFTEN,
|
||||||
_______, KC_LCTL, KC_LGUI, KC_LALT, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
_______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
||||||
),
|
),
|
||||||
|
|
||||||
[_COLEMAK] = LAYOUT_ortho_4x12(
|
[_COLEMAK] = LAYOUT_ortho_4x12(
|
||||||
KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
|
KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
|
||||||
CTRLTAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
|
CTRLTAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFTEN,
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFTEN,
|
||||||
_______, KC_LCTL, KC_LGUI, KC_LALT, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
_______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
||||||
),
|
),
|
||||||
|
|
||||||
[_DVORAK] = LAYOUT_ortho_4x12(
|
[_DVORAK] = LAYOUT_ortho_4x12(
|
||||||
KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
|
KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
|
||||||
CTRLTAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT,
|
CTRLTAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT,
|
||||||
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SHIFTEN,
|
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SHIFTEN,
|
||||||
_______, KC_LCTL, KC_LGUI, KC_LALT, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
_______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
||||||
),
|
),
|
||||||
|
|
||||||
[_LOWER] = LAYOUT_ortho_4x12(
|
[_LOWER] = LAYOUT_ortho_4x12(
|
||||||
KC_TILD, _______, _______, _______, _______, _______, _______, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
|
KC_TILD, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
|
||||||
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS, KC_PIPE,
|
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS, KC_PIPE,
|
||||||
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_EXLM, KC_AT, KC_HASH, KC_PLUS, _______,
|
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_EXLM, KC_AT, KC_HASH, KC_PLUS, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY
|
||||||
|
@ -86,9 +86,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
),
|
),
|
||||||
|
|
||||||
[_FN1] = LAYOUT_ortho_4x12(
|
[_FN1] = LAYOUT_ortho_4x12(
|
||||||
KC_MENU, _______, KC_PGUP, KC_UP, KC_PGDN, KC_INS, _______, _______, KC_UP, _______, KC_PSCR, _______,
|
KC_MENU, DP_ON, KC_PGDN, KC_UP, KC_PGUP, KC_INS, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
|
||||||
KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_DEL ,
|
KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_DEL ,
|
||||||
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,
|
_______, _______, _______, _______, _______, KC_END, KC_END, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, DP_ON, _______, _______, _______
|
_______, _______, _______, _______, _______, _______, _______, _______, DP_ON, _______, _______, _______
|
||||||
),
|
),
|
||||||
|
|
||||||
|
@ -97,32 +97,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
KC_ESC, 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_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||||
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT ,
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT ,
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX, DPADNUM, KC_SPC, KC_SPC, LOWER, DP_OFF, KC_LEFT, KC_DOWN, KC_RGHT
|
XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, DPADNUM, KC_SPC, KC_SPC, LOWER, DP_OFF, KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
),
|
),
|
||||||
|
|
||||||
// Extended layer for weapon switching
|
// Extended numeric layer for FPS weapon switching and StarCraft group control
|
||||||
[_DPADNUM] = LAYOUT_ortho_4x12(
|
[_DPADNUM] = LAYOUT_ortho_4x12(
|
||||||
XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX,
|
KC_LGUI, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, XXXXXXX, XXXXXXX, DP_OFF, XXXXXXX,
|
||||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
|
KC_LCTL, _______, KC_8, KC_9, KC_0, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_SLSH,
|
||||||
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
|
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX,
|
||||||
_______, _______, _______, XXXXXXX, DPADNUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
|
_______, _______, _______, _______, DPADNUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
float plover_song[][2] = SONG(PLOVER_SOUND);
|
float plover_song[][2] = SONG(PLOVER_SOUND);
|
||||||
float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
|
float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
|
||||||
|
|
||||||
// Borrowing audio from unused audio
|
float caps_song_on[][2] = SONG(NUM_LOCK_ON_SOUND);
|
||||||
// Caps Lock on and off sound too similar
|
float caps_song_off[][2] = SONG(SCROLL_LOCK_ON_SOUND);
|
||||||
|
|
||||||
float caps_song_on[][2] = SONG(NUM_LOCK_ON_SOUND);
|
// Custom songs for DPAD layer status
|
||||||
float caps_song_off[][2] = SONG(SCROLL_LOCK_ON_SOUND);
|
float dpad_song_on[][2] = {
|
||||||
|
HD_NOTE(_A4), HD_NOTE(_A4), HD_NOTE(_A4),
|
||||||
|
QD_NOTE(_F4), QD_NOTE(_C5), HD_NOTE(_A4),
|
||||||
|
QD_NOTE(_F4), QD_NOTE(_C5), WD_NOTE(_A4)
|
||||||
|
};
|
||||||
|
|
||||||
float dpad_song_on[][2] = SONG(ROCK_A_BYE_BABY);
|
float dpad_song_off[][2] = {
|
||||||
float dpad_song_off[][2] = SONG(MAJOR_SOUND);
|
ED_NOTE(_C6), ED_NOTE(_C6),
|
||||||
|
ED_NOTE(_C6), ED_NOTE(_C6),
|
||||||
|
W__NOTE(_REST), QD_NOTE(_GS5),
|
||||||
|
QD_NOTE(_AS5), Q__NOTE(_C6),
|
||||||
|
Q__NOTE(_AS5), Q__NOTE(_C6)
|
||||||
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef BACKLIGHT_ENABLE
|
#ifndef BACKLIGHT_ENABLE
|
||||||
|
@ -151,7 +158,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
switch (keycode) {
|
switch (keycode) {
|
||||||
case QWERTY:
|
case QWERTY:
|
||||||
|
@ -176,26 +182,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
case BACKLIT:
|
case BACKLIT:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
register_code(KC_RSFT);
|
register_code(KC_RSFT);
|
||||||
#ifdef BACKLIGHT_ENABLE
|
#ifdef BACKLIGHT_ENABLE
|
||||||
backlight_step();
|
backlight_step();
|
||||||
#endif
|
#endif
|
||||||
#ifdef KEYBOARD_planck_rev5
|
#ifdef KEYBOARD_planck_rev5
|
||||||
writePinLow(E6);
|
writePinLow(E6);
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
unregister_code(KC_RSFT);
|
unregister_code(KC_RSFT);
|
||||||
#ifdef KEYBOARD_planck_rev5
|
#ifdef KEYBOARD_planck_rev5
|
||||||
writePinHigh(E6);
|
writePinHigh(E6);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
break;
|
break;
|
||||||
case PLOVER:
|
case PLOVER:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
stop_all_notes();
|
stop_all_notes();
|
||||||
PLAY_SONG(plover_song);
|
PLAY_SONG(plover_song);
|
||||||
#endif
|
#endif
|
||||||
layer_off(_RAISE);
|
layer_off(_RAISE);
|
||||||
layer_off(_LOWER);
|
layer_off(_LOWER);
|
||||||
layer_off(_ADJUST);
|
layer_off(_ADJUST);
|
||||||
|
@ -211,36 +217,34 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
break;
|
break;
|
||||||
case EXT_PLV:
|
case EXT_PLV:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
PLAY_SONG(plover_gb_song);
|
PLAY_SONG(plover_gb_song);
|
||||||
#endif
|
#endif
|
||||||
layer_off(_PLOVER);
|
layer_off(_PLOVER);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
// Play audio upon switching Caps Lock and custom layers
|
||||||
// Play audio upon switching Caps Lock and custom layers
|
|
||||||
|
|
||||||
case KC_CAPS:
|
case KC_CAPS:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
if (host_keyboard_led_state().caps_lock) {
|
if (host_keyboard_led_state().caps_lock) {
|
||||||
PLAY_SONG(caps_song_off);
|
PLAY_SONG(caps_song_off);
|
||||||
} else {
|
} else {
|
||||||
PLAY_SONG(caps_song_on);
|
PLAY_SONG(caps_song_on);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case DP_ON:
|
case DP_ON:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
|
|
||||||
} else { // only actived upon key release
|
} else { // only actived upon key release
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
PLAY_SONG(dpad_song_on);
|
PLAY_SONG(dpad_song_on);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
layer_off(_FN1);
|
layer_off(_FN1);
|
||||||
layer_on(_DPAD);
|
layer_on(_DPAD);
|
||||||
|
@ -248,9 +252,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
|
||||||
case DP_OFF:
|
case DP_OFF:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
PLAY_SONG(dpad_song_off);
|
PLAY_SONG(dpad_song_off);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
layer_off(_DPAD);
|
layer_off(_DPAD);
|
||||||
}
|
}
|
||||||
|
@ -274,9 +278,9 @@ void encoder_update(bool clockwise) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (clockwise) {
|
if (clockwise) {
|
||||||
muse_tempo+=1;
|
muse_tempo += 1;
|
||||||
} else {
|
} else {
|
||||||
muse_tempo-=1;
|
muse_tempo -= 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -292,14 +296,14 @@ void dip_update(uint8_t index, bool active) {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 0:
|
case 0:
|
||||||
if (active) {
|
if (active) {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
PLAY_SONG(plover_song);
|
PLAY_SONG(plover_song);
|
||||||
#endif
|
#endif
|
||||||
layer_on(_ADJUST);
|
layer_on(_ADJUST);
|
||||||
} else {
|
} else {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
PLAY_SONG(plover_gb_song);
|
PLAY_SONG(plover_gb_song);
|
||||||
#endif
|
#endif
|
||||||
layer_off(_ADJUST);
|
layer_off(_ADJUST);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -308,15 +312,15 @@ void dip_update(uint8_t index, bool active) {
|
||||||
muse_mode = true;
|
muse_mode = true;
|
||||||
} else {
|
} else {
|
||||||
muse_mode = false;
|
muse_mode = false;
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
stop_all_notes();
|
stop_all_notes();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void matrix_scan_user(void) {
|
void matrix_scan_user(void) {
|
||||||
#ifdef AUDIO_ENABLE
|
#ifdef AUDIO_ENABLE
|
||||||
if (muse_mode) {
|
if (muse_mode) {
|
||||||
if (muse_counter == 0) {
|
if (muse_counter == 0) {
|
||||||
uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
|
uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
|
||||||
|
@ -328,7 +332,7 @@ void matrix_scan_user(void) {
|
||||||
}
|
}
|
||||||
muse_counter = (muse_counter + 1) % muse_tempo;
|
muse_counter = (muse_counter + 1) % muse_tempo;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool music_mask_user(uint16_t keycode) {
|
bool music_mask_user(uint16_t keycode) {
|
||||||
|
|
|
@ -4,9 +4,12 @@ A universal ortholinear 4x12 keymap created by Juno Nguyen
|
||||||
## Features:
|
## Features:
|
||||||
* Successor to *juno*.
|
* Successor to *juno*.
|
||||||
* Numpad-like cluster for numerics.
|
* Numpad-like cluster for numerics.
|
||||||
* ESDF and IJKL arrow cluster from SpaceFn.
|
* ESDF and IJKL arrow cluster from SpaceFn for navigation.
|
||||||
* CtrlTab for even more HHKB-ness.
|
* CtrlTab for even more HHKB-ness.
|
||||||
* Huge amount of omissions of the redundant keys.
|
* Audio indicator for Caps Lock.
|
||||||
|
* Huge amount of omissions of redundant keys.
|
||||||
* minimalism (not really).
|
* minimalism (not really).
|
||||||
|
* DPAD layer for gaming with inverted T-shaped direction keys.
|
||||||
|
* DPADNUM secondary layer tailored for StarCraft group control and FPS weapon switching.
|
||||||
|
|
||||||
Refined since Oct 2019
|
Refined since Oct 2019
|
Loading…
Reference in a new issue