diff options
| author | wanleg <32079073+wanleg@users.noreply.github.com> | 2018-09-26 00:39:41 +0200 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-09-26 00:39:41 +0200 |
| commit | 223081bf2b201a53fb0383d6be0cacb8cde39140 (patch) | |
| tree | ebc0ffe94d3b19999392f5680958cc7fb6928113 /layouts/community | |
| parent | 61f95410666319ac5ef0cb3d533b820f45ae237c (diff) | |
| download | qmk_firmware-223081bf2b201a53fb0383d6be0cacb8cde39140.tar.gz qmk_firmware-223081bf2b201a53fb0383d6be0cacb8cde39140.tar.xz | |
Keymap: 4x4 pro micro (#3976)
* 4x4 - pro micro version
* pro-micro setup on 4x4
* tap dance LCTL/RESET key
* remove test file
* more research
* revert a couple un-intended edits
* opt_defs version of adding custom rules.mk variables
* cleanup
* cleanup
* cleanup
* cleanup
* layout edits
* layout edits
* keymap edit
* numpad layout change
* got tap dance layer-switch working
* keymap changes
* temporary revert
* restore previous settings
* misc fixes
* layer order change
* fix layout matrix
* Update tapdances.c
Diffstat (limited to 'layouts/community')
| -rw-r--r-- | layouts/community/ortho_4x12/wanleg/config.h | 19 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/wanleg/keymap.c | 17 |
2 files changed, 34 insertions, 2 deletions
diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h index 0d2cc591e..2444b8b97 100644 --- a/layouts/community/ortho_4x12/wanleg/config.h +++ b/layouts/community/ortho_4x12/wanleg/config.h @@ -1,7 +1,7 @@ #ifndef CONFIG_USER_H #define CONFIG_USER_H -//QMK DFU settings (ProMicro boards) +//QMK DFU settings (ProMicro boards with QMK bootloader) // set top left key as bootloader mode escape key on Lets Split rev2 #if defined(KEYBOARD_lets_split_rev2) #define QMK_LED B0 @@ -13,10 +13,25 @@ #endif // set top left key as bootloader mode escape key on 4x4 48key layout -#if defined(KEYBOARD_4x4) +#if defined(KEYBOARD_4x4) && !defined(PRO_MICRO) #define QMK_LED B0 #define QMK_ESC_OUTPUT C6 // usually COL #define QMK_ESC_INPUT B2 // usually ROW #endif +// use alternate settings for 4x4 board using ProMicro instead of Micro +// usage: make 4x4:wanleg PM=yes +#if defined(KEYBOARD_4x4) && defined(PRO_MICRO) +#define QMK_ESC_OUTPUT F4 // usually COL +#define QMK_ESC_INPUT D1 // 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 +#define MATRIX_ROW_PINS { D1, D0, D4, C6 } +//last 4 elements of the column array are are not broken out on a ProMicro (included only to preserve array structure) +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, F0, B7, D6, F1 } +#endif + #endif diff --git a/layouts/community/ortho_4x12/wanleg/keymap.c b/layouts/community/ortho_4x12/wanleg/keymap.c index f6030469c..6fe8446f6 100644 --- a/layouts/community/ortho_4x12/wanleg/keymap.c +++ b/layouts/community/ortho_4x12/wanleg/keymap.c @@ -15,6 +15,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______________Qwerty_Row__2_______________, KC_LCTL, KC_LGUI, KC_LALT, GHERKIN, SUBTER, SH_T(KC_SPC), SH_T(KC_SPC), SUPRA, KC_RGUI, KC_RALT, GHERKIN, KC_RCTL ), + +#elif defined(KEYBOARD_4x4) +[_GK] = LAYOUT_ortho_4x12_wrapper( + _______________GherkinLike_0_______________, + _______________GherkinLike_1_______________, + _______________GherkinLike_2_______________, + TD(RST_TAP_DANCE), KC_LGUI, KC_LALT, NUMPAD, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL +), + +[PAD] = LAYOUT_ortho_4x4_wrapper( + _______________NUMPAD_Row__0_______________, + _______________NUMPAD_Row__1_______________, + _______________NUMPAD_Row__2_______________, + _______________NUMPAD_Row__3_______________ +), + #else [_GK] = LAYOUT_ortho_4x12_wrapper( _______________GherkinLike_0_______________, @@ -64,4 +80,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________ETCETERA_Row__2______________, ______________ETCETERA_Row__3______________ ), + }; |