1
0
Fork 0

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:
wanleg 2018-12-30 07:53:02 -08:00 committed by Drashna Jaelre
parent cc7bf108a9
commit c043edd138
5 changed files with 110 additions and 169 deletions

View file

@ -27,4 +27,13 @@ ifeq ($(strip $(BT)), yes)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
endif
#move numpad to Left/Centre/Right(default) on 5x15 boards
#example usage: make 4x4:wanleg padc=yes
ifeq ($(strip $(padc)), yes)
OPT_DEFS += -DPADC
endif
ifeq ($(strip $(padl)), yes)
OPT_DEFS += -DPADL
endif

View file

@ -168,7 +168,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) {
LYR75tap_state.state = cur_dance(state);
switch (LYR75tap_state.state) {
case SINGLE_TAP: register_code(KC_PSLS); break;
case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break;
case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break;
case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS);
}
}
@ -176,7 +176,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) {
void LYR75_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (LYR75tap_state.state) {
case SINGLE_TAP: unregister_code(KC_PSLS); break;
case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break;
case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break;
case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS);
}
LYR75tap_state.state = 0;

View file

@ -29,18 +29,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
case QWERTY75:
if (record->event.pressed) {
set_single_persistent_default_layer(QW75);
}
return false;
break;
case GHERKIN75:
if (record->event.pressed) {
set_single_persistent_default_layer(GK75);
}
return false;
break;
case NUMPAD:
if (record->event.pressed) {
set_single_persistent_default_layer(PAD);
@ -117,51 +105,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
case SUBTER75:
case FUNCTION:
if (record->event.pressed) {
layer_on(SUB75);
layer_on(_FN);
} else {
layer_off(SUB75);
}
return false;
break;
case SUPRA75:
if (record->event.pressed) {
layer_on(SUP75);
} else {
layer_off(SUP75);
}
return false;
break;
case NUMBER75:
if (record->event.pressed) {
layer_on(NUM75);
} else {
layer_off(NUM75);
}
return false;
break;
case DIRECTION75:
if (record->event.pressed) {
layer_on(DIR75);
} else {
layer_off(DIR75);
}
return false;
break;
case ETCETERA75:
if (record->event.pressed) {
layer_on(ETC75);
} else {
layer_off(ETC75);
}
return false;
break;
case FUNCTION75:
if (record->event.pressed) {
layer_on(FN75);
} else {
layer_off(FN75);
layer_off(_FN);
}
return false;
break;

View file

@ -11,72 +11,33 @@ enum userspace_layers {
gETC,
_GK,
_QW,
QW75,
GK75,
ONE,
SUB,
SUP,
NUM,
DIR,
ETC,
SUB75,
SUP75,
NUM75,
DIR75,
ETC75,
FN75,
_FN,
PAD,
GK50,
};
#elif KEYBOARD_xd75
enum userspace_layers {
GK75 = 0,
QW75,
SUB75,
SUP75,
NUM75,
DIR75,
ETC75,
FN75,
gGK,
_GK,
_QW,
PAD,
ONE,
SUB,
SUP,
NUM,
DIR,
ETC,
gNUM,
gDIR,
gETC,
GK50,
};
#elif KEYBOARD_40percentclub_5x5
enum userspace_layers {
GK50 = 0,
_GK,
_QW,
PAD,
gNUM,
gDIR,
gETC,
GK75,
QW75,
SUB75,
SUP75,
NUM75,
DIR75,
ETC75,
FN75,
PAD,
gGK,
_GK,
_QW,
ONE,
SUB,
SUP,
NUM,
DIR,
ETC,
_FN,
};
#else
enum userspace_layers {
@ -93,14 +54,7 @@ enum userspace_layers {
gNUM,
gDIR,
gETC,
QW75,
GK75,
SUB75,
SUP75,
NUM75,
DIR75,
ETC75,
FN75,
_FN,
GK50,
};
#endif
@ -109,8 +63,6 @@ enum userspace_custom_keycodes {
gGHERKIN = SAFE_RANGE,
GHERKIN,
QWERTY,
QWERTY75,
GHERKIN75,
ONEHAND,
SUBTER,
SUPRA,
@ -120,12 +72,7 @@ enum userspace_custom_keycodes {
gNUMBER,
gDIRECTION,
gETCETERA,
SUBTER75,
SUPRA75,
NUMBER75,
DIRECTION75,
ETCETERA75,
FUNCTION75,
FUNCTION,
NUMPAD,
GHERKIN50,
@ -215,14 +162,14 @@ enum {
/* Et Cetera
* .-----------------------------------------------------------------------------------------.
* | ` | mUP | | | RESET | SHIFT | mScrUp | mScrDn | | \ |
* | ` | mUP | | | RESET | SHIFT | mScrDn | mScrUp | | \ |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
* | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
* | Sft//Cp| CAPS | | | | C-A-D | mScrL | mScrR | ALT | DEL |
* '-----------------------------------------------------------------------------------------'
*/
#define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,_______, RESET, KC_RSFT, KC_WH_U, KC_WH_D, _______, KC_BSLS
#define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,_______, RESET, KC_RSFT, KC_WH_D, KC_WH_U, _______, KC_BSLS
#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
#define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL