From 9d915ed051c43edd828d6cdb784a5d094e9b312d Mon Sep 17 00:00:00 2001
From: epaew <epaew@users.noreply.github.com>
Date: Sun, 10 Mar 2019 01:22:21 +0900
Subject: Update edvorak keymap simplify (#5350)

* Update edvorakjp layouts

* swap master hand

* update tapping_term
---
 users/edvorakjp/edvorakjp_process_record.c | 129 +----------------------------
 1 file changed, 2 insertions(+), 127 deletions(-)

(limited to 'users/edvorakjp/edvorakjp_process_record.c')

diff --git a/users/edvorakjp/edvorakjp_process_record.c b/users/edvorakjp/edvorakjp_process_record.c
index 2dcdab2a25..ecc8db9363 100644
--- a/users/edvorakjp/edvorakjp_process_record.c
+++ b/users/edvorakjp/edvorakjp_process_record.c
@@ -7,114 +7,6 @@ static uint16_t time_on_pressed;
  * Each process_record_* methods defined here are
  * return false if handle edvorak_keycodes, or return true others.
  */
-bool process_record_edvorakjp_ext(uint16_t keycode, keyrecord_t *record) {
-  if (!(default_layer_state == 1UL<<_EDVORAK &&
-        get_enable_jp_extra_layer() && get_japanese_mode())) {
-    return true;
-  }
-
-  // consonant keys
-  // layer_on(J1) or layer_on(J2) are defined based on key positions.
-  switch (keycode) {
-    // right hand's left side w/o N
-    case KC_F:
-    case KC_G:
-    case KC_R:
-    case KC_D:
-    case KC_T:
-    case KC_B:
-    case KC_H:
-    case KC_J:
-      if (record->event.pressed) {
-        layer_on(_EDVORAKJ1);
-      }
-      return true;
-
-    // N: toggle layer
-    case KC_N:
-      if (record->event.pressed) {
-        biton32(layer_state) == _EDVORAK ? layer_on(_EDVORAKJ1) : dvorakj_layer_off();
-      }
-      return true;
-
-    // left hand up and right hand's right side
-    case KC_Y:
-    case KC_P:
-    case KC_W:
-    case KC_Q:
-    case KC_S:
-    case KC_M:
-    case KC_K:
-    case KC_L:
-      if (record->event.pressed) {
-        layer_on(_EDVORAKJ2);
-      }
-      return true;
-    // left hand down
-    // If return true, QMK sends keycode in new layer,
-    // but these keys are only available in old layer.
-    case KC_X:
-    case KC_C:
-    case KC_V:
-    case KC_Z:
-      if (record->event.pressed) {
-        layer_on(_EDVORAKJ2);
-        tap_code(keycode);
-      }
-      return false;
-  }
-
-  // vowel keys, symbol keys and modifier keys
-  if (record->event.pressed) {
-    dvorakj_layer_off();
-  }
-  switch (keycode) {
-    // combination vowel keys
-    case KC_AI:
-      if (record->event.pressed) {
-        SEND_STRING("ai");
-      }
-      return false;
-    case KC_OU:
-      if (record->event.pressed) {
-        SEND_STRING("ou");
-      }
-      return false;
-    case KC_EI:
-      if (record->event.pressed) {
-        SEND_STRING("ei");
-      }
-      return false;
-    case KC_ANN:
-      if (record->event.pressed) {
-        SEND_STRING("ann");
-      }
-      return false;
-    case KC_ONN:
-      if (record->event.pressed) {
-        SEND_STRING("onn");
-      }
-      return false;
-    case KC_ENN:
-      if (record->event.pressed) {
-        SEND_STRING("enn");
-      }
-      return false;
-    case KC_INN:
-      if (record->event.pressed) {
-        SEND_STRING("inn");
-      }
-      return false;
-    case KC_UNN:
-      if (record->event.pressed) {
-        SEND_STRING("unn");
-      }
-      return false;
-  }
-  // AOEIU and other (symbol, modifier) keys
-  return true;
-}
-
 bool process_record_edvorakjp_swap_scln(uint16_t keycode, keyrecord_t *record) {
 #ifdef SWAP_SCLN
   static const uint8_t shift_bits = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT);
@@ -146,30 +38,13 @@ bool process_record_edvorakjp_config(uint16_t keycode, keyrecord_t *record) {
         set_enable_kc_lang(keycode == KC_MAC);
       }
       return false;
-    case KC_EXTON:
-    case KC_EXTOFF:
-      if (record->event.pressed) {
-        set_enable_jp_extra_layer(keycode == KC_EXTON);
-      }
-      return false;
   }
   return true;
 }
 
 bool process_record_layer(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case EDVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_EDVORAK);
-      }
-      return false;
-    case QWERTY:
-      if (record->event.pressed) {
-        dvorakj_layer_off();
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
 #if TAP_DANCE_ENABLE != yes
+  switch (keycode) {
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
@@ -196,8 +71,8 @@ bool process_record_layer(uint16_t keycode, keyrecord_t *record) {
         time_on_pressed = 0;
       }
       return false;
-#endif
   }
+#endif
   return true;
 }
 
-- 
cgit v1.2.3