5x5bt (#4333)
* got bluetooth working * get rid of description on bluetooth * get rid of commented code used for testing * Update config.h
This commit is contained in:
parent
bdc72740cb
commit
80c04b2919
5 changed files with 47 additions and 20 deletions
|
@ -1,5 +1,4 @@
|
|||
#ifndef CONFIG_USER_H
|
||||
#define CONFIG_USER_H
|
||||
#pragma once
|
||||
|
||||
//QMK DFU settings (ProMicro boards with QMK bootloader)
|
||||
// set top left key as bootloader mode escape key on Lets Split rev2
|
||||
|
@ -30,8 +29,6 @@
|
|||
#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)
|
||||
//last 4 elements of the column array 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
|
||||
|
|
|
@ -1,8 +1,16 @@
|
|||
#pragma once
|
||||
|
||||
// set top left key as bootloader mode escape key on 5x5 75key layout
|
||||
#if defined(KEYBOARD_5x5) && !defined(PRO_MICRO)
|
||||
#define QMK_LED B0
|
||||
#define QMK_ESC_OUTPUT D7 // usually COL
|
||||
#define QMK_ESC_INPUT B2 // usually ROW
|
||||
#endif
|
||||
//5x5 powered by Adafruit Feather 32u4 Bluefruit LE
|
||||
#if defined(KEYBOARD_5x5) && defined(BLUEFRUIT)
|
||||
|
||||
//need to undefine standard 5x5 array before defining alternate Bluefruit array
|
||||
#undef MATRIX_ROW_PINS
|
||||
#undef MATRIX_COL_PINS
|
||||
#define MATRIX_ROW_PINS { F7, F6, F5, D1, D0 }
|
||||
//last 5 elements not tested
|
||||
#define MATRIX_COL_PINS { C6, D7, B5, B6, B7, D6, C7, F0, F1, F4, B1, B2, B3, D2, D3 }
|
||||
|
||||
//get rid of description - too long to show properly in Windows
|
||||
#undef DESCRIPTION
|
||||
#define DESCRIPTION
|
||||
#endif
|
||||
|
|
|
@ -15,14 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
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
|
||||
),
|
||||
|
||||
[PAD] = LAYOUT_ortho_5x5_wrapper(
|
||||
_______, _______, _______, _______, _______,
|
||||
_______________NUMPAD_Row__0_______________, _______,
|
||||
_______________NUMPAD_Row__1_______________, _______,
|
||||
_______________NUMPAD_Row__2_______________, _______,
|
||||
KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______
|
||||
),
|
||||
|
||||
[GK50] = LAYOUT_ortho_5x10_wrapper(
|
||||
KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,
|
||||
_______________Gherkin_Row_0_______________,
|
||||
|
@ -31,6 +23,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
|
||||
),
|
||||
|
||||
#if defined(BLUEFRUIT)
|
||||
[PAD] = LAYOUT_ortho_5x5_wrapper(
|
||||
_______, _______, _______, OUT_BT, OUT_USB,
|
||||
_______________NUMPAD_Row__0_______________, _______,
|
||||
_______________NUMPAD_Row__1_______________, _______,
|
||||
_______________NUMPAD_Row__2_______________, _______,
|
||||
KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______
|
||||
),
|
||||
#else
|
||||
[PAD] = LAYOUT_ortho_5x5_wrapper(
|
||||
_______, _______, _______, _______, _______,
|
||||
_______________NUMPAD_Row__0_______________, _______,
|
||||
_______________NUMPAD_Row__1_______________, _______,
|
||||
_______________NUMPAD_Row__2_______________, _______,
|
||||
KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______
|
||||
),
|
||||
#endif
|
||||
#else
|
||||
/* Gherkin 75
|
||||
* .--------------------------------------------------------------------------------------------------------------------------------------.
|
||||
|
|
|
@ -1 +1,8 @@
|
|||
SWAP_HANDS_ENABLE = no
|
||||
ifeq (,$(findstring yes,$(BLUEFRUIT)))
|
||||
BLUETOOTH = AdafruitBLE
|
||||
BLUETOOTH_ENABLE = yes
|
||||
F_CPU = 8000000
|
||||
CONSOLE_ENABLE = no # Console for debug(+400)
|
||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
endif
|
|
@ -14,3 +14,9 @@ endif
|
|||
ifeq ($(strip $(PM)), yes)
|
||||
OPT_DEFS += -DPRO_MICRO
|
||||
endif
|
||||
|
||||
#use alternate settings for boards using "Adafruit Feather 32u4 Bluefruit LE" instead of Micro
|
||||
#example usage: make 5x5:wanleg BT=yes
|
||||
ifeq ($(strip $(BT)), yes)
|
||||
OPT_DEFS += -DBLUEFRUIT
|
||||
endif
|
Loading…
Reference in a new issue