lunny/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware synced 2024-12-22 08:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Big Switch and 5x5 edits (#4168)

Browse Source 
* 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

* playing around with triple tap dance

* sync with upstream

* quick edit

* tapdance cleanup

* mod tap interrupt

* tapping term edit

* tapping term adjust

* 5x5 board edits

* set gherkin tapping term

* big switch tap dance edit

* tapping term refinements

* 5x10 layout setup

* add audio for bigswitch

* keymap change

* keymap change & created testing board

* sound setup for big_switch

* more big switch size testing

* bigswitch testing finished

* final touch-ups
This commit is contained in:
wanleg 2018-10-19 11:01:40 -07:00 committed by Drashna Jaelre
parent 9ca73a9edc
commit 6f6d28fa8d
18 changed files with 305 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/5x5/5x5.h
View File

@ -35,7 +35,7 @@
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, ___, ___, ___, ___, ___}, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, ___, ___, ___, ___, ___}, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, ___, ___, ___, ___, ___}, \
{ K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, ___, ___, ___, ___, ___}, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, ___, ___, ___, ___, ___}, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, ___, ___, ___, ___, ___} \
}
@ -50,7 +50,7 @@
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e}, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e}, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e}, \
{ K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, K3a, K3b, K3c, K3d, K3e}, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e}, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, K4d, K4e} \
}

2
keyboards/bigswitch/bigswitch.c
View File

@ -26,10 +26,12 @@ void matrix_init_user(void) {
__attribute__ ((weak))
void matrix_scan_user(void) {
#if defined(RGBLIGHT_ENABLE)
if (runonce && timer_elapsed(my_timer) > 1000) {
runonce = false;
rgblight_sethsv_noeeprom(0x0, 0xff, 0x80);
rgblight_mode_noeeprom(9);
rgblight_enable_noeeprom();
}
#endif
}

11
keyboards/bigswitch/keymaps/wanleg/config.h
View File

@ -21,7 +21,6 @@
#define MATRIX_ROW_PINS { B4 }
#undef MATRIX_COL_PINS
#define MATRIX_COL_PINS { B6 }
//#define UNUSED_PINS
/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
#undef DIODE_DIRECTION
@ -32,14 +31,12 @@
#define BACKLIGHT_LEVELS 3
#define BREATHING_PERIOD 5
/* for Tap Dance */
#undef TAPPING_TERM
#define TAPPING_TERM 700
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
//#define DEBOUNCING_DELAY 5
#undef DEBOUNCING_DELAY
#define DEBOUNCING_DELAY 2
#define DEBOUNCING_DELAY 5
// set flashing LED with QMK DFU
#define QMK_LED B0
// set audio pin
#define C6_AUDIO

9
keyboards/bigswitch/keymaps/wanleg/keymap.c
View File

@ -20,8 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
TD(CAD_TD) \
),
};
void led_set_user(uint8_t usb_led) {
}
[1] = LAYOUT( /*Secondary*/
TD(BSW_TAP_DANCE) \
),
};

15
keyboards/bigswitch/keymaps/wanleg/rules.mk
View File

@ -1,7 +1,16 @@
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
#If using a ProMicro and it has the QMK DFU bootloader instead of Caterina,
#run "make <keyboard>:<keymap> dfu=qmk" when compiling to ensure it is flagged properly after being flashed
ifeq ($(strip $(dfu)), qmk)
BOOTLOADER = qmk-dfu
endif
endif
AUDIO_ENABLE = yes # Audio output on port C6
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)

9
layouts/community/ortho_3x10/wanleg/readme.md
View File

