diff options
| author | epaew <epaew@users.noreply.github.com> | 2019-03-10 01:22:21 +0900 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-03-09 08:22:21 -0800 |
| commit | 9d915ed051c43edd828d6cdb784a5d094e9b312d (patch) | |
| tree | 26e12a4eece02daa1aab74946868f0a01fc87db8 /keyboards/crkbd/keymaps/edvorakjp/oled.c | |
| parent | cd9e15036e692477d37a3c1a82c5ba1f29b8a11e (diff) | |
Update edvorak keymap simplify (#5350)
* Update edvorakjp layouts
* swap master hand
* update tapping_term
Diffstat (limited to 'keyboards/crkbd/keymaps/edvorakjp/oled.c')
| -rw-r--r-- | keyboards/crkbd/keymaps/edvorakjp/oled.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/keyboards/crkbd/keymaps/edvorakjp/oled.c b/keyboards/crkbd/keymaps/edvorakjp/oled.c index e4cccf3e7f..cbb43d0615 100644 --- a/keyboards/crkbd/keymaps/edvorakjp/oled.c +++ b/keyboards/crkbd/keymaps/edvorakjp/oled.c @@ -21,11 +21,7 @@ const char *read_layer_state(void) { switch (biton32(layer_state)) { case L_BASE: - strcpy(layer_name, default_layer_state == 1UL<<_EDVORAK ? "EDVORAK" : "QWERTY"); - break; - case _EDVORAKJ1: - case _EDVORAKJ2: - strcpy(layer_name, "JP_EXT"); + strcpy(layer_name, "Default"); break; case _RAISE: strcpy(layer_name, "Raise"); @@ -33,9 +29,6 @@ const char *read_layer_state(void) { case _LOWER: strcpy(layer_name, "Lower"); break; - case _ADJUST: - strcpy(layer_name, "Adjust"); - break; default: snprintf(layer_name, sizeof(layer_name), "Undef-%ld", layer_state); } @@ -49,10 +42,7 @@ const char *read_layer_state(void) { const char *read_host_led_state(void) { static char led_str[24]; - bool ext_status = get_enable_jp_extra_layer() && get_japanese_mode(); - strcpy(led_str, ext_status ? "EXT" : " "); - - strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? " NMLK" : " "); + strcpy(led_str, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : " "); strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? " CAPS" : " "); strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? " SCLK" : " "); return led_str; @@ -70,7 +60,11 @@ void iota_gfx_task_user(void) { struct CharacterMatrix matrix; matrix_clear(&matrix); +#ifdef MASTER_RIGHT + if (!is_master) { +#else if (is_master) { +#endif // MASTER_RIGHT matrix_write(&matrix, read_mode_icon(!get_enable_kc_lang())); matrix_write(&matrix, " "); matrix_write(&matrix, read_layer_state()); |