From ce7dda60e7b5a69b2967f957f18ad00f4f65402f Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 16 Jul 2020 17:42:18 +0900 Subject: [PATCH] change how to toggle mac/win --- .../helix_type_r/keymaps/default/keymap.c | 22 ++++++++------ .../helix_type_r/keymaps/default4/keymap.c | 30 +++++++++++-------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c b/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c index c00d5e488db..2dd1432e8c2 100644 --- a/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c +++ b/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c @@ -106,9 +106,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------. ,-----------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Reset|RGBRST| | | | | | | | | | Del | + * | | Reset|RGBRST|EEPRST| | | | | | | | | Del | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | |Aud on|Audoff| Mac | | Win | | | | | | + * | | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| @@ -117,14 +117,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - _______, RESET, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + _______, RESET, RGBRST, EEP_RST, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \ ) }; +static bool mode_windows = false; + void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* Master side encoder */ if (clockwise) { @@ -145,8 +147,10 @@ void dip_switch_update_user(uint8_t index, bool active) { switch (index) { case 0: if(active) { // Left no.1 - ; - } else { } + mode_windows = true; + } else { + mode_windows = false; + } break; case 1: if(active) { // Left no.2 @@ -174,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case EISU: if (record->event.pressed) { - if(keymap_config.swap_lalt_lgui==false){ + if(mode_windows==false){ register_code(KC_LANG2); }else{ SEND_STRING(SS_LALT("`")); @@ -186,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case KANA: if (record->event.pressed) { - if(keymap_config.swap_lalt_lgui==false){ + if(mode_windows==false){ register_code(KC_LANG1); }else{ SEND_STRING(SS_LALT("`")); @@ -223,7 +227,7 @@ void render_status(void) { // Render to mode icon static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}}; - if(keymap_config.swap_lalt_lgui==false){ + if(mode_windows==false){ oled_write_P(os_logo[0][0], false); oled_write_P(PSTR("\n"), false); oled_write_P(os_logo[0][1], false); diff --git a/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c b/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c index d49c8f42b6a..72ad12c558a 100644 --- a/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c +++ b/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | Home | End | | + * | CAPS | F7 | F8 | F9 | F10 | F11 | | F12 | | | Home | End | | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| * | | | | | | | | | | | Next | Vol- | Vol+ | Play | * `-------------------------------------------------------------------------------------------------' @@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT4( \ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \ + KC_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | | F12 | | |PageDn|PageUp| | + * | CAPS | F7 | F8 | F9 | F10 | F11 | | F12 | | |PageDn|PageUp| | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| * | | | | | | | | | | | Next | Vol- | Vol+ | Play | * `-------------------------------------------------------------------------------------------------' @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT4( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______, \ + KC_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), @@ -99,22 +99,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------. ,-----------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Reset|RGBRST| | | | | | | | | | Del | + * | | Reset|RGBRST|EEPRST| | | | | | | | | Del | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | |Aud on|Audoff| Mac | | Win | |RGB ON| HUE+ | SAT+ | VAL+ | + * | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | MODE | HUE- | SAT- | VAL- | * `-------------------------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT4( \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - _______, RESET, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ + _______, RESET, RGBRST, EEP_RST, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \ ) }; +static bool mode_windows = false; + void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* Master side encoder */ if (clockwise) { @@ -135,8 +137,10 @@ void dip_switch_update_user(uint8_t index, bool active) { switch (index) { case 0: if(active) { // Left no.1 - ; - } else { } + mode_windows = true; + } else { + mode_windows = false; + } break; case 1: if(active) { // Left no.2 @@ -164,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case EISU: if (record->event.pressed) { - if(keymap_config.swap_lalt_lgui==false){ + if(mode_windows==false){ register_code(KC_LANG2); }else{ SEND_STRING(SS_LALT("`")); @@ -176,7 +180,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case KANA: if (record->event.pressed) { - if(keymap_config.swap_lalt_lgui==false){ + if(mode_windows==false){ register_code(KC_LANG1); }else{ SEND_STRING(SS_LALT("`")); @@ -213,7 +217,7 @@ void render_status(void) { // Render to mode icon static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}}; - if(keymap_config.swap_lalt_lgui==false){ + if(mode_windows==false){ oled_write_P(os_logo[0][0], false); oled_write_P(PSTR("\n"), false); oled_write_P(os_logo[0][1], false);