Keymap: Wanleg 5x5 Keymap changes (#4738)
* config fixes (including for issue #3678) * put back audio * jj40 backlighting setup * jj40 backlighting setup * rules.mk fix * jj40 backlighting settings * iris setup * iris setup * iris setup * iris setup * iris setup - onehand * remove commented-out section * edits due to #4403 * xd75 testing * fix 5x15 layout issues with 5x5 bluetooth & xd75 * commenting out unused placeholders * change iris to more wanleg-like 4x12 layout * formatting changes * onehand layout cleanup/fix * revert temp change * create centre numpad option * 1st working version * change keypad numbers to regular numbers - doesn't work otherwise * adding comparison files, no change to core * fixed 5x5 with cleave * fixed 5x5 with cleave * switch mouse scroll buttons * clean up left/right/centre pad placement in 5x15 layouts * minor comment change * Update layouts/community/ortho_5x15/wanleg/keymap.c Co-Authored-By: wanleg <32079073+wanleg@users.noreply.github.com> * Update layouts/community/ortho_5x15/wanleg/keymap.c Co-Authored-By: wanleg <32079073+wanleg@users.noreply.github.com> * Update layouts/community/ortho_5x15/wanleg/keymap.c Co-Authored-By: wanleg <32079073+wanleg@users.noreply.github.com> * revert to original
This commit is contained in:
parent
cc7bf108a9
commit
c043edd138
5 changed files with 110 additions and 169 deletions
|
@ -1,26 +1,71 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include "wanleg.h"
|
||||
|
||||
#define _________________BLANK_75__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
#define _________________BLANK_50__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
#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
|
||||
|
||||
#if defined(PADC)
|
||||
#define LAYOUT_75_base( \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
|
||||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
|
||||
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
|
||||
) \
|
||||
LAYOUT_ortho_5x15_wrapper( \
|
||||
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, \
|
||||
K00, K01, K02, K03, K04, K05, K0c, K0d, K0e, K06, K07, K08, K09, K0a, K0b, \
|
||||
K10, K11, K12, K13, K14, K15, K1c, K1d, K1e, K16, K17, K18, K19, K1a, K1b, \
|
||||
K20, K21, K22, K23, K24, K25, K2c, K2d, K2e, K26, K27, K28, K29, K2a, K2b, \
|
||||
K30, K31, K32, K33, K34, K35, K3c, K3d, K3e, K36, K37, K38, K39, K3a, K3b \
|
||||
)
|
||||
|
||||
#elif defined(PADL)
|
||||
#define LAYOUT_75_base( \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
|
||||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
|
||||
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
|
||||
) \
|
||||
LAYOUT_ortho_5x15_wrapper( \
|
||||
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, \
|
||||
K0c, K0d, K0e, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
|
||||
K1c, K1d, K1e, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
|
||||
K2c, K2d, K2e, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
|
||||
K3c, K3d, K3e, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b \
|
||||
)
|
||||
|
||||
#else
|
||||
#define LAYOUT_75_base( \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
|
||||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
|
||||
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
|
||||
) \
|
||||
LAYOUT_ortho_5x15_wrapper( \
|
||||
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, \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
|
||||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
|
||||
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
|
||||
)
|
||||
#endif
|
||||
|
||||
#define LAYOUT_75_base_wrapper(...) LAYOUT_75_base(__VA_ARGS__)
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
#if defined(KEYBOARD_40percentclub_5x5)
|
||||
[GK75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
|
||||
_______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
|
||||
_______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
|
||||
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,
|
||||
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
|
||||
[_GK] = LAYOUT_75_base_wrapper(
|
||||
_______________GherkinLike_0_______________, KC_7, KC_8, KC_9,
|
||||
_______________GherkinLike_1_______________, KC_4, KC_5, KC_6,
|
||||
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,
|
||||
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
|
||||
),
|
||||
|
||||
[GK50] = LAYOUT_ortho_5x10_wrapper(
|
||||
KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,
|
||||
KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,
|
||||
_______________Gherkin_Row_0_______________,
|
||||
_______________Gherkin_Row_1_______________,
|
||||
_______________Gherkin_Row_2_______________,
|
||||
TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
|
||||
TD(RST_TAP_DANCE), GHERKIN, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
|
||||
),
|
||||
|
||||
[gNUM] = LAYOUT_ortho_5x10_wrapper(
|
||||
|
@ -65,9 +110,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
#endif
|
||||
#else
|
||||
/* Gherkin 75
|
||||
/* Gherkin
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | | FN |
|
||||
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN |
|
||||
* |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
|
||||
* | | 7 | 8 | 9 |
|
||||
* | |--------+--------+--------|
|
||||
|
@ -78,17 +123,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | 0 | 0 | . |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[GK75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
|
||||
_______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
|
||||
_______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
|
||||
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,
|
||||
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
|
||||
[_GK] = LAYOUT_75_base_wrapper(
|
||||
_______________GherkinLike_0_______________, KC_7, KC_8, KC_9,
|
||||
_______________GherkinLike_1_______________, KC_4, KC_5, KC_6,
|
||||
_______________GherkinLike_2_______________, KC_1, KC_2, KC_3,
|
||||
_______________GherkinLike_3_______________, KC_0, KC_0, KC_DOT
|
||||
),
|
||||
#endif
|
||||
/* QWERTY 75
|
||||
/* QWERTY
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| gherkin| | FN |
|
||||
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN |
|
||||
* |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
|
||||
* | | 7 | 8 | 9 |
|
||||
* | |--------+--------+--------|
|
||||
|
@ -99,17 +143,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | 0 | 0 | . |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[QW75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75,
|
||||
_______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
|
||||
_______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
|
||||
_______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3,
|
||||
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
|
||||
[_QW] = LAYOUT_75_base_wrapper(
|
||||
_______________Qwerty_Row__0_______________, KC_7, KC_8, KC_9,
|
||||
_______________Qwerty_Row__1_______________, KC_4, KC_5, KC_6,
|
||||
_______________Qwerty_Row__2_______________, KC_1, KC_2, KC_3,
|
||||
_______________Qwerty_Row__3_______________, KC_0, KC_0, KC_DOT
|
||||
),
|
||||
|
||||
/* SUBTER75
|
||||
/* SUBTER
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | SUBTER ROW 0 LAYOUT | | | |
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |-----------------------------------------------------------------------------------------------------------+--------+-----------------|
|
||||
* | | / | * | - |
|
||||
* | |--------+--------+--------|
|
||||
|
@ -120,15 +163,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[SUB75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_______________SUBTER_Row__0_______________, _______, _______, _______,
|
||||
[SUB] = LAYOUT_75_base_wrapper(
|
||||
_______________SUBTER_Row__0_______________, KC_PSLS, KC_PAST, KC_PMNS,
|
||||
_______________SUBTER_Row__1_______________, _______, _______, KC_PPLS,
|
||||
_______________SUBTER_Row__1_______________, _______, _______, KC_PPLS,
|
||||
_______________SUBTER_Row__2_______________, _______, _______, KC_PENT,
|
||||
_______, _______, GHERKIN75, _______, _______, _______, KC_ENT, KC_LSFT, _______, _______, _______, _______, _______, _______, _______
|
||||
_______________SUBTER_Row__3_______________, _______, _______, _______
|
||||
),
|
||||
|
||||
/* SUPRA75
|
||||
/* SUPRA
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
|
||||
|
@ -141,15 +183,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[SUP75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________BLANK_75__________________,
|
||||
[SUP] = LAYOUT_75_base_wrapper(
|
||||
________________SUPRA_Row_0________________, _______, _______, _______,
|
||||
________________SUPRA_Row_1________________, _______, _______, _______,
|
||||
________________SUPRA_Row_2________________, _______, _______, _______,
|
||||
_________________BLANK_75__________________
|
||||
________________SUPRA_Row_3________________, _______, _______, _______
|
||||
),
|
||||
|
||||
/* Gherkin 75 Numbers
|
||||
/* Gherkin Numbers
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
|
||||
|
@ -162,15 +203,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[NUM75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________BLANK_75__________________,
|
||||
[NUM] = LAYOUT_75_base_wrapper(
|
||||
_______________NUMBERS_Row_0_______________, KC_PSLS, KC_PAST, KC_PMNS,
|
||||
_______________NUMBERS_Row_1_______________, _______, _______, KC_PPLS,
|
||||
_______________NUMBERS_Row_2_______________, _______, _______, KC_PENT,
|
||||
_______________NUMBERS_Row_3_______________, _______, _______, _______
|
||||
),
|
||||
|
||||
/* Gherkin 75 Et Cetera
|
||||
/* Gherkin Et Cetera
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
|
||||
|
@ -183,15 +223,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[ETC75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________BLANK_75__________________,
|
||||
[ETC] = LAYOUT_75_base_wrapper(
|
||||
______________ETCETERA_Row__0______________, _______, _______, _______,
|
||||
______________ETCETERA_Row__1______________, _______, _______, _______,
|
||||
______________ETCETERA_Row__2______________, _______, _______, _______,
|
||||
______________ETCETERA_Row__3______________, _______, _______, _______
|
||||
),
|
||||
|
||||
/* Gherkin 75 Directional Keys
|
||||
/* Gherkin Directional Keys
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
|
||||
|
@ -204,16 +243,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[DIR75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________BLANK_75__________________,
|
||||
[DIR] = LAYOUT_75_base_wrapper(
|
||||
_____________DIRECTIONS_Row__0_____________, _______, _______, _______,
|
||||
_____________DIRECTIONS_Row__1_____________, _______, _______, _______,
|
||||
_____________DIRECTIONS_Row__2_____________, _______, _______, _______,
|
||||
_______, _______, QWERTY75, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
_____________DIRECTIONS_Row__3_____________, _______, _______, _______
|
||||
),
|
||||
|
||||
|
||||
/* FUNCTION 75
|
||||
/* FUNCTION
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
|
||||
|
@ -226,9 +264,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | | | | MS BT1 | | | | | | MOUS L | MOUS D | MOUS R |
|
||||
* '--------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[FN75] = LAYOUT_ortho_5x15_wrapper(
|
||||
_________________BLANK_75__________________,
|
||||
_________________BLANK_75__________________,
|
||||
[_FN] = LAYOUT_75_base_wrapper(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
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,
|
||||
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,
|
||||
_______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue