diff options
| author | wanleg <32079073+wanleg@users.noreply.github.com> | 2018-11-03 10:39:40 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-11-03 10:39:40 -0700 |
| commit | 80c04b29194a0023b8e47f3ac49ea248c8ec953d (patch) | |
| tree | 43ea6e09ebfdb1d788018edae92b3d4e3616c55a /layouts/community/ortho_5x15 | |
| parent | bdc72740cb5f9d7d6d5df574b39721ec479dc733 (diff) | |
| download | qmk_firmware-80c04b29194a0023b8e47f3ac49ea248c8ec953d.tar.gz qmk_firmware-80c04b29194a0023b8e47f3ac49ea248c8ec953d.zip | |
5x5bt (#4333)
* got bluetooth working
* get rid of description on bluetooth
* get rid of commented code used for testing
* Update config.h
Diffstat (limited to 'layouts/community/ortho_5x15')
| -rw-r--r-- | layouts/community/ortho_5x15/wanleg/config.h | 20 | ||||
| -rw-r--r-- | layouts/community/ortho_5x15/wanleg/keymap.c | 25 | ||||
| -rw-r--r-- | layouts/community/ortho_5x15/wanleg/rules.mk | 9 |
3 files changed, 39 insertions, 15 deletions
diff --git a/layouts/community/ortho_5x15/wanleg/config.h b/layouts/community/ortho_5x15/wanleg/config.h index 1043986f7..1aeda2db4 100644 --- a/layouts/community/ortho_5x15/wanleg/config.h +++ b/layouts/community/ortho_5x15/wanleg/config.h | |||
| @@ -1,8 +1,16 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | // set top left key as bootloader mode escape key on 5x5 75key layout | 3 | //5x5 powered by Adafruit Feather 32u4 Bluefruit LE |
| 4 | #if defined(KEYBOARD_5x5) && !defined(PRO_MICRO) | 4 | #if defined(KEYBOARD_5x5) && defined(BLUEFRUIT) |
| 5 | #define QMK_LED B0 | 5 | |
| 6 | #define QMK_ESC_OUTPUT D7 // usually COL | 6 | //need to undefine standard 5x5 array before defining alternate Bluefruit array |
| 7 | #define QMK_ESC_INPUT B2 // usually ROW | 7 | #undef MATRIX_ROW_PINS |
| 8 | #endif \ No newline at end of file | 8 | #undef MATRIX_COL_PINS |
| 9 | #define MATRIX_ROW_PINS { F7, F6, F5, D1, D0 } | ||
| 10 | //last 5 elements not tested | ||
| 11 | #define MATRIX_COL_PINS { C6, D7, B5, B6, B7, D6, C7, F0, F1, F4, B1, B2, B3, D2, D3 } | ||
| 12 | |||
| 13 | //get rid of description - too long to show properly in Windows | ||
| 14 | #undef DESCRIPTION | ||
| 15 | #define DESCRIPTION | ||
| 16 | #endif | ||
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c index df7424115..66b3ce018 100644 --- a/layouts/community/ortho_5x15/wanleg/keymap.c +++ b/layouts/community/ortho_5x15/wanleg/keymap.c | |||
| @@ -15,14 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 15 | 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 | 15 | 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 |
| 16 | ), | 16 | ), |
| 17 | 17 | ||
| 18 | [PAD] = LAYOUT_ortho_5x5_wrapper( | ||
| 19 | _______, _______, _______, _______, _______, | ||
| 20 | _______________NUMPAD_Row__0_______________, _______, | ||
| 21 | _______________NUMPAD_Row__1_______________, _______, | ||
| 22 | _______________NUMPAD_Row__2_______________, _______, | ||
| 23 | KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______ | ||
| 24 | ), | ||
| 25 | |||
| 26 | [GK50] = LAYOUT_ortho_5x10_wrapper( | 18 | [GK50] = LAYOUT_ortho_5x10_wrapper( |
| 27 | KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, | 19 | KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, |
| 28 | _______________Gherkin_Row_0_______________, | 20 | _______________Gherkin_Row_0_______________, |
| @@ -31,6 +23,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI | 23 | TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI |
| 32 | ), | 24 | ), |
| 33 | 25 | ||
| 26 | #if defined(BLUEFRUIT) | ||
| 27 | [PAD] = LAYOUT_ortho_5x5_wrapper( | ||
| 28 | _______, _______, _______, OUT_BT, OUT_USB, | ||
| 29 | _______________NUMPAD_Row__0_______________, _______, | ||
| 30 | _______________NUMPAD_Row__1_______________, _______, | ||
| 31 | _______________NUMPAD_Row__2_______________, _______, | ||
| 32 | KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______ | ||
| 33 | ), | ||
| 34 | #else | ||
| 35 | [PAD] = LAYOUT_ortho_5x5_wrapper( | ||
| 36 | _______, _______, _______, _______, _______, | ||
| 37 | _______________NUMPAD_Row__0_______________, _______, | ||
| 38 | _______________NUMPAD_Row__1_______________, _______, | ||
| 39 | _______________NUMPAD_Row__2_______________, _______, | ||
| 40 | KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______ | ||
| 41 | ), | ||
| 42 | #endif | ||
| 34 | #else | 43 | #else |
| 35 | /* Gherkin 75 | 44 | /* Gherkin 75 |
| 36 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 45 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
diff --git a/layouts/community/ortho_5x15/wanleg/rules.mk b/layouts/community/ortho_5x15/wanleg/rules.mk index e36226fb2..bfc4c69d9 100644 --- a/layouts/community/ortho_5x15/wanleg/rules.mk +++ b/layouts/community/ortho_5x15/wanleg/rules.mk | |||
| @@ -1 +1,8 @@ | |||
| 1 | SWAP_HANDS_ENABLE = no \ No newline at end of file | 1 | ifeq (,$(findstring yes,$(BLUEFRUIT))) |
| 2 | BLUETOOTH = AdafruitBLE | ||
| 3 | BLUETOOTH_ENABLE = yes | ||
| 4 | F_CPU = 8000000 | ||
| 5 | CONSOLE_ENABLE = no # Console for debug(+400) | ||
| 6 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 7 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 8 | endif \ No newline at end of file | ||
