Update edvorak keymap simplify (#5350)
* Update edvorakjp layouts * swap master hand * update tapping_term
This commit is contained in:
epaew
MechMerlin
@@ -1,21 +1,23 @@
|
||||
#ifndef CONFIG_USER_H
|
||||
#define CONFIG_USER_H
|
||||
|
||||
#define SWAP_SCLN
|
||||
|
||||
#undef TAPPING_FORCE_HOLD
|
||||
#undef TAPPING_TERM
|
||||
#define TAPPING_TERM 120
|
||||
#define SWAP_SCLN
|
||||
#define TAPPING_TERM 300
|
||||
#define IGNORE_MOD_TAP_INTERRUPT
|
||||
|
||||
// If you need more program area, try select and reduce rgblight modes to use.
|
||||
|
||||
// Selection of RGBLIGHT MODE to use.
|
||||
#if defined(LED_ANIMATIONS)
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||
#define RGBLIGHT_EFFECT_SNAKE
|
||||
#define RGBLIGHT_EFFECT_KNIGHT
|
||||
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||
//#define RGBLIGHT_EFFECT_BREATHING
|
||||
//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||
//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||
//#define RGBLIGHT_EFFECT_SNAKE
|
||||
//#define RGBLIGHT_EFFECT_KNIGHT
|
||||
//#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||
//#define RGBLIGHT_EFFECT_RGB_TEST
|
||||
//#define RGBLIGHT_EFFECT_ALTERNATING
|
||||
|
||||
@@ -7,21 +7,6 @@
|
||||
|
||||
// keymaps definitions are moved to keymap_Xrows.c.
|
||||
|
||||
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 SSD1306OLED
|
||||
void matrix_init_keymap(void) {
|
||||
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
|
||||
@@ -37,23 +22,15 @@ void matrix_scan_user(void) {
|
||||
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_sethsv_noeeprom_white();
|
||||
break;
|
||||
case _LOWER:
|
||||
rgblight_sethsv_noeeprom_red();
|
||||
break;
|
||||
case _RAISE:
|
||||
rgblight_sethsv_noeeprom_blue();
|
||||
break;
|
||||
case _ADJUST:
|
||||
rgblight_sethsv_noeeprom_green();
|
||||
break;
|
||||
default: // for any other layers, or the default layer
|
||||
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
|
||||
rgblight_sethsv_noeeprom_red();
|
||||
rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
|
||||
rgblight_sethsv_red();
|
||||
break;
|
||||
}
|
||||
return state;
|
||||
|
||||
@@ -4,86 +4,38 @@
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
[_EDVORAK] = LAYOUT_kc(
|
||||
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
|
||||
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 , B , H , J , K , L ,SLSH,
|
||||
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
|
||||
LEFT,DOWN, UP ,RGHT,TMB1,TMB2,TMB3, TMB6,TMB7,TMB8,LEFT,DOWN, UP ,RGHT
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
),
|
||||
|
||||
[_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(
|
||||
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
|
||||
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 ,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 , H , J , K , L , B ,SLSH,
|
||||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
|
||||
HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3, TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT
|
||||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
|
||||
),
|
||||
|
||||
[_LOWER] = LAYOUT_kc(
|
||||
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
|
||||
F1 , F2 , F3 , F4 , F5 ,LCBR, RCBR, 7 , 8 , 9 ,MINS,SLSH,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
F6 , F7 , F8 , F9 ,F10 ,LPRN, RPRN, 4 , 5 , 6 ,PLUS,ASTR,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
F11 ,F12 ,PSCR,SLCK,PAUS,LBRC, RBRC, 1 , 2 , 3 , NO , NO ,
|
||||
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
|
||||
HOME,PGDN,PGUP,END , , , , ,ESC , 0 ,HOME,PGDN,PGUP,END
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
//,----+----+------+------+------+----. ,----+------+------+-------+----+----.
|
||||
, , 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 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, NO ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , NO ,
|
||||
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
|
||||
HOME,PGDN,PGUP,END ,TMB9,ESC , , , , ,HOME,PGDN,PGUP,END
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
),
|
||||
|
||||
[_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 , , , , , ,
|
||||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
|
||||
)
|
||||
};
|
||||
|
||||
@@ -4,100 +4,44 @@
|
||||
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,
|
||||
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
|
||||
LEFT,DOWN, UP ,RGHT,TMB1,TMB2,TMB3, TMB6,TMB7,TMB8,LEFT,DOWN, UP ,RGHT
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
),
|
||||
|
||||
[_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,
|
||||
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
|
||||
, , , , , , , , , , , , ,
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
//,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----.
|
||||
ESC ,EXLM, AT ,HASH , DLR ,PERC, CIRC,AMPR ,ASTR ,LPRN ,RPRN,BSPC,
|
||||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
|
||||
GRV ,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,
|
||||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
|
||||
TAB ,SCLN, X , C , V , Z , NO , NO , H , J , K , L , B ,SLSH,
|
||||
//|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----|
|
||||
HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3, TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT
|
||||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
|
||||
),
|
||||
|
||||
[_LOWER] = LAYOUT_kc(
|
||||
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
|
||||
, , , , , , , ,SLSH,ASTR, , ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
F1 , F2 , F3 , F4 , F5 ,LCBR, RCBR, 7 , 8 , 9 ,MINS, ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
F6 , F7 , F8 , F9 ,F10 ,LPRN, RPRN, 4 , 5 , 6 ,PLUS, ,
|
||||
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
|
||||
F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,LOCK, ,RBRC, 1 , 2 , 3 , , ,
|
||||
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
|
||||
HOME,PGDN,PGUP,END ,TMB9, , , , , 0 ,HOME,PGDN,PGUP,END
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
//,----+----+------+------+------+----. ,----+------+------+-------+----+----.
|
||||
PSCR, , , , , , , , , , , ,
|
||||
//|----+----+------+------+------+----| |----+------+------+-------+----+----|
|
||||
, , LCBR , LBRC , LPRN , , , RPRN , RBRC , RCBR , , ,
|
||||
//|----+----+------+------+------+----| |----+------+------+-------+----+----|
|
||||
F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 , F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 ,
|
||||
//|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----|
|
||||
, , HOME , PGDN , PGUP ,END , , ,LEFT, DOWN , UP , RGHT , , ,
|
||||
//|----+----+------+------+------+----+----| |----+----+------+------+-------+----+----|
|
||||
, , , , , , NO , MAC ,TMB7, , , , ,
|
||||
//`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----'
|
||||
),
|
||||
|
||||
[_RAISE] = LAYOUT_kc(
|
||||
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
|
||||
, , , , , , , ,SLSH,ASTR, , ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
F1 , F2 , F3 , F4 , F5 ,LCBR, RCBR, 7 , 8 , 9 ,MINS, ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
F6 , F7 , F8 , F9 ,F10 ,LPRN, RPRN, 4 , 5 , 6 ,PLUS, ,
|
||||
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
|
||||
F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,LOCK, ,RBRC, 1 , 2 , 3 , , ,
|
||||
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
|
||||
HOME,PGDN,PGUP,END ,TMB9, , , , , 0 ,HOME,PGDN,PGUP,END
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
),
|
||||
|
||||
[_ADJUST] = LAYOUT_kc(
|
||||
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
|
||||
, , , , , , , , , , , ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
, , , ,EXTOFF, , ,EXTON, , , , ,
|
||||
//|----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
,RST ,DBUG,RTOG,WIN , , ,MAC ,QWER,EDJP, , ,
|
||||
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
|
||||
, , , , , , , , , , , , , ,
|
||||
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
|
||||
, , , , , , , , , , , , ,
|
||||
//`----+----+----+----+----+----+----/ \----+----+----+----+----+----+----'
|
||||
//,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----.
|
||||
PSCR, , , , , , , , , , , ,
|
||||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
|
||||
, ,EXLM , AT ,HASH ,DLR , PERC,CIRC ,AMPR ,ASTR , , ,
|
||||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
|
||||
, 1 ,LA(2),LG(3),LC(4), 5 , 6 ,RS(7),RG(8),RA(9), 0 , ,
|
||||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
|
||||
, ,HOME ,PGDN ,PGUP ,END , , ,LEFT,DOWN , UP ,RGHT , , ,
|
||||
//|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----|
|
||||
, , , , , ,WIN , NO , , , , , ,
|
||||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
|
||||
)
|
||||
};
|
||||
|
||||
@@ -2,27 +2,20 @@
|
||||
#define KEYMAP_XROWS_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)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,13 +34,7 @@ void render_status(struct CharacterMatrix *matrix) {
|
||||
matrix_write_P(matrix, PSTR("\nLayer: "));
|
||||
switch (biton32(layer_state)) {
|
||||
case L_BASE:
|
||||
matrix_write_P(matrix,
|
||||
default_layer_state == 1UL<<_EDVORAK ? PSTR("EDVORAK") : PSTR("QWERTY")
|
||||
);
|
||||
break;
|
||||
case _EDVORAKJ1:
|
||||
case _EDVORAKJ2:
|
||||
matrix_write_P(matrix, PSTR("JP_EXT"));
|
||||
matrix_write_P(matrix, PSTR("Default"));
|
||||
break;
|
||||
case _RAISE:
|
||||
matrix_write_P(matrix, PSTR("Raise"));
|
||||
@@ -48,17 +42,13 @@ void render_status(struct CharacterMatrix *matrix) {
|
||||
case _LOWER:
|
||||
matrix_write_P(matrix, PSTR("Lower"));
|
||||
break;
|
||||
case _ADJUST:
|
||||
matrix_write_P(matrix, PSTR("Adjust"));
|
||||
break;
|
||||
default:
|
||||
matrix_write(matrix, buf);
|
||||
}
|
||||
|
||||
// Host Keyboard LED Status
|
||||
char led[40];
|
||||
snprintf(led, sizeof(led), "\n%s %s %s %s",
|
||||
get_enable_jp_extra_layer() && get_japanese_mode() ? "EXT" : " ",
|
||||
snprintf(led, sizeof(led), "\n%s %s %s",
|
||||
(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : " ",
|
||||
(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : " ",
|
||||
(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : " ");
|
||||
|
||||
@@ -15,6 +15,7 @@ UNICODE_ENABLE = no # Unicode
|
||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||
SWAP_HANDS_ENABLE = no # Enable one-hand typing
|
||||
TAP_DANCE_ENABLE = yes
|
||||
|
||||
define HELIX_CUSTOMISE_MSG
|
||||
$(info Helix customize)
|
||||
|
||||
Reference in New Issue
Block a user