@ -1,13 +1,10 @@
![Gherkin Wanleg Layout Image](https://i.imgur.com/nCPog2W.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.
I originally set up a few Tap Dance keys, but dropped half of them in favor of chorded versions since in actual use, they tended to impede typing speed more than their current two-key versions.
I've left them in my `keymap.c` ready for use if anyone wants to try them out:
Here are the two Tap Dance keys I've set up for this board:
Legend Name | Single Tap | Double Tap | Hold
--- | --- | --- | ---
*null* | space | enter | shift
*null* | backspace | delete | control
Legend Name | Single Tap | Double Tap | Hold
--- | --- | --- | ---
Sft//Cp | shift | caps lock | *null*
Q//Esc | KC_Q | escape | *null*

9
layouts/community/ortho_5x10/wanleg/config.h
View File

@ -1,9 +0,0 @@
#pragma once
//QMK DFU settings (ProMicro boards)
// set top left key as bootloader mode escape key on Gherkin
#if defined(KEYBOARD_5x5)
#define QMK_LED B0
#define QMK_ESC_OUTPUT D7 // usually COL
#define QMK_ESC_INPUT B2 // usually ROW
#endif

38
layouts/community/ortho_5x10/wanleg/keymap.c
View File

@ -1,38 +0,0 @@
#include QMK_KEYBOARD_H
#include "wanleg.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[gGK] = LAYOUT_ortho_5x10_wrapper(
_______________Gherkin_NUM_0_______________,
_______________Gherkin_Row_0_______________,
_______________Gherkin_Row_1_______________,
_______________Gherkin_Row_2_______________,
_______, _______, _______, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, _______, _______
),
[gNUM] = LAYOUT_ortho_5x10_wrapper(
_______________Gherkin_NUM_0_______________,
_______________Gherkin_NUM_0_______________,
_______________Gherkin_NUM_1_______________,
_______________Gherkin_NUM_2_______________,
_______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
),
[gDIR] = LAYOUT_ortho_5x10_wrapper(
_______________Gherkin_NUM_0_______________,
_______________Gherkin_DIR_0_______________,
_______________Gherkin_DIR_1_______________,
_______________Gherkin_DIR_2_______________,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[gETC] = LAYOUT_ortho_5x10_wrapper(
_______________Gherkin_NUM_0_______________,
_______________Gherkin_ETC_0_______________,
_______________Gherkin_ETC_1_______________,
_______________Gherkin_ETC_2_______________,
_______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
),
};

3
layouts/community/ortho_5x10/wanleg/rules.mk
View File

@ -1,3 +0,0 @@
SWAP_HANDS_ENABLE = no
BOOTLOADER = qmk-dfu

11
layouts/community/ortho_5x15/wanleg/config.h
View File

@ -1,3 +1,8 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#endif
#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

89
layouts/community/ortho_5x15/wanleg/keymap.c
View File

