summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Lepa <const.lepa+github@gmail.com>2018-07-17 18:16:01 +0300
committerDrashna Jaelre <drashna@live.com>2018-07-17 08:16:01 -0700
commit85d2d4fee5c6801b5f492bedc55b54f57e75c594 (patch)
treec1c48fa446472ddfec6b62a32056dcad74256fed
parenta57c9648e9712208e816bcc5b412c53882d9d48f (diff)
Keymap: Change Satan layout lepa (rev 2) (#3427)
* Change Satan keymap lepa (rev 2) * Remove unused code from satan keymap lepa.
-rw-r--r--keyboards/satan/keymaps/lepa/keymap.c113
-rw-r--r--keyboards/satan/keymaps/lepa/readme.md11
2 files changed, 80 insertions, 44 deletions
diff --git a/keyboards/satan/keymaps/lepa/keymap.c b/keyboards/satan/keymaps/lepa/keymap.c
index 080068427c..85fdb743d3 100644
--- a/keyboards/satan/keymaps/lepa/keymap.c
+++ b/keyboards/satan/keymaps/lepa/keymap.c
@@ -1,29 +1,36 @@
#include QMK_KEYBOARD_H
-#define MY_LESC LT(1, KC_ESC)
-#define MY_RENT LT(1, KC_ENT)
-#define MY_LCA TD(TD_LCA)
-#define MY_RCA TD(TD_RCA)
-#define MY_LGA TD(TD_LGA)
-#define MY_RGA TD(TD_RGA)
-#define MY_APP TD(TD_APP_HYPR)
+#define MY_ESC LT(1, KC_ESC)
+#define MY_ENT LT(1, KC_ENT)
+#define MY_APP LT(2, KC_APP)
+
+#define MY_LCA TD(TD_LCTL_ALT)
+#define MY_RCA TD(TD_RCTL_ALT)
+#define MY_LGA TD(TD_LGUI_ALT)
+#define MY_RGA TD(TD_RGUI_ALT)
+#define MY_LCG TD(TD_LCTL_GUI)
+#define MY_RCG TD(TD_RCTL_GUI)
+#define MY_LSH TD(TD_LSFT_HPR)
+#define MY_RSH TD(TD_RSFT_HPR)
enum {
- TD_LCA,
- TD_RCA,
- TD_LGA,
- TD_RGA,
- TD_APP_HYPR
+ TD_LCTL_ALT,
+ TD_RCTL_ALT,
+ TD_LGUI_ALT,
+ TD_RGUI_ALT,
+ TD_LCTL_GUI,
+ TD_RCTL_GUI,
+ TD_LSFT_HPR,
+ TD_RSFT_HPR
};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT_60_ansi(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
- MY_LESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, MY_RENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- MY_LGA, KC_LALT, MY_LCA, KC_SPC, MY_RCA, KC_RALT, MY_APP, MY_RGA),
+ MY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, MY_ENT,
+ MY_LSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MY_RSH,
+ MY_LGA, MY_LCG, MY_LCA, KC_SPC, MY_RCA, MY_RCG, MY_APP, MY_RGA),
LAYOUT_60_ansi(
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
@@ -31,6 +38,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+ LAYOUT_60_ansi(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, DEBUG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
enum {
@@ -66,7 +80,8 @@ int cur_dance(qk_tap_dance_state_t *state) {
return UNKNOWN_TAP;
}
-#define my_dance_combo(N, K1, K2) \
+#define my_dance_combo(N, K0, REGFN, UNREGFN) my_dance_combo_expanded(N, K0, REGFN, UNREGFN)
+#define my_dance_combo_expanded(N, K0, REGFN, UNREGFN) \
static tap N ## _state = { \
.is_press_action = true, \
.state = 0 \
@@ -75,45 +90,57 @@ static tap N ## _state = { \
void N ## _finished(qk_tap_dance_state_t *state, void *user_data) { \
N ## _state.state = cur_dance(state); \
switch (N ## _state.state) { \
- case SINGLE_TAP: \
- case SINGLE_HOLD: \
- register_code(K1); \
+ case SINGLE_TAP: case SINGLE_HOLD: \
+ register_code(K0); \
break; \
- case DOUBLE_TAP: \
- case DOUBLE_SINGLE_TAP: \
- case DOUBLE_HOLD: \
- register_code(K1); \
- register_code(K2); \
+ case DOUBLE_TAP: case DOUBLE_SINGLE_TAP: case DOUBLE_HOLD: \
+ register_code(K0); \
+ REGFN; \
break; \
} \
} \
\
void N ## _reset(qk_tap_dance_state_t *state, void *user_data) { \
switch (N ## _state.state) { \
- case SINGLE_TAP: \
- case SINGLE_HOLD: \
- unregister_code(K1); \
+ case SINGLE_TAP: case SINGLE_HOLD: \
+ unregister_code(K0); \
break; \
- case DOUBLE_TAP: \
- case DOUBLE_SINGLE_TAP: \
- case DOUBLE_HOLD: \
- unregister_code(K2); \
- unregister_code(K1); \
+ case DOUBLE_TAP: case DOUBLE_SINGLE_TAP: case DOUBLE_HOLD: \
+ UNREGFN; \
+ unregister_code(K0); \
break; \
} \
N ## _state.state = 0; \
}
-my_dance_combo(lca, KC_LCTL, KC_LALT)
-my_dance_combo(rca, KC_RCTL, KC_RALT)
-my_dance_combo(lga, KC_LGUI, KC_LALT)
-my_dance_combo(rga, KC_RGUI, KC_RALT)
+#define my_dance_reg_code_1(K1) register_code(K1)
+#define my_dance_unreg_code_1(K1) unregister_code(K1)
+#define my_dance_combo_1(N, K0, K1) \
+ my_dance_combo(N, K0, my_dance_reg_code_1(K1), my_dance_unreg_code_1(K1))
-qk_tap_dance_action_t tap_dance_actions[] = {
- [TD_LCA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lca_finished, lca_reset),
- [TD_RCA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rca_finished, rca_reset),
- [TD_LGA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lga_finished, lga_reset),
- [TD_RGA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rga_finished, rga_reset),
+#define my_dance_reg_code_3(K1, K2, K3) \
+ do { register_code(K1); register_code(K2); register_code(K3); } while (0)
+#define my_dance_unreg_code_3(K1, K2, K3) \
+ do { unregister_code(K3); unregister_code(K2); unregister_code(K1); } while (0)
+#define my_dance_combo_3(N, K0, K1, K2, K3) \
+ my_dance_combo(N, K0, my_dance_reg_code_3(K1, K2, K3), my_dance_unreg_code_3(K1, K2, K3))
- [TD_APP_HYPR] = ACTION_TAP_DANCE_DOUBLE(KC_APP, KC_HYPR)
+my_dance_combo_1(lca, KC_LCTL, KC_LALT)
+my_dance_combo_1(rca, KC_RCTL, KC_RALT)
+my_dance_combo_1(lga, KC_LGUI, KC_LALT)
+my_dance_combo_1(rga, KC_RGUI, KC_RALT)
+my_dance_combo_1(lcg, KC_LCTL, KC_LGUI)
+my_dance_combo_1(rcg, KC_RCTL, KC_RGUI)
+my_dance_combo_3(lsh, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI)
+my_dance_combo_3(rsh, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI)
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+ [TD_LCTL_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lca_finished, lca_reset),
+ [TD_RCTL_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rca_finished, rca_reset),
+ [TD_LGUI_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lga_finished, lga_reset),
+ [TD_RGUI_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rga_finished, rga_reset),
+ [TD_LCTL_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lcg_finished, lcg_reset),
+ [TD_RCTL_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rcg_finished, rcg_reset),
+ [TD_LSFT_HPR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lsh_finished, lsh_reset),
+ [TD_RSFT_HPR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rsh_finished, rsh_reset)
};
diff --git a/keyboards/satan/keymaps/lepa/readme.md b/keyboards/satan/keymaps/lepa/readme.md
index 99ee135f01..a53693d03f 100644
--- a/keyboards/satan/keymaps/lepa/readme.md
+++ b/keyboards/satan/keymaps/lepa/readme.md
@@ -1,4 +1,13 @@
# Satan GH60 ANSI Layout that uses tap dance
-![Satan GH60 Image](https://i.imgur.com/9bKM2TM.png)
+![Satan GH60 Image](https://i.imgur.com/T5FX7Sn.png)
+
+Notes:
+- Enter and Esc keys activate layer Fn1 when held, and work as usual when tapped.
+- Menu key activates layer Fn2 when held, and works as usual when tapped.
+- For the next keys a first key is used when held, and a second one is used when tapped 2 times:
+ - Shift and Hyper;
+ - Win and Win+Alt;
+ - Ctrl and Ctrl+Alt;
+ - Alt and Win+Ctrl.