summaryrefslogtreecommitdiffstats
path: root/layouts/community/ortho_5x15
diff options
context:
space:
mode:
authorwanleg <32079073+wanleg@users.noreply.github.com>2018-11-03 10:39:40 -0700
committerDrashna Jaelre <drashna@live.com>2018-11-03 10:39:40 -0700
commit80c04b29194a0023b8e47f3ac49ea248c8ec953d (patch)
tree43ea6e09ebfdb1d788018edae92b3d4e3616c55a /layouts/community/ortho_5x15
parentbdc72740cb5f9d7d6d5df574b39721ec479dc733 (diff)
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.h20
-rw-r--r--layouts/community/ortho_5x15/wanleg/keymap.c25
-rw-r--r--layouts/community/ortho_5x15/wanleg/rules.mk9
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 1043986f7a..1aeda2db4e 100644
--- a/layouts/community/ortho_5x15/wanleg/config.h
+++ b/layouts/community/ortho_5x15/wanleg/config.h
@@ -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 \ No newline at end of file
+//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
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index df74241157..66b3ce018d 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] = {
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
* .--------------------------------------------------------------------------------------------------------------------------------------.
diff --git a/layouts/community/ortho_5x15/wanleg/rules.mk b/layouts/community/ortho_5x15/wanleg/rules.mk
index e36226fb2e..bfc4c69d99 100644
--- a/layouts/community/ortho_5x15/wanleg/rules.mk
+++ b/layouts/community/ortho_5x15/wanleg/rules.mk
@@ -1 +1,8 @@
-SWAP_HANDS_ENABLE = no \ No newline at end of file
+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 \ No newline at end of file