@ -2,30 +2,36 @@
#include "wanleg.h"
#define _________________BLANK_75__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
#define _________________BLANK_50__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
#define _________________Num_Row_75________________ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* QWERTY 75
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| gherkin| | FN |
* |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
* | | 7 | 8 | 9 |
* | |--------+--------+--------|
* | 4x12 QWERTY LAYOUT | 4 | 5 | 6 |
* | |--------+--------+--------|
* | | 1 | 2 | 3 |
* | |--------+--------+--------|
* | | 0 | 0 | . |
* '--------------------------------------------------------------------------------------------------------------------------------------'
*/
[QW75] = LAYOUT_ortho_5x15_wrapper(
_________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75,
_______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
_______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
_______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3,
KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, SUBTER75, KC_LSFT, KC_SPC, SUPRA75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
#if defined(KEYBOARD_5x5)
[GK75] = LAYOUT_ortho_5x15_wrapper(
_________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
_______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
_______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
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_______________,
_______________Gherkin_Row_1_______________,
_______________Gherkin_Row_2_______________,
TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
),
#else
/* Gherkin 75
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | | FN |
@ -46,6 +52,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
),
#endif
/* QWERTY 75
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| gherkin| | FN |
* |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
* | | 7 | 8 | 9 |
* | |--------+--------+--------|
* | 4x12 QWERTY LAYOUT | 4 | 5 | 6 |
* | |--------+--------+--------|
* | | 1 | 2 | 3 |
* | |--------+--------+--------|
* | | 0 | 0 | . |
* '--------------------------------------------------------------------------------------------------------------------------------------'
*/
[QW75] = LAYOUT_ortho_5x15_wrapper(
_________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75,
_______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
_______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
_______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3,
KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, SUBTER75, KC_LSFT, KC_SPC, SUPRA75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
),
/* SUBTER75
* .--------------------------------------------------------------------------------------------------------------------------------------.
@ -173,4 +200,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC, BL_DEC, _______, _______, KC_MS_U, KC_WH_D,
_______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
),
[gNUM] = LAYOUT_ortho_5x10_wrapper(
_________________BLANK_50__________________,
_______________Gherkin_NUM_0_______________,
_______________Gherkin_NUM_1_______________,
_______________Gherkin_NUM_2_______________,
_______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
),
[gDIR] = LAYOUT_ortho_5x10_wrapper(
_________________BLANK_50__________________,
_______________Gherkin_DIR_0_______________,
_______________Gherkin_DIR_1_______________,
_______________Gherkin_DIR_2_______________,
_________________BLANK_50__________________
),
[gETC] = LAYOUT_ortho_5x10_wrapper(
_________________BLANK_50__________________,
_______________Gherkin_ETC_0_______________,
_______________Gherkin_ETC_1_______________,
_______________Gherkin_ETC_2_______________,
_______, KC_CAPS, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
),
};

1
layouts/community/ortho_5x5/layout.json Normal file
View File

@ -0,0 +1 @@
["","","","",""],["","","","",""],["","","","",""],["","","","",""],["","","","",""]

3
layouts/community/ortho_5x5/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_5x5
LAYOUT_ortho_5x5

18
users/wanleg/config.h
View File

@ -2,8 +2,17 @@
#define USERSPACE_CONFIG_H
//TAPPING_TERM
#ifdef TAP_DANCE_ENABLE
#define TAPPING_TERM 200
//tapping term short (<100): on multi-purpose keys, slow taps may not register, but "holds" register easier. multi-tap keys may be difficult to activate.
//tapping term long (>200): holds don't register as easily - noticeable when typing quickly (e.g. shift doesn't want to engage.)
#if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2)
//Kailh Coppers activate quickly and don't need a long tapping term
#define TAPPING_TERM 100
#elif defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_bigswitch)
#define TAPPING_TERM 700
#else
#define TAPPING_TERM 145
#endif
//Mousekey Settings
@ -27,4 +36,9 @@
#define NO_ACTION_FUNCTION
#define NO_ACTION_ONESHOT
// Disable mod tap interrrupt
#ifndef IGNORE_MOD_TAP_INTERRUPT
#define IGNORE_MOD_TAP_INTERRUPT
#endif // !mod tap interrrupt
#endif // !USERSPACE_CONFIG_H

4
users/wanleg/rules.mk
View File

@ -9,8 +9,8 @@ ifeq ($(strip $(dfu)), qmk)
BOOTLOADER = qmk-dfu
endif
#use alternate settings for 4x4 board using ProMicro instead of Micro
#usage: make 4x4:wanleg PM=yes
#use alternate settings for boards using ProMicro instead of Micro
#example usage: make 4x4:wanleg PM=yes
ifeq ($(strip $(PM)), yes)
OPT_DEFS += -DPRO_MICRO
endif

246
users/wanleg/tapdances.c
View File

File diff suppressed because it is too large Load Diff

6
users/wanleg/wanleg.c
View File

@ -47,6 +47,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
case GHERKIN50:
if (record->event.pressed) {
set_single_persistent_default_layer(GK50);
}
return false;
break;
case SUBTER:
if (record->event.pressed) {
layer_on(SUB);

39
users/wanleg/wanleg.h
View File

@ -27,10 +27,12 @@ enum userspace_layers {
ETC75,
FN75,
PAD,
GK50,
};
#elif KEYBOARD_xd75
enum userspace_layers {
GK75 = 0,
PAD,
QW75,
SUB75,
SUP75,
@ -50,7 +52,32 @@ enum userspace_layers {
gNUM,
gDIR,
gETC,
GK50,
};
#elif KEYBOARD_5x5
enum userspace_layers {
GK50 = 0,
gNUM,
gDIR,
gETC,
GK75,
QW75,
SUB75,
SUP75,
NUM75,
DIR75,
ETC75,
FN75,
PAD,
gGK,
_GK,
_QW,
ONE,
SUB,
SUP,
NUM,
DIR,
ETC,
};
#else
enum userspace_layers {
@ -75,6 +102,7 @@ enum userspace_layers {
DIR75,
ETC75,
FN75,
GK50,
};
#endif
@ -100,6 +128,7 @@ enum userspace_custom_keycodes {
ETCETERA75,
FUNCTION75,
NUMPAD,
GHERKIN50,
};
@ -108,11 +137,12 @@ enum userspace_custom_keycodes {
enum {
TD_SFT_CAPS = 0
,TD_Q_ESC
,ENT_TAP_DANCE
,DEL_TAP_DANCE
,CAD_TD
,RST_TAP_DANCE
,LYR_TAP_DANCE
,LYR50_TAP_DANCE
,LYR75_TAP_DANCE
,BSW_TAP_DANCE
};
#endif
@ -130,6 +160,7 @@ enum {
#define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__)
#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__)
#define LAYOUT_ortho_4x4_wrapper(...) LAYOUT_ortho_4x4(__VA_ARGS__)
#define LAYOUT_ortho_5x5_wrapper(...) LAYOUT_ortho_5x5(__VA_ARGS__)
// Blocks for each of the major keyboard layouts
// Organized so we can quickly adapt and modify all of them
@ -189,12 +220,12 @@ enum {
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
* | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
* | Sft//Cp| | | | | C-A-D | mScrL | mScrR | ALT | DEL |
* | Sft//Cp| CAPS | | | | C-A-D | mScrL | mScrR | ALT | DEL |
* '-----------------------------------------------------------------------------------------'
*/
#define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,_______, RESET, KC_RSFT, KC_WH_U, KC_WH_D, _______, KC_BSLS
#define _______________Gherkin_ETC_1_______________ KC_MS_L, KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT
#define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),_______, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL
#define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL
/* Gherkin-Like
* .-----------------------------------------------------------------------------------------------------------.