diff options
author | wanleg <32079073+wanleg@users.noreply.github.com> | 2019-05-01 20:29:00 -0700 |
---|---|---|
committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-01 20:29:00 -0700 |
commit | 588b2329cbe3b521475c62d5641c713430d8f188 (patch) | |
tree | 55b08b3d8dc4af083a5c6d276e33458798ab4bc0 /layouts/community/ortho_3x10 | |
parent | 6fa88d981c237f19839b2cc4ca4a0d44f84d2043 (diff) |
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_3x10')
-rw-r--r-- | layouts/community/ortho_3x10/wanleg/config.h | 19 | ||||
-rw-r--r-- | layouts/community/ortho_3x10/wanleg/keymap.c | 5 | ||||
-rw-r--r-- | layouts/community/ortho_3x10/wanleg/readme.md | 8 | ||||
-rw-r--r-- | layouts/community/ortho_3x10/wanleg/rules.mk | 2 |
4 files changed, 27 insertions, 7 deletions
diff --git a/layouts/community/ortho_3x10/wanleg/config.h b/layouts/community/ortho_3x10/wanleg/config.h index 6719a4591e..dc22454481 100644 --- a/layouts/community/ortho_3x10/wanleg/config.h +++ b/layouts/community/ortho_3x10/wanleg/config.h @@ -2,8 +2,25 @@ //QMK DFU settings (ProMicro boards) // set top left key as bootloader mode escape key on Gherkin -#if defined(KEYBOARD_gherkin) +#if defined(KEYBOARD_40percentclub_gherkin) && !defined(FLIP) #define QMK_LED B0 #define QMK_ESC_OUTPUT B4 // usually COL #define QMK_ESC_INPUT F7 // usually ROW #endif + +//change gherkin orientation (i.e. move USB port from right side to left side) +#if defined(KEYBOARD_40percentclub_gherkin) && defined(FLIP) +//need to fix QMKdfu setting: +#define QMK_ESC_OUTPUT B6 // usually COL +#define QMK_ESC_INPUT D0 // usually ROW +#define QMK_LED B0 + +//need to undefine standard 4x4 array before defining alternate ProMicro array +#undef MATRIX_ROW_PINS +#undef MATRIX_COL_PINS +//standard config: +//#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } +//#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 } +#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 } +#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4 } +#endif diff --git a/layouts/community/ortho_3x10/wanleg/keymap.c b/layouts/community/ortho_3x10/wanleg/keymap.c index 44be300a41..96d36eb312 100644 --- a/layouts/community/ortho_3x10/wanleg/keymap.c +++ b/layouts/community/ortho_3x10/wanleg/keymap.c @@ -26,4 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______________Gherkin_ETC_2_______________ ), +[_FN] = LAYOUT_ortho_3x10_wrapper( + _______________Gherkin_FN_0________________, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +), }; diff --git a/layouts/community/ortho_3x10/wanleg/readme.md b/layouts/community/ortho_3x10/wanleg/readme.md index 8696cccf6b..255e19c2a4 100644 --- a/layouts/community/ortho_3x10/wanleg/readme.md +++ b/layouts/community/ortho_3x10/wanleg/readme.md @@ -1,4 +1,4 @@ -![Gherkin Wanleg Layout Image](https://i.imgur.com/nCPog2W.png) +![Gherkin Wanleg Layout Image](https://i.imgur.com/iNkR90W.png) # Gherkin Wanleg Layout This is the layout I came up with to preserve a standard QWERTY 104 key ANSI layout as much as possible, in as few layers as possible for a 30 key board. Here are the two Tap Dance keys I've set up for this board: @@ -47,9 +47,9 @@ The instructions below have been adapted from https://www.reddit.com/r/olkb/comm | Arduino | ProMicro | | --- | --- | | 10 | RST | -| 11 | 16 | -| 12 | 14 | -| 13 | 15 | +| 11 (MOSI) | 16 | +| 12 (MISO) | 14 | +| 13 (SCK) | 15 | | GND | GND | | 5V | VCC | diff --git a/layouts/community/ortho_3x10/wanleg/rules.mk b/layouts/community/ortho_3x10/wanleg/rules.mk index 90841d2abe..efd11f7f80 100644 --- a/layouts/community/ortho_3x10/wanleg/rules.mk +++ b/layouts/community/ortho_3x10/wanleg/rules.mk @@ -1,3 +1 @@ -SWAP_HANDS_ENABLE = no - BOOTLOADER = qmk-dfu
\ No newline at end of file |