From 539c8e3b721c82372c39bc49306647f65968fcb9 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 14 Oct 2023 07:02:44 +1100 Subject: jian/rev1: convert to DIP Switch (#22248) --- keyboards/jian/keymaps/advanced/config.h | 2 + keyboards/jian/keymaps/advanced/keymap.c | 119 +++++++++++++++---------------- 2 files changed, 60 insertions(+), 61 deletions(-) (limited to 'keyboards/jian/keymaps') diff --git a/keyboards/jian/keymaps/advanced/config.h b/keyboards/jian/keymaps/advanced/config.h index 1a033d8311..edeab03fb1 100644 --- a/keyboards/jian/keymaps/advanced/config.h +++ b/keyboards/jian/keymaps/advanced/config.h @@ -24,3 +24,5 @@ along with this program. If not, see . //#define AUTO_SHIFT_MODIFIERS #define ALT_LAYOUTS_ENABLE //#define TRAINING_HALFES_LOCK + +#define LAYER_STATE_32BIT diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c index a825e061b5..4a6fdec063 100644 --- a/keyboards/jian/keymaps/advanced/keymap.c +++ b/keyboards/jian/keymaps/advanced/keymap.c @@ -86,9 +86,6 @@ enum jian_layers { _LEFT, _RIGHT, #endif //TRAINING_HALFES_LOCK -#ifdef DIPS_ENABLE - _DIPS, -#endif // DIPS_ENABLE #ifdef STENO_ENABLE _PLOVER #endif // STENO_ENABLE @@ -107,7 +104,7 @@ enum jian_keycodes { CH_QWE, CH_DVK, //endif // ALT_LAYOUTS_ENABLE -#ifdef DIPS_ENABLE +#ifdef DIP_SWITCH_ENABLE LAYOUT0, LAYOUT1, LAYOUT2, @@ -120,18 +117,18 @@ enum jian_keycodes { DIP9, DIP10, DIP11, -#endif // DIPS_ENABLE +#endif // DIP_SWITCH_ENABLE }; #ifdef TRAINING_HALFES_LOCK static uint8_t lock_timeout = 1; static uint8_t lock_cooldown = 0; #endif //TRAINING_HALFES_LOCK -#ifdef DIPS_ENABLE +#ifdef DIP_SWITCH_ENABLE #ifdef ALT_LAYOUTS_ENABLE static uint8_t layout_conversion_dip_state = 0; #endif // ALT_LAYOUTS_ENABLE -#endif // DIPS_ENABLE +#endif // DIP_SWITCH_ENABLE #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) @@ -190,13 +187,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_base_wrapper(QWERTY_base), -#ifdef DIPS_ENABLE -[_DIPS] = LAYOUT_dips( - LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH, - LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH -), -#endif // DIPS_ENABLE - [_LOWER] = LAYOUT( _______, KC_UNDS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, F12_RGU, EQL_LCT, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, MIN_RCT, @@ -282,7 +272,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } -#ifdef DIPS_ENABLE +#ifdef DIP_SWITCH_ENABLE #ifdef ALT_LAYOUTS_ENABLE void layout_convert(uint8_t statuses) { switch (0b1111 & statuses) { @@ -337,13 +327,7 @@ void layout_convert(uint8_t statuses) { } } #endif // ALT_LAYOUTS_ENABLE -#endif // DIPS_ENABLE - -void matrix_init_user(void) { -#ifdef DIPS_ENABLE - layer_on(_DIPS); -#endif // DIPS_ENABLE -} +#endif // DIP_SWITCH_ENABLE void keyboard_post_init_user(void) { user_config.raw = eeconfig_read_user(); @@ -515,70 +499,83 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; #endif // ALT_LAYOUTS_ENABLE -#ifdef DIPS_ENABLE -#ifdef ALT_LAYOUTS_ENABLE - case LAYOUT0: + case THUMB_ALT: + if (record->event.pressed) { + layer_invert(_THUMB_ALT); + user_config.thumb_alt ^= 1; + eeconfig_update_user(user_config.raw); + } + return false; + case ISO: if (record->event.pressed) { + layer_invert(_ISO); + user_config.iso ^= 1; + eeconfig_update_user(user_config.raw); + } + return false; + } + return true; +} + +#if defined(DIP_SWITCH_ENABLE) +bool dip_switch_update_user(uint8_t index, bool active) { + switch (index) { +# if defined(ALT_LAYOUTS_ENABLE) + case 0: // LAYOUT0 + case 6: + if (active) { layout_conversion_dip_state |= 1 << 0; } else { layout_conversion_dip_state &= ~(1 << 0); } layout_convert(layout_conversion_dip_state); - return false; - case LAYOUT1: - if (record->event.pressed) { + break; + case 1: // LAYOUT1 + case 7: + if (active) { layout_conversion_dip_state |= 1 << 1; } else { layout_conversion_dip_state &= ~(1 << 1); } layout_convert(layout_conversion_dip_state); - return false; - case LAYOUT2: - if (record->event.pressed) { + break; + case 2: // LAYOUT2 + case 8: + if (active) { layout_conversion_dip_state |= 1 << 2; } else { layout_conversion_dip_state &= ~(1 << 2); } layout_convert(layout_conversion_dip_state); - return false; - case LAYOUT3: - if (record->event.pressed) { + break; + case 3: // LAYOUT3 + case 9: + if (active) { layout_conversion_dip_state |= 1 << 3; } else { layout_conversion_dip_state &= ~(1 << 3); } layout_convert(layout_conversion_dip_state); - return false; -#endif // ALT_LAYOUTS_ENABLE - case DIP_ISO: - if (record->event.pressed) { - layer_on(_ISO); + break; + case 4: // DIP_ISO + case 10: + if (active) { + layer_on(_ISO); } else { - layer_off(_ISO); + layer_off(_ISO); } - return false; - case FLIP_TH: - if (record->event.pressed) { - layer_on(_THUMB_ALT); + break; + case 5: // FLIP_TH + case 11: + if (active) { + layer_on(_THUMB_ALT); } else { - layer_off(_THUMB_ALT); - } - return false; -#endif // DIPS_ENABLE - case THUMB_ALT: - if (record->event.pressed) { - layer_invert(_THUMB_ALT); - user_config.thumb_alt ^= 1; - eeconfig_update_user(user_config.raw); - } - return false; - case ISO: - if (record->event.pressed) { - layer_invert(_ISO); - user_config.iso ^= 1; - eeconfig_update_user(user_config.raw); + layer_off(_THUMB_ALT); } - return false; + break; +# endif } + return true; } +#endif -- cgit v1.2.3