diff options
| author | wanleg <32079073+wanleg@users.noreply.github.com> | 2019-05-02 05:29:00 +0200 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-02 05:29:00 +0200 |
| commit | 588b2329cbe3b521475c62d5641c713430d8f188 (patch) | |
| tree | 55b08b3d8dc4af083a5c6d276e33458798ab4bc0 /layouts/community/ortho_4x12 | |
| parent | 6fa88d981c237f19839b2cc4ca4a0d44f84d2043 (diff) | |
| download | qmk_firmware-588b2329cbe3b521475c62d5641c713430d8f188.tar.gz qmk_firmware-588b2329cbe3b521475c62d5641c713430d8f188.tar.xz | |
Wanleg tuneup / additions (#5752)
* change split keyboard tapping term in userspace
* fix 5x15 layout numpad movement
* minor changes for Nori setup
* edit based on 40percentclub refactor change
* fix gherkin due to refactor
* kbd6x wanleg keymap
* kbd6x edits
* kbd6x tweak
* fn / backlight layer
* fix jj40 rgb hex issue
* wanleg gherkin lighting
* 4x12 layout cleanup
* move kbd6x to new kbdfans directory
* minor edit related to new kbdfans directory
* mac layout for kbd6x
* gherkin flip option
* tweak tapping term on lets_split
* edit for keebio board coalescing
* update user readme with git hints
* wanleg miniaxe keymap
* testing Permissive Hold instead of Mod Tap Interrupt
* wiring names
* kbd6x keymap
* change default backlight behaviour on kbd6x
* userspace underglow
* userspace underglow
* underglow tweaks
* user readme update
* more layer underglow tweaks
* fix userspace for non-underglow-enabled boards
* readme edits
* readme edits
* readme edits
* readme edits
* Update readme.md
* Update readme.md
* readme edits
* readme edits
* update keymap picture
Diffstat (limited to 'layouts/community/ortho_4x12')
| -rw-r--r-- | layouts/community/ortho_4x12/wanleg/config.h | 7 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/wanleg/keymap.c | 17 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/wanleg/rules.mk | 5 |
3 files changed, 20 insertions, 9 deletions
diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h index f7650ddd3..bcf2756f6 100644 --- a/layouts/community/ortho_4x12/wanleg/config.h +++ b/layouts/community/ortho_4x12/wanleg/config.h @@ -20,6 +20,13 @@ #define EE_HANDS #endif +// set top left key as bootloader mode escape key on Nori +#if defined(KEYBOARD_40percentclub_nori) +#define QMK_LED B0 +#define QMK_ESC_OUTPUT F4 // usually COL +#define QMK_ESC_INPUT D3 // usually ROW +#endif + // set top left key as bootloader mode escape key on 4x4 48key layout #if defined(KEYBOARD_40percentclub_4x4) && !defined(PRO_MICRO) #define QMK_LED B0 diff --git a/layouts/community/ortho_4x12/wanleg/keymap.c b/layouts/community/ortho_4x12/wanleg/keymap.c index 23e794dc4..bcf6671ae 100644 --- a/layouts/community/ortho_4x12/wanleg/keymap.c +++ b/layouts/community/ortho_4x12/wanleg/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _____________DIRECTIONS_Row__2_____________, _______, _______, ONEHAND, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -#elif defined(KEYBOARD_40percentclub_4x4) +#elif defined(KEYBOARD_40percentclub_4x4) || defined(KEYBOARD_40percentclub_nori) [_GK] = LAYOUT_ortho_4x12_wrapper( _______________GherkinLike_0_______________, _______________GherkinLike_1_______________, @@ -36,14 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______________NUMPAD_Row__3_______________ ), -#elif defined(KEYBOARD_jj40) -[_GK] = LAYOUT_ortho_4x12_wrapper( - _______________GherkinLike_0_______________, - _______________GherkinLike_1_______________, - _______________GherkinLike_2_______________, - TD(RST_TAP_DANCE), BL_TOGG, BL_STEP, BL_BRTG, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL -), - #else [_GK] = LAYOUT_ortho_4x12_wrapper( _______________GherkinLike_0_______________, @@ -94,4 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________ETCETERA_Row__3______________ ), +[_FN] = LAYOUT_ortho_4x12_wrapper( + _______, _______________Gherkin_FN_0________________, _______, + _______, _______________Gherkin_FN_0________________, _______, + _______, _______________Gherkin_FN_0________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +), + }; diff --git a/layouts/community/ortho_4x12/wanleg/rules.mk b/layouts/community/ortho_4x12/wanleg/rules.mk index e8277610b..0b3917e98 100644 --- a/layouts/community/ortho_4x12/wanleg/rules.mk +++ b/layouts/community/ortho_4x12/wanleg/rules.mk @@ -7,4 +7,9 @@ endif ifeq ($(strip $(KEYBOARD)), planck/rev6) AUDIO_ENABLE = yes +endif + +#disable RGB on version 1 of jj40 keyboard (does not exist) +ifeq ($(strip $(KEYBOARD)), jj40) + RGBLIGHT_ENABLE = no endif
\ No newline at end of file |