Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
qmk-bot committed May 31, 2023
2 parents 5a26e5e + 81bc092 commit 6156972
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
21 changes: 2 additions & 19 deletions keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD, KC_MPLY, KC_INS, KC_F7, KC_F8, KC_F9, KC_CAPS,
KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_BRIU, KC_F12, KC_F4, KC_F5, KC_F6, TD(TdL),
KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_BRID, _______, _______, KC_F10, KC_F1, KC_F2, KC_F3, KC_F11,
_______, _______, _______, AS_TOGG, _______, _______, _______, DNUMPAD, _______, _______, _______, _______
_______, _______, _______, CW_TOGG, _______, _______, _______, DNUMPAD, _______, _______, _______, _______
),

[_NUMPAD] = LAYOUT(
_______, _______, _______, _______, _______, S(KC_E), KC_7, KC_8, KC_9, S(KC_F),
TD(TdL), KC_EQL, KC_ASTR, KC_PLUS, _______, S(KC_C), KC_4, KC_5, KC_6, S(KC_D),
TD(TdH), KC_DOT, KC_SLSH, KC_MINS, _______, _______, _______, S(KC_A), KC_1, KC_2, KC_3, S(KC_B),
_______, _______, _______, AS_TOGG, _______, _______, _______, _______, KC_0, _______, _______, _______
_______, _______, _______, CW_TOGG, _______, _______, _______, _______, KC_0, _______, _______, _______
),

[_SYMBOL] = LAYOUT(
Expand All @@ -76,22 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};

bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case KC_MINS:
case KC_UNDS:
case KC_BSPC:
return false;
}

switch(keycode & 0xFF) {
case KC_1 ... KC_UP:
autoshift_disable();
default:
return false;
}
}

void dance_hex(tap_dance_state_t *state, void *user_data) {
switch(state->count) {
case 1:
Expand Down Expand Up @@ -120,7 +104,6 @@ void dance_lang(tap_dance_state_t *state, void *user_data) {
}
}


tap_dance_action_t tap_dance_actions[] = {
[TdH] = ACTION_TAP_DANCE_FN(dance_hex),
[TdL] = ACTION_TAP_DANCE_FN(dance_lang)
Expand Down
2 changes: 0 additions & 2 deletions keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
This is the keymap available for keyboardio/atreus keyboards.

The default layout used [Colemak Mod-DH](https://colemakmods.github.io/mod-dh/). The prefix keys for vim/tmux users. The symbol is designed for ease of use by programmers.

It used the idea of [Caps Work Behavior](https://zmk.dev/docs/behaviors/caps-word) by ZMK Firmware. I want to officially add this feature to QMK in the future
3 changes: 2 additions & 1 deletion keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
MOUSEKEY_ENABLE = no
COMMAND_ENABLE = no
TAP_DANCE_ENABLE = yes
AUTO_SHIFT_ENABLE = yes
CAPS_WORD_ENABLE = yes

0 comments on commit 6156972

Please sign in to comment.