summaryrefslogtreecommitdiff
path: root/keyboards/keebio
diff options
context:
space:
mode:
authorepaew <epaew@users.noreply.github.com>2019-03-10 01:22:21 +0900
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-03-09 08:22:21 -0800
commit9d915ed051c43edd828d6cdb784a5d094e9b312d (patch)
tree26e12a4eece02daa1aab74946868f0a01fc87db8 /keyboards/keebio
parentcd9e15036e692477d37a3c1a82c5ba1f29b8a11e (diff)
Update edvorak keymap simplify (#5350)
* Update edvorakjp layouts * swap master hand * update tapping_term
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/config.h19
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/keymap.c187
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/rules.mk26
3 files changed, 74 insertions, 158 deletions
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index 1610c4b124..954d0d3b99 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -1,10 +1,7 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
-#include "config_common.h"
-
/* Use I2C or Serial, not both */
-
#define USE_SERIAL
// #define USE_I2C
@@ -14,18 +11,16 @@
// #define MASTER_RIGHT
// #define EE_HANDS
+#define SWAP_SCLN
+#define TAPPING_TERM 300
+#define IGNORE_MOD_TAP_INTERRUPT
+
#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLED_NUM 10
+#define RGBLIGHT_LIMIT_VAL 100
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 100
-
-#define MOUSEKEY_WHEEL_MAX_SPEED 10
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 20
-
-#define TAPPING_TERM 120
-#define SWAP_SCLN
-#endif
+#endif // CONFIG_USER_H
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index f5d305f7f4..be287390dd 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
@@ -1,166 +1,85 @@
#include QMK_KEYBOARD_H
#include "edvorakjp.h"
-enum custom_keycodes {
- KC_LOCK = NEW_SAFE_RANGE,
-};
+/*
+ * enum custom_keycodes {
+ * KC_LOCK = NEW_SAFE_RANGE,
+ * };
+ */
#define KC_ KC_TRNS
-#define KC_TMB1 LGUI_T(KC_TAB)
-#define KC_TMB2 LSFT_T(KC_SPC)
-#define KC_TMB3 LOWER // act as LOWER when hold, as KC_LANG2(=English) when tapped
-#define KC_TMB4 LCTL_T(KC_ESC)
-#define KC_TMB5 RSFT_T(KC_DEL)
-#define KC_TMB6 RAISE // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
-#define KC_TMB7 RCTL_T(KC_BSPC)
-#define KC_TMB8 RALT_T(KC_ENT)
-#define KC_TMB9 LGUI(KC_TAB)
-
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_EDJP EDVORAK
-#define KC_QWER QWERTY
+#define KC_TMB1 KC_LA(TAB)
+#define KC_TMB2 KC_LS(SPC)
+#define KC_TMB3 TD(TD_LOWER) // act as LOWER when hold, as KC_LANG2(=English) when tapped
+#define KC_TMB4 TD(TD_RAISE) // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
+#define KC_TMB5 KC_RC(BSPC)
+#define KC_TMB6 KC_RG(ENT)
+#define KC_TMB7 KC_RC(DEL)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_EDVORAK] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- GRV ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- LBRC,RBRC,COMM,DOT , Y , P , F , G , R , W , Q ,BSLS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- EQL , A , O , E , I , U , D , T , N , S , M ,MINS,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- QUOT,SCLN, X , C , V , Z ,TMB4, TMB5, B , H , J , K , L ,SLSH,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- TMB1,TMB2,TMB3, TMB6,TMB7,TMB8
- // `----+----+----' `----+----+----'
- ),
-
- [_EDVORAKJ1] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- , , , , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , AI , OU , EI , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , , , , , , , , , Y , , ,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- ,ANN ,ONN ,ENN ,INN ,UNN , , , , , , , , ,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- , , , , ,
- // `----+----+----' `----+----+----'
- ),
-
- [_EDVORAKJ2] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- , , , , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , AI , OU , EI , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , , , , , , , Y , , , , ,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- ,ANN ,ONN ,ENN ,INN ,UNN , , , , , , , , ,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- , , , , ,
- // `----+----+----' `----+----+----'
- ),
-
- [_QWERTY] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- GRV ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- EQL , Q , W , E , R , T , Y , U , I , O , P ,MINS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- LBRC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- RBRC, Z , X , C , V , B , , , N , M ,COMM,DOT ,SLSH,BSLS,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- , , , , ,
- // `----+----+----' `----+----+----'
+ //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----.
+ GRV ,EXLM, AT ,HASH , DLR ,PERC, CIRC,AMPR ,ASTR ,LPRN ,RPRN,BSPC,
+ //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
+ TAB ,QUOT,COMM , DOT , Y , Q , F , G , R , W , P ,BSLS,
+ //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
+ EQL , A ,LA(O),LG(E),LC(I), U , D ,RS(T),RG(N),RA(S), M ,MINS,
+ //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+ ESC ,SCLN, X , C , V , Z , NO , NO , H , J , K , L , B ,SLSH,
+ //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
+ TMB1,TMB2,TMB3, TMB4,TMB5,TMB6
+ // `----+----+----' `----+----+----'
),
[_LOWER] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- , , , , , , , ,SLSH,ASTR, , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , ,BTN4,WH_U,BTN5, , , 7 , 8 , 9 ,MINS, ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , ,WH_L,WH_D,WH_R, , , 4 , 5 , 6 ,PLUS, ,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- , ,BTN1,BTN3,BTN2, , , , , 1 , 2 , 3 , , ,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- , , , , 0 ,
- // `----+----+----' `----+----+----'
+ //,----+----+------+------+------+----. ,----+------+------+-------+----+----.
+ , , , , , , , , , , , ,
+ //|----+----+------+------+------+----| |----+------+------+-------+----+----|
+ , , LCBR , LBRC , LPRN , , , RPRN , RBRC , RCBR , , ,
+ //|----+----+------+------+------+----| |----+------+------+-------+----+----|
+ F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 , F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 ,
+ //|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----|
+ PSCR, , HOME , PGDN , PGUP ,END , , ,LEFT, DOWN , UP , RGHT , , ,
+ //`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----'
+ , , NO , MAC ,TMB7,
+ // `----+----+----' `----+----+----'
),
[_RAISE] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- , , , , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- F1 , F2 , F3 , F4 , F5 ,LCBR, RCBR, , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- F6 , F7 , F8 , F9 ,F10 ,LPRN, RPRN,HOME,PGDN,PGUP,END , ,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,LOCK, ,RBRC,LEFT,DOWN, UP ,RGHT, ,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- TMB9, , , , ,
- // `----+----+----' `----+----+----'
- ),
-
- [_ADJUST] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- , , , , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- , , , ,EXTOFF, , ,EXTON, , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- ,RST ,DBUG,RTOG,WIN , , ,MAC ,QWER,EDJP, , ,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- , , , , , , , , , , , , , ,
- //`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
- , , , , ,
- // `----+----+----' `----+----+----'
+ //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----.
+ , , , , , , , , , , , ,
+ //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
+ , ,EXLM , AT ,HASH ,DLR , PERC,CIRC ,AMPR ,ASTR , , ,
+ //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
+ , 1 ,LA(2),LG(3),LC(4), 5 , 6 ,RS(7),RG(8),RA(9), 0 , ,
+ //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+ PSCR, ,HOME ,PGDN ,PGUP ,END , , ,LEFT,DOWN , UP ,RGHT , , ,
+ //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
+ , ,WIN , NO , ,
+ // `----+----+----' `----+----+----'
)
};
void matrix_init_keymap() {
}
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
- switch(keycode) {
- case KC_LOCK:
- if (record->event.pressed) {
- if (get_enable_kc_lang()) {
- SEND_STRING( SS_LCTRL(SS_LSFT(SS_TAP(X_POWER))) );
- } else {
- SEND_STRING( SS_LGUI("l") );
- }
- }
- return false;
- }
- return true;
-}
-
+#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
uint32_t layer_state_set_keymap(uint32_t state) {
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
switch (biton32(state)) {
- case _EDVORAKJ1:
- case _EDVORAKJ2:
- // _EDVORAKJ1 & J2 are same colored
- rgblight_setrgb (0xFF, 0xFF, 0xFF);
- break;
case _LOWER:
- rgblight_setrgb (0xFF, 0x00, 0x00);
+ rgblight_sethsv_noeeprom_red();
break;
case _RAISE:
- rgblight_setrgb (0x00, 0x00, 0xFF);
- break;
- case _ADJUST:
- rgblight_setrgb (0x00, 0xFF, 0x00);
+ rgblight_sethsv_noeeprom_blue();
break;
- default: // for any other layers, or the default layer
- rgblight_mode(28);
+ default: // for any other layers, or the default layer
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
+ get_japanese_mode() ? rgblight_sethsv_noeeprom_red() : rgblight_sethsv_noeeprom_green();
break;
}
return state;
}
+#endif
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/rules.mk b/keyboards/keebio/iris/keymaps/edvorakjp/rules.mk
index 58d244c389..4ee94a9832 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/rules.mk
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/rules.mk
@@ -2,15 +2,17 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-MIDI_ENABLE = no # MIDI controls
-AUDIO_ENABLE = no # Audio output on port C6
-UNICODE_ENABLE = no # Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+EXTRAKEY_ENABLE = no # Audio control and System control(+450)
+CONSOLE_ENABLE = no # Console for debug(+400)
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+MIDI_ENABLE = no # MIDI controls
+AUDIO_ENABLE = no # Audio output on port C6
+UNICODE_ENABLE = no # Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
+SWAP_HANDS_ENABLE = no # Enable one-hand typing
+TAP_DANCE_ENABLE = yes