diff options
| -rw-r--r-- | layouts/community/ortho_5x15/wanleg/keymap.c | 137 | ||||
| -rw-r--r-- | users/wanleg/rules.mk | 9 | ||||
| -rw-r--r-- | users/wanleg/tapdances.c | 4 | ||||
| -rw-r--r-- | users/wanleg/wanleg.c | 58 | ||||
| -rw-r--r-- | users/wanleg/wanleg.h | 69 |
5 files changed, 109 insertions, 168 deletions
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c index 51b020fcd..a98f61988 100644 --- a/layouts/community/ortho_5x15/wanleg/keymap.c +++ b/layouts/community/ortho_5x15/wanleg/keymap.c | |||
| @@ -1,26 +1,71 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "wanleg.h" | 2 | #include "wanleg.h" |
| 3 | 3 | ||
| 4 | #define _________________BLANK_75__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 5 | #define _________________BLANK_50__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 4 | #define _________________BLANK_50__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 6 | #define _________________Num_Row_75________________ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK | 5 | |
| 6 | #if defined(PADC) | ||
| 7 | #define LAYOUT_75_base( \ | ||
| 8 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \ | ||
| 9 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \ | ||
| 10 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \ | ||
| 11 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \ | ||
| 12 | ) \ | ||
| 13 | LAYOUT_ortho_5x15_wrapper( \ | ||
| 14 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, QWERTY, GHERKIN, FUNCTION, \ | ||
| 15 | K00, K01, K02, K03, K04, K05, K0c, K0d, K0e, K06, K07, K08, K09, K0a, K0b, \ | ||
| 16 | K10, K11, K12, K13, K14, K15, K1c, K1d, K1e, K16, K17, K18, K19, K1a, K1b, \ | ||
| 17 | K20, K21, K22, K23, K24, K25, K2c, K2d, K2e, K26, K27, K28, K29, K2a, K2b, \ | ||
| 18 | K30, K31, K32, K33, K34, K35, K3c, K3d, K3e, K36, K37, K38, K39, K3a, K3b \ | ||
| 19 | ) | ||
| 20 | |||
| 21 | #elif defined(PADL) | ||
| 22 | #define LAYOUT_75_base( \ | ||
| 23 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \ | ||
| 24 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \ | ||
| 25 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \ | ||
| 26 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \ | ||
| 27 | ) \ | ||
| 28 | LAYOUT_ortho_5x15_wrapper( \ | ||
| 29 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, QWERTY, GHERKIN, FUNCTION, \ | ||
| 30 | K0c, K0d, K0e, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \ | ||
| 31 | K1c, K1d, K1e, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \ | ||
| 32 | K2c, K2d, K2e, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \ | ||
| 33 | K3c, K3d, K3e, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b \ | ||
| 34 | ) | ||
| 35 | |||
| 36 | #else | ||
| 37 | #define LAYOUT_75_base( \ | ||
| 38 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \ | ||
| 39 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \ | ||
| 40 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \ | ||
| 41 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \ | ||
| 42 | ) \ | ||
| 43 | LAYOUT_ortho_5x15_wrapper( \ | ||
| 44 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, QWERTY, GHERKIN, FUNCTION, \ | ||
| 45 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \ | ||
| 46 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \ | ||
| 47 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \ | ||
| 48 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \ | ||
| 49 | ) | ||
| 50 | #endif | ||
| 51 | |||
| 52 | #define LAYOUT_75_base_wrapper(...) LAYOUT_75_base(__VA_ARGS__) | ||
| 7 | 53 | ||
| 8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 54 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 9 | #if defined(KEYBOARD_40percentclub_5x5) | 55 | #if defined(KEYBOARD_40percentclub_5x5) |
| 10 | [GK75] = LAYOUT_ortho_5x15_wrapper( | 56 | [_GK] = LAYOUT_75_base_wrapper( |
| 11 | _________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75, | 57 | _______________GherkinLike_0_______________, KC_7, KC_8, KC_9, |
| 12 | _______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9, | 58 | _______________GherkinLike_1_______________, KC_4, KC_5, KC_6, |
| 13 | _______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6, | 59 | TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM, KC_V), LT(ETC, KC_B), KC_N, LT(DIR, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_1, KC_2, KC_3, |
| 14 | TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3, | 60 | TD(RST_TAP_DANCE), GHERKIN50, KC_LALT, NUMPAD, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_0, KC_0, KC_DOT |
| 15 | TD(RST_TAP_DANCE), GHERKIN50, KC_LALT, NUMPAD, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT | ||
| 16 | ), | 61 | ), |
| 17 | 62 | ||
| 18 | [GK50] = LAYOUT_ortho_5x10_wrapper( | 63 | [GK50] = LAYOUT_ortho_5x10_wrapper( |
| 19 | KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, | 64 | KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, |
| 20 | _______________Gherkin_Row_0_______________, | 65 | _______________Gherkin_Row_0_______________, |
| 21 | _______________Gherkin_Row_1_______________, | 66 | _______________Gherkin_Row_1_______________, |
| 22 | _______________Gherkin_Row_2_______________, | 67 | _______________Gherkin_Row_2_______________, |
| 23 | TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI | 68 | TD(RST_TAP_DANCE), GHERKIN, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI |
| 24 | ), | 69 | ), |
| 25 | 70 | ||
| 26 | [gNUM] = LAYOUT_ortho_5x10_wrapper( | 71 | [gNUM] = LAYOUT_ortho_5x10_wrapper( |
| @@ -65,9 +110,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 65 | ), | 110 | ), |
| 66 | #endif | 111 | #endif |
| 67 | #else | 112 | #else |
| 68 | /* Gherkin 75 | 113 | /* Gherkin |
| 69 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 114 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 70 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | | FN | | 115 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN | |
| 71 | * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------| | 116 | * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------| |
| 72 | * | | 7 | 8 | 9 | | 117 | * | | 7 | 8 | 9 | |
| 73 | * | |--------+--------+--------| | 118 | * | |--------+--------+--------| |
| @@ -78,17 +123,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 78 | * | | 0 | 0 | . | | 123 | * | | 0 | 0 | . | |
| 79 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 124 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 80 | */ | 125 | */ |
| 81 | [GK75] = LAYOUT_ortho_5x15_wrapper( | 126 | [_GK] = LAYOUT_75_base_wrapper( |
| 82 | _________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75, | 127 | _______________GherkinLike_0_______________, KC_7, KC_8, KC_9, |
| 83 | _______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9, | 128 | _______________GherkinLike_1_______________, KC_4, KC_5, KC_6, |
| 84 | _______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6, | 129 | _______________GherkinLike_2_______________, KC_1, KC_2, KC_3, |
| 85 | TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3, | 130 | _______________GherkinLike_3_______________, KC_0, KC_0, KC_DOT |
| 86 | KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT | ||
| 87 | ), | 131 | ), |
| 88 | #endif | 132 | #endif |
| 89 | /* QWERTY 75 | 133 | /* QWERTY |
| 90 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 134 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 91 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| gherkin| | FN | | 135 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN | |
| 92 | * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------| | 136 | * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------| |
| 93 | * | | 7 | 8 | 9 | | 137 | * | | 7 | 8 | 9 | |
| 94 | * | |--------+--------+--------| | 138 | * | |--------+--------+--------| |
| @@ -99,17 +143,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 99 | * | | 0 | 0 | . | | 143 | * | | 0 | 0 | . | |
| 100 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 144 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 101 | */ | 145 | */ |
| 102 | [QW75] = LAYOUT_ortho_5x15_wrapper( | 146 | [_QW] = LAYOUT_75_base_wrapper( |
| 103 | _________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75, | 147 | _______________Qwerty_Row__0_______________, KC_7, KC_8, KC_9, |
| 104 | _______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9, | 148 | _______________Qwerty_Row__1_______________, KC_4, KC_5, KC_6, |
| 105 | _______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6, | 149 | _______________Qwerty_Row__2_______________, KC_1, KC_2, KC_3, |
| 106 | _______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3, | 150 | _______________Qwerty_Row__3_______________, KC_0, KC_0, KC_DOT |
| 107 | KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, SUBTER75, KC_LSFT, KC_SPC, SUPRA75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT | ||
| 108 | ), | 151 | ), |
| 109 | 152 | ||
| 110 | /* SUBTER75 | 153 | /* SUBTER |
| 111 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 154 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 112 | * | SUBTER ROW 0 LAYOUT | | | | | 155 | * | | | | | | | | | | | | | | | | |
| 113 | * |-----------------------------------------------------------------------------------------------------------+--------+-----------------| | 156 | * |-----------------------------------------------------------------------------------------------------------+--------+-----------------| |
| 114 | * | | / | * | - | | 157 | * | | / | * | - | |
| 115 | * | |--------+--------+--------| | 158 | * | |--------+--------+--------| |
| @@ -120,15 +163,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 120 | * | | | | | | 163 | * | | | | | |
| 121 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 164 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 122 | */ | 165 | */ |
| 123 | [SUB75] = LAYOUT_ortho_5x15_wrapper( | 166 | [SUB] = LAYOUT_75_base_wrapper( |
| 124 | _______________SUBTER_Row__0_______________, _______, _______, _______, | ||
| 125 | _______________SUBTER_Row__0_______________, KC_PSLS, KC_PAST, KC_PMNS, | 167 | _______________SUBTER_Row__0_______________, KC_PSLS, KC_PAST, KC_PMNS, |
| 126 | _______________SUBTER_Row__1_______________, _______, _______, KC_PPLS, | 168 | _______________SUBTER_Row__1_______________, _______, _______, KC_PPLS, |
| 127 | _______________SUBTER_Row__2_______________, _______, _______, KC_PENT, | 169 | _______________SUBTER_Row__2_______________, _______, _______, KC_PENT, |
| 128 | _______, _______, GHERKIN75, _______, _______, _______, KC_ENT, KC_LSFT, _______, _______, _______, _______, _______, _______, _______ | 170 | _______________SUBTER_Row__3_______________, _______, _______, _______ |
| 129 | ), | 171 | ), |
| 130 | 172 | ||
| 131 | /* SUPRA75 | 173 | /* SUPRA |
| 132 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 174 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 133 | * | | | | | | | | | | | | | | | | | 175 | * | | | | | | | | | | | | | | | | |
| 134 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | 176 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| @@ -141,15 +183,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 141 | * | | | | | | 183 | * | | | | | |
| 142 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 184 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 143 | */ | 185 | */ |
| 144 | [SUP75] = LAYOUT_ortho_5x15_wrapper( | 186 | [SUP] = LAYOUT_75_base_wrapper( |
| 145 | _________________BLANK_75__________________, | ||
| 146 | ________________SUPRA_Row_0________________, _______, _______, _______, | 187 | ________________SUPRA_Row_0________________, _______, _______, _______, |
| 147 | ________________SUPRA_Row_1________________, _______, _______, _______, | 188 | ________________SUPRA_Row_1________________, _______, _______, _______, |
| 148 | ________________SUPRA_Row_2________________, _______, _______, _______, | 189 | ________________SUPRA_Row_2________________, _______, _______, _______, |
| 149 | _________________BLANK_75__________________ | 190 | ________________SUPRA_Row_3________________, _______, _______, _______ |
| 150 | ), | 191 | ), |
| 151 | 192 | ||
| 152 | /* Gherkin 75 Numbers | 193 | /* Gherkin Numbers |
| 153 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 194 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 154 | * | | | | | | | | | | | | | | | | | 195 | * | | | | | | | | | | | | | | | | |
| 155 | * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| | 196 | * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| |
| @@ -162,15 +203,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 162 | * | | | | | | 203 | * | | | | | |
| 163 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 204 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 164 | */ | 205 | */ |
| 165 | [NUM75] = LAYOUT_ortho_5x15_wrapper( | 206 | [NUM] = LAYOUT_75_base_wrapper( |
| 166 | _________________BLANK_75__________________, | ||
| 167 | _______________NUMBERS_Row_0_______________, KC_PSLS, KC_PAST, KC_PMNS, | 207 | _______________NUMBERS_Row_0_______________, KC_PSLS, KC_PAST, KC_PMNS, |
| 168 | _______________NUMBERS_Row_1_______________, _______, _______, KC_PPLS, | 208 | _______________NUMBERS_Row_1_______________, _______, _______, KC_PPLS, |
| 169 | _______________NUMBERS_Row_2_______________, _______, _______, KC_PENT, | 209 | _______________NUMBERS_Row_2_______________, _______, _______, KC_PENT, |
| 170 | _______________NUMBERS_Row_3_______________, _______, _______, _______ | 210 | _______________NUMBERS_Row_3_______________, _______, _______, _______ |
| 171 | ), | 211 | ), |
| 172 | 212 | ||
| 173 | /* Gherkin 75 Et Cetera | 213 | /* Gherkin Et Cetera |
| 174 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 214 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 175 | * | | | | | | | | | | | | | | | | | 215 | * | | | | | | | | | | | | | | | | |
| 176 | * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| | 216 | * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| |
| @@ -183,15 +223,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 183 | * | | | | | | 223 | * | | | | | |
| 184 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 224 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 185 | */ | 225 | */ |
| 186 | [ETC75] = LAYOUT_ortho_5x15_wrapper( | 226 | [ETC] = LAYOUT_75_base_wrapper( |
| 187 | _________________BLANK_75__________________, | ||
| 188 | ______________ETCETERA_Row__0______________, _______, _______, _______, | 227 | ______________ETCETERA_Row__0______________, _______, _______, _______, |
| 189 | ______________ETCETERA_Row__1______________, _______, _______, _______, | 228 | ______________ETCETERA_Row__1______________, _______, _______, _______, |
| 190 | ______________ETCETERA_Row__2______________, _______, _______, _______, | 229 | ______________ETCETERA_Row__2______________, _______, _______, _______, |
| 191 | ______________ETCETERA_Row__3______________, _______, _______, _______ | 230 | ______________ETCETERA_Row__3______________, _______, _______, _______ |
| 192 | ), | 231 | ), |
| 193 | 232 | ||
| 194 | /* Gherkin 75 Directional Keys | 233 | /* Gherkin Directional Keys |
| 195 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 234 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 196 | * | | | | | | | | | | | | | | | | | 235 | * | | | | | | | | | | | | | | | | |
| 197 | * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| | 236 | * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| |
| @@ -204,16 +243,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 204 | * | | | | | | 243 | * | | | | | |
| 205 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 244 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 206 | */ | 245 | */ |
| 207 | [DIR75] = LAYOUT_ortho_5x15_wrapper( | 246 | [DIR] = LAYOUT_75_base_wrapper( |
| 208 | _________________BLANK_75__________________, | ||
| 209 | _____________DIRECTIONS_Row__0_____________, _______, _______, _______, | 247 | _____________DIRECTIONS_Row__0_____________, _______, _______, _______, |
| 210 | _____________DIRECTIONS_Row__1_____________, _______, _______, _______, | 248 | _____________DIRECTIONS_Row__1_____________, _______, _______, _______, |
| 211 | _____________DIRECTIONS_Row__2_____________, _______, _______, _______, | 249 | _____________DIRECTIONS_Row__2_____________, _______, _______, _______, |
| 212 | _______, _______, QWERTY75, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 250 | _____________DIRECTIONS_Row__3_____________, _______, _______, _______ |
| 213 | ), | 251 | ), |
| 214 | 252 | ||
| 215 | 253 | ||
| 216 | /* FUNCTION 75 | 254 | /* FUNCTION |
| 217 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 255 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| 218 | * | | | | | | | | | | | | | | | | | 256 | * | | | | | | | | | | | | | | | | |
| 219 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | 257 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| @@ -226,9 +264,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 226 | * | | | | | | | MS BT1 | | | | | | MOUS L | MOUS D | MOUS R | | 264 | * | | | | | | | MS BT1 | | | | | | MOUS L | MOUS D | MOUS R | |
| 227 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 265 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 228 | */ | 266 | */ |
| 229 | [FN75] = LAYOUT_ortho_5x15_wrapper( | 267 | [_FN] = LAYOUT_75_base_wrapper( |
| 230 | _________________BLANK_75__________________, | 268 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 231 | _________________BLANK_75__________________, | ||
| 232 | KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U, | 269 | KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U, |
| 233 | RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC, BL_DEC, _______, _______, KC_MS_U, KC_WH_D, | 270 | RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC, BL_DEC, _______, _______, KC_MS_U, KC_WH_D, |
| 234 | _______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R | 271 | _______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R |
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk index c6569594b..b069cd8d3 100644 --- a/users/wanleg/rules.mk +++ b/users/wanleg/rules.mk | |||
| @@ -27,4 +27,13 @@ ifeq ($(strip $(BT)), yes) | |||
| 27 | CONSOLE_ENABLE = no # Console for debug(+400) | 27 | CONSOLE_ENABLE = no # Console for debug(+400) |
| 28 | COMMAND_ENABLE = no # Commands for debug and configuration | 28 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 29 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 29 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 30 | endif | ||
| 31 | |||
| 32 | #move numpad to Left/Centre/Right(default) on 5x15 boards | ||
| 33 | #example usage: make 4x4:wanleg padc=yes | ||
| 34 | ifeq ($(strip $(padc)), yes) | ||
| 35 | OPT_DEFS += -DPADC | ||
| 36 | endif | ||
| 37 | ifeq ($(strip $(padl)), yes) | ||
| 38 | OPT_DEFS += -DPADL | ||
| 30 | endif \ No newline at end of file | 39 | endif \ No newline at end of file |
diff --git a/users/wanleg/tapdances.c b/users/wanleg/tapdances.c index e5051f9ee..1be5636dc 100644 --- a/users/wanleg/tapdances.c +++ b/users/wanleg/tapdances.c | |||
| @@ -168,7 +168,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) { | |||
| 168 | LYR75tap_state.state = cur_dance(state); | 168 | LYR75tap_state.state = cur_dance(state); |
| 169 | switch (LYR75tap_state.state) { | 169 | switch (LYR75tap_state.state) { |
| 170 | case SINGLE_TAP: register_code(KC_PSLS); break; | 170 | case SINGLE_TAP: register_code(KC_PSLS); break; |
| 171 | case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break; | 171 | case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break; |
| 172 | case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS); | 172 | case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS); |
| 173 | } | 173 | } |
| 174 | } | 174 | } |
| @@ -176,7 +176,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) { | |||
| 176 | void LYR75_reset (qk_tap_dance_state_t *state, void *user_data) { | 176 | void LYR75_reset (qk_tap_dance_state_t *state, void *user_data) { |
| 177 | switch (LYR75tap_state.state) { | 177 | switch (LYR75tap_state.state) { |
| 178 | case SINGLE_TAP: unregister_code(KC_PSLS); break; | 178 | case SINGLE_TAP: unregister_code(KC_PSLS); break; |
| 179 | case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break; | 179 | case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break; |
| 180 | case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS); | 180 | case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS); |
| 181 | } | 181 | } |
| 182 | LYR75tap_state.state = 0; | 182 | LYR75tap_state.state = 0; |
diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c index 4e60c422f..274c74f72 100644 --- a/users/wanleg/wanleg.c +++ b/users/wanleg/wanleg.c | |||
| @@ -29,18 +29,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 29 | } | 29 | } |
| 30 | return false; | 30 | return false; |
| 31 | break; | 31 | break; |
| 32 | case QWERTY75: | ||
| 33 | if (record->event.pressed) { | ||
| 34 | set_single_persistent_default_layer(QW75); | ||
| 35 | } | ||
| 36 | return false; | ||
| 37 | break; | ||
| 38 | case GHERKIN75: | ||
| 39 | if (record->event.pressed) { | ||
| 40 | set_single_persistent_default_layer(GK75); | ||
| 41 | } | ||
| 42 | return false; | ||
| 43 | break; | ||
| 44 | case NUMPAD: | 32 | case NUMPAD: |
| 45 | if (record->event.pressed) { | 33 | if (record->event.pressed) { |
| 46 | set_single_persistent_default_layer(PAD); | 34 | set_single_persistent_default_layer(PAD); |
| @@ -117,51 +105,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 117 | } | 105 | } |
| 118 | return false; | 106 | return false; |
| 119 | break; | 107 | break; |
| 120 | case SUBTER75: | 108 | case FUNCTION: |
| 121 | if (record->event.pressed) { | ||
| 122 | layer_on(SUB75); | ||
| 123 | } else { | ||
| 124 | layer_off(SUB75); | ||
| 125 | } | ||
| 126 | return false; | ||
| 127 | break; | ||
| 128 | case SUPRA75: | ||
| 129 | if (record->event.pressed) { | ||
| 130 | layer_on(SUP75); | ||
| 131 | } else { | ||
| 132 | layer_off(SUP75); | ||
| 133 | } | ||
| 134 | return false; | ||
| 135 | break; | ||
| 136 | case NUMBER75: | ||
| 137 | if (record->event.pressed) { | ||
| 138 | layer_on(NUM75); | ||
| 139 | } else { | ||
| 140 | layer_off(NUM75); | ||
| 141 | } | ||
| 142 | return false; | ||
| 143 | break; | ||
| 144 | case DIRECTION75: | ||
| 145 | if (record->event.pressed) { | ||
| 146 | layer_on(DIR75); | ||
| 147 | } else { | ||
| 148 | layer_off(DIR75); | ||
| 149 | } | ||
| 150 | return false; | ||
| 151 | break; | ||
| 152 | case ETCETERA75: | ||
| 153 | if (record->event.pressed) { | ||
| 154 | layer_on(ETC75); | ||
| 155 | } else { | ||
| 156 | layer_off(ETC75); | ||
| 157 | } | ||
| 158 | return false; | ||
| 159 | break; | ||
| 160 | case FUNCTION75: | ||
| 161 | if (record->event.pressed) { | 109 | if (record->event.pressed) { |
| 162 | layer_on(FN75); | 110 | layer_on(_FN); |
| 163 | } else { | 111 | } else { |
| 164 | layer_off(FN75); | 112 | layer_off(_FN); |
| 165 | } | 113 | } |
| 166 | return false; | 114 | return false; |
| 167 | break; | 115 | break; |
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h index c2644cd6c..9d07760a7 100644 --- a/users/wanleg/wanleg.h +++ b/users/wanleg/wanleg.h | |||
| @@ -11,72 +11,33 @@ enum userspace_layers { | |||
| 11 | gETC, | 11 | gETC, |
| 12 | _GK, | 12 | _GK, |
| 13 | _QW, | 13 | _QW, |
| 14 | QW75, | ||
| 15 | GK75, | ||
| 16 | ONE, | 14 | ONE, |
| 17 | SUB, | 15 | SUB, |
| 18 | SUP, | 16 | SUP, |
| 19 | NUM, | 17 | NUM, |
| 20 | DIR, | 18 | DIR, |
| 21 | ETC, | 19 | ETC, |
| 22 | SUB75, | 20 | _FN, |
| 23 | SUP75, | ||
| 24 | NUM75, | ||
| 25 | DIR75, | ||
| 26 | ETC75, | ||
| 27 | FN75, | ||
| 28 | PAD, | 21 | PAD, |
| 29 | GK50, | 22 | GK50, |
| 30 | }; | 23 | }; |
| 31 | #elif KEYBOARD_xd75 | 24 | #elif KEYBOARD_40percentclub_5x5 |
| 32 | enum userspace_layers { | 25 | enum userspace_layers { |
| 33 | GK75 = 0, | 26 | GK50 = 0, |
| 34 | QW75, | ||
| 35 | SUB75, | ||
| 36 | SUP75, | ||
| 37 | NUM75, | ||
| 38 | DIR75, | ||
| 39 | ETC75, | ||
| 40 | FN75, | ||
| 41 | gGK, | ||
| 42 | _GK, | 27 | _GK, |
| 43 | _QW, | 28 | _QW, |
| 44 | PAD, | 29 | PAD, |
| 45 | ONE, | ||
| 46 | SUB, | ||
| 47 | SUP, | ||
| 48 | NUM, | ||
| 49 | DIR, | ||
| 50 | ETC, | ||
| 51 | gNUM, | ||
| 52 | gDIR, | ||
| 53 | gETC, | ||
| 54 | GK50, | ||
| 55 | }; | ||
| 56 | #elif KEYBOARD_40percentclub_5x5 | ||
| 57 | enum userspace_layers { | ||
| 58 | GK50 = 0, | ||
| 59 | gNUM, | 30 | gNUM, |
| 60 | gDIR, | 31 | gDIR, |
| 61 | gETC, | 32 | gETC, |
| 62 | GK75, | ||
| 63 | QW75, | ||
| 64 | SUB75, | ||
| 65 | SUP75, | ||
| 66 | NUM75, | ||
| 67 | DIR75, | ||
| 68 | ETC75, | ||
| 69 | FN75, | ||
| 70 | PAD, | ||
| 71 | gGK, | 33 | gGK, |
| 72 | _GK, | ||
| 73 | _QW, | ||
| 74 | ONE, | 34 | ONE, |
| 75 | SUB, | 35 | SUB, |
| 76 | SUP, | 36 | SUP, |
| 77 | NUM, | 37 | NUM, |
| 78 | DIR, | 38 | DIR, |
| 79 | ETC, | 39 | ETC, |
| 40 | _FN, | ||
| 80 | }; | 41 | }; |
| 81 | #else | 42 | #else |
| 82 | enum userspace_layers { | 43 | enum userspace_layers { |
| @@ -93,14 +54,7 @@ enum userspace_layers { | |||
| 93 | gNUM, | 54 | gNUM, |
| 94 | gDIR, | 55 | gDIR, |
| 95 | gETC, | 56 | gETC, |
| 96 | QW75, | 57 | _FN, |
| 97 | GK75, | ||
| 98 | SUB75, | ||
| 99 | SUP75, | ||
| 100 | NUM75, | ||
| 101 | DIR75, | ||
| 102 | ETC75, | ||
| 103 | FN75, | ||
| 104 | GK50, | 58 | GK50, |
| 105 | }; | 59 | }; |
| 106 | #endif | 60 | #endif |
| @@ -109,8 +63,6 @@ enum userspace_custom_keycodes { | |||
| 109 | gGHERKIN = SAFE_RANGE, | 63 | gGHERKIN = SAFE_RANGE, |
| 110 | GHERKIN, | 64 | GHERKIN, |
| 111 | QWERTY, | 65 | QWERTY, |
| 112 | QWERTY75, | ||
| 113 | GHERKIN75, | ||
| 114 | ONEHAND, | 66 | ONEHAND, |
| 115 | SUBTER, | 67 | SUBTER, |
| 116 | SUPRA, | 68 | SUPRA, |
| @@ -120,12 +72,7 @@ enum userspace_custom_keycodes { | |||
| 120 | gNUMBER, | 72 | gNUMBER, |
| 121 | gDIRECTION, | 73 | gDIRECTION, |
| 122 | gETCETERA, | 74 | gETCETERA, |
| 123 | SUBTER75, | 75 | FUNCTION, |
| 124 | SUPRA75, | ||
| 125 | NUMBER75, | ||
| 126 | DIRECTION75, | ||
| 127 | ETCETERA75, | ||
| 128 | FUNCTION75, | ||
| 129 | NUMPAD, | 76 | NUMPAD, |
| 130 | GHERKIN50, | 77 | GHERKIN50, |
| 131 | 78 | ||
| @@ -215,14 +162,14 @@ enum { | |||
| 215 | 162 | ||
| 216 | /* Et Cetera | 163 | /* Et Cetera |
| 217 | * .-----------------------------------------------------------------------------------------. | 164 | * .-----------------------------------------------------------------------------------------. |
| 218 | * | ` | mUP | | | RESET | SHIFT | mScrUp | mScrDn | | \ | | 165 | * | ` | mUP | | | RESET | SHIFT | mScrDn | mScrUp | | \ | |
| 219 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | 166 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |
| 220 | * | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' | | 167 | * | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' | |
| 221 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | 168 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |
| 222 | * | Sft//Cp| CAPS | | | | C-A-D | mScrL | mScrR | ALT | DEL | | 169 | * | Sft//Cp| CAPS | | | | C-A-D | mScrL | mScrR | ALT | DEL | |
| 223 | * '-----------------------------------------------------------------------------------------' | 170 | * '-----------------------------------------------------------------------------------------' |
| 224 | */ | 171 | */ |
| 225 | #define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,_______, RESET, KC_RSFT, KC_WH_U, KC_WH_D, _______, KC_BSLS | 172 | #define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,_______, RESET, KC_RSFT, KC_WH_D, KC_WH_U, _______, KC_BSLS |
| 226 | #define _______________Gherkin_ETC_1_______________ KC_MS_L, KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT | 173 | #define _______________Gherkin_ETC_1_______________ KC_MS_L, KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT |
| 227 | #define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL | 174 | #define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL |
| 228 | 175 | ||
