summaryrefslogtreecommitdiff
path: root/keyboards/keebio
diff options
context:
space:
mode:
authorRyo Maeda <epaew@users.noreply.github.com>2021-04-10 09:37:49 +0900
committerGitHub <noreply@github.com>2021-04-09 17:37:49 -0700
commit3dbb7f261dab573a3b55390394444ac3ceb3d257 (patch)
treee1b7e20933766622f974ac40a3d9aaddf239625c /keyboards/keebio
parent93e8a401df09df910b2caad7fc5ecb13fe2142ac (diff)
[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217)
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/config.h5
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/keymap.c117
2 files changed, 56 insertions, 66 deletions
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index 954d0d3b99..f296e29769 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -1,5 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
/* Use I2C or Serial, not both */
#define USE_SERIAL
@@ -22,5 +21,3 @@
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-
-#endif // CONFIG_USER_H
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index be287390dd..0c0fc5a746 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
@@ -7,79 +7,72 @@
* };
*/
-#define KC_ KC_TRNS
-
-#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)
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+#define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_EDVORAK] = LAYOUT_kc(
- //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----.
- 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
- // `----+----+----' `----+----+----'
+ [L_EDVORAKJP_BASE] = LAYOUT_wrapper(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_ESC, __EDVORAKJP_BASE_L3__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BASE_R3__ , KC_SLSH,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
- [_LOWER] = LAYOUT_kc(
- //,----+----+------+------+------+----. ,----+------+------+-------+----+----.
- , , , , , , , , , , , ,
- //|----+----+------+------+------+----| |----+------+------+-------+----+----|
- , , 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,
- // `----+----+----' `----+----+----'
+ [L_EDVORAKJP_LOWER] = LAYOUT_wrapper(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ __EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ ,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , XXXXXXX, XXXXXXX, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
- [_RAISE] = LAYOUT_kc(
- //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----.
- , , , , , , , , , , , ,
- //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----|
- , ,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 , ,
- // `----+----+----' `----+----+----'
+ [L_EDVORAKJP_RAISE] = LAYOUT_wrapper(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , XXXXXXX, XXXXXXX, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
)
};
+// clang-format on
-void matrix_init_keymap() {
-}
+void matrix_init_keymap() {}
#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 _LOWER:
- rgblight_sethsv_noeeprom_red();
- break;
- case _RAISE:
- rgblight_sethsv_noeeprom_blue();
- break;
- 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;
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+ switch (biton32(state)) {
+ case L_EDVORAKJP_LOWER:
+ rgblight_sethsv_noeeprom_red();
+ break;
+ case L_EDVORAKJP_RAISE:
+ rgblight_sethsv_noeeprom_green();
+ break;
+ default: // for any other layers, or the default layer
+ rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
+ rgblight_sethsv_red();
+ break;
+ }
+ return state;
}
#endif