summaryrefslogtreecommitdiffstats
path: root/keyboards/25keys/zinc/keymaps/default
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-11-28 07:54:00 +1100
committerNick Brassel <nick@tzarc.org>2022-11-28 07:54:00 +1100
commit4020674163fc80914059c4c9c3be5c0ae00bd150 (patch)
tree6f4187d72b04d03572adf507502afbda9726d696 /keyboards/25keys/zinc/keymaps/default
parent8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff)
parent9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff)
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/25keys/zinc/keymaps/default')
-rw-r--r--keyboards/25keys/zinc/keymaps/default/keymap.c10
-rw-r--r--keyboards/25keys/zinc/keymaps/default/rules.mk2
2 files changed, 5 insertions, 7 deletions
diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
index 925d252247..4673b8071b 100644
--- a/keyboards/25keys/zinc/keymaps/default/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/default/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT_ortho_4x12(
_______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS,
- _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS,
+ _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS,
RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______,
_______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END
)
@@ -271,24 +271,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
return false;
break;
diff --git a/keyboards/25keys/zinc/keymaps/default/rules.mk b/keyboards/25keys/zinc/keymaps/default/rules.mk
index 09b121d26f..1b53ec4c16 100644
--- a/keyboards/25keys/zinc/keymaps/default/rules.mk
+++ b/keyboards/25keys/zinc/keymaps/default/rules.mk
@@ -106,9 +106,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
endif
ifeq ($(strip $(LED_ANIMATIONS)), yes)
-# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
OPT_DEFS += -DLED_ANIMATIONS
-
endif
ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)