aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c82
-rw-r--r--keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk3
-rw-r--r--keyboards/miniaxe/keymaps/wanleg/config.h11
-rw-r--r--keyboards/miniaxe/keymaps/wanleg/keymap.c49
-rw-r--r--keyboards/miniaxe/keymaps/wanleg/rules.mk18
-rw-r--r--layouts/community/ortho_3x10/wanleg/config.h19
-rw-r--r--layouts/community/ortho_3x10/wanleg/keymap.c5
-rw-r--r--layouts/community/ortho_3x10/wanleg/readme.md8
-rw-r--r--layouts/community/ortho_3x10/wanleg/rules.mk2
-rw-r--r--layouts/community/ortho_4x12/wanleg/config.h7
-rw-r--r--layouts/community/ortho_4x12/wanleg/keymap.c17
-rw-r--r--layouts/community/ortho_4x12/wanleg/rules.mk5
-rw-r--r--layouts/community/ortho_5x15/wanleg/keymap.c40
-rw-r--r--users/wanleg/config.h19
-rw-r--r--users/wanleg/readme.md133
-rw-r--r--users/wanleg/rules.mk6
-rw-r--r--users/wanleg/wanleg.c41
-rw-r--r--users/wanleg/wanleg.h45
18 files changed, 439 insertions, 71 deletions
diff --git a/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
new file mode 100644
index 000000000..f3aa991f3
--- /dev/null
+++ b/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
@@ -0,0 +1,82 @@
1/* Copyright 2018 wanleg
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17#include "wanleg.h"
18
19
20#define LAYOUT_kbd6x_base( \
21 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
22 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
23 K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
24 ) \
25 LAYOUT_wrapper( \
26 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
27 KC_TAB, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_LBRC, KC_RBRC, KC_BSLS, \
28 KC_CAPS, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, KC_ENT, \
29 KC_LSFT, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_LSFT, FUNCTION, \
30 KC_LCTL, KC_LGUI, KC_LALT, LT(gDIR,KC_SPC), KC_RALT, KC_RGUI, KC_RCTL \
31 )
32#define LAYOUT_kbd6x_base_wrapper(...) LAYOUT_kbd6x_base(__VA_ARGS__)
33
34
35const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36[gGK] = LAYOUT_kbd6x_base_wrapper(
37 _______________Gherkin_Row_0_______________,
38 _______________Gherkin_Row_1_______________,
39 _______________Gherkin_Row_2_______________
40),
41
42[gNUM] = LAYOUT_kbd6x_base_wrapper(
43 _______________Gherkin_NUM_0_______________,
44 _______________Gherkin_NUM_1_______________,
45 _______________Gherkin_NUM_2_______________
46),
47
48[gDIR] = LAYOUT_kbd6x_base_wrapper(
49 _______________Gherkin_DIR_0_______________,
50 _______________Gherkin_DIR_1_______________,
51 _______________Gherkin_DIR_2_______________
52),
53
54[gETC] = LAYOUT_kbd6x_base_wrapper(
55 _______________Gherkin_ETC_0_______________,
56 _______________Gherkin_ETC_1_______________,
57 _______________Gherkin_ETC_2_______________
58),
59
60[_FN] = LAYOUT_kbd6x_base_wrapper(
61 _______________Gherkin_FN_0________________,
62 _______________Gherkin_FN_1________________,
63 _______________Gherkin_FN_2________________
64),
65
66//mac layout
67[_QW] = LAYOUT_wrapper(
68 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
69 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
70 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
71 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(ONE),
72 KC_LCTL, MO(ONE), KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT, KC_RCTL
73 ),
74
75[ONE] = LAYOUT_wrapper(
76 KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
77 _______, BL_BRTG, BL_DEC, BL_INC, BL_TOGG, BL_STEP, BL_ON, KC_PGUP, KC_HOME, _______, _______, _______, _______, _______,
78 _______, RGB_M_B, RGB_VAD, RGB_VAI, RGB_TOG, RGB_MOD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
79 _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, KC_PGDN, KC_END, _______, gGHERKIN,_______, _______,
80 _______, _______, _______, _______, _______, _______, _______
81 ),
82};
diff --git a/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk
new file mode 100644
index 000000000..92cc41e21
--- /dev/null
+++ b/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk
@@ -0,0 +1,3 @@
1BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
2EXTRAKEY_ENABLE = no # Audio control and System control(+450)
3CONSOLE_ENABLE = no # Console for debug(+400) \ No newline at end of file
diff --git a/keyboards/miniaxe/keymaps/wanleg/config.h b/keyboards/miniaxe/keymaps/wanleg/config.h
new file mode 100644
index 000000000..0f20ea455
--- /dev/null
+++ b/keyboards/miniaxe/keymaps/wanleg/config.h
@@ -0,0 +1,11 @@
1#pragma once
2
3/* Select hand configuration */
4
5// #define MASTER_LEFT
6// #define MASTER_RIGHT
7#define EE_HANDS
8
9//#define QMK_ESC_OUTPUT F1 // usually COL
10//#define QMK_ESC_INPUT D6 // usually ROW // connected to nothing on the miniaxe
11//#define QMK_LED D7 //connected to nothing on the miniaxe
diff --git a/keyboards/miniaxe/keymaps/wanleg/keymap.c b/keyboards/miniaxe/keymaps/wanleg/keymap.c
new file mode 100644
index 000000000..69233741b
--- /dev/null
+++ b/keyboards/miniaxe/keymaps/wanleg/keymap.c
@@ -0,0 +1,49 @@
1#include QMK_KEYBOARD_H
2#include "wanleg.h"
3
4#define LAYOUT_miniaxe_base( \
5 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
6 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
7 K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
8 ) \
9 LAYOUT_wrapper( \
10 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
11 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
12 K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
13 _______, NUMBER, ETCETERA, KC_SPC, DIRECTION, KC_RGUI \
14 )
15#define LAYOUT_miniaxe_base_wrapper(...) LAYOUT_miniaxe_base(__VA_ARGS__)
16
17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
18[_GK] = LAYOUT_miniaxe_base_wrapper(
19 _______________Gherkin_Row_0_______________,
20 _______________Gherkin_Row_1_______________,
21 SFT_T(KC_Z), KC_X, KC_C, LT(NUM,KC_V), LT(ETC,KC_B), LT(_FN,KC_N), LT(DIR,KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC)
22),
23
24[NUM] = LAYOUT_wrapper(
25 _______________Gherkin_NUM_0_______________,
26 _______________Gherkin_NUM_1_______________,
27 _______________Gherkin_NUM_2_______________,
28 _______, _______, _______, KC_ENT, KC_RSFT, _______
29),
30
31[DIR] = LAYOUT_miniaxe_base_wrapper(
32 _______________Gherkin_DIR_0_______________,
33 _______________Gherkin_DIR_1_______________,
34 _______________Gherkin_DIR_2_______________
35),
36
37[ETC] = LAYOUT_wrapper(
38 _______________Gherkin_ETC_0_______________,
39 _______________Gherkin_ETC_1_______________,
40 _______________Gherkin_ETC_2_______________,
41 _______, NUMBER, ETCETERA, LALT(LCTL(KC_DEL)), DIRECTION, KC_RGUI
42),
43
44[_FN] = LAYOUT_miniaxe_base_wrapper(
45 _______________Gherkin_FN_0________________,
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
48),
49}; \ No newline at end of file
diff --git a/keyboards/miniaxe/keymaps/wanleg/rules.mk b/keyboards/miniaxe/keymaps/wanleg/rules.mk
new file mode 100644
index 000000000..ae5ae549c
--- /dev/null
+++ b/keyboards/miniaxe/keymaps/wanleg/rules.mk
@@ -0,0 +1,18 @@
1# Bootloader selection
2# Teensy halfkay
3# Pro Micro caterina
4# Atmel DFU atmel-dfu
5# LUFA DFU lufa-dfu
6# QMK DFU qmk-dfu
7# atmega32a bootloadHID
8#BOOTLOADER = qmk-dfu
9
10
11# If you don't know the bootloader type, then you can specify the
12# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
13# Teensy halfKay 512
14# Teensy++ halfKay 1024
15# Atmel DFU loader 4096
16# LUFA bootloader 4096
17# USBaspLoader 2048
18# OPT_DEFS += -DBOOTLOADER_SIZE=4096 \ No newline at end of file
diff --git a/layouts/community/ortho_3x10/wanleg/config.h b/layouts/community/ortho_3x10/wanleg/config.h
index 6719a4591..dc2245448 100644
--- a/layouts/community/ortho_3x10/wanleg/config.h
+++ b/layouts/community/ortho_3x10/wanleg/config.h
@@ -2,8 +2,25 @@
2 2
3//QMK DFU settings (ProMicro boards) 3//QMK DFU settings (ProMicro boards)
4// set top left key as bootloader mode escape key on Gherkin 4// set top left key as bootloader mode escape key on Gherkin
5#if defined(KEYBOARD_gherkin) 5#if defined(KEYBOARD_40percentclub_gherkin) && !defined(FLIP)
6#define QMK_LED B0 6#define QMK_LED B0
7#define QMK_ESC_OUTPUT B4 // usually COL 7#define QMK_ESC_OUTPUT B4 // usually COL
8#define QMK_ESC_INPUT F7 // usually ROW 8#define QMK_ESC_INPUT F7 // usually ROW
9#endif 9#endif
10
11//change gherkin orientation (i.e. move USB port from right side to left side)
12#if defined(KEYBOARD_40percentclub_gherkin) && defined(FLIP)
13//need to fix QMKdfu setting:
14#define QMK_ESC_OUTPUT B6 // usually COL
15#define QMK_ESC_INPUT D0 // usually ROW
16#define QMK_LED B0
17
18//need to undefine standard 4x4 array before defining alternate ProMicro array
19#undef MATRIX_ROW_PINS
20#undef MATRIX_COL_PINS
21//standard config:
22//#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
23//#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
24#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
25#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4 }
26#endif
diff --git a/layouts/community/ortho_3x10/wanleg/keymap.c b/layouts/community/ortho_3x10/wanleg/keymap.c
index 44be300a4..96d36eb31 100644
--- a/layouts/community/ortho_3x10/wanleg/keymap.c
+++ b/layouts/community/ortho_3x10/wanleg/keymap.c
@@ -26,4 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 _______________Gherkin_ETC_2_______________ 26 _______________Gherkin_ETC_2_______________
27), 27),
28 28
29[_FN] = LAYOUT_ortho_3x10_wrapper(
30 _______________Gherkin_FN_0________________,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
33),
29}; 34};
diff --git a/layouts/community/ortho_3x10/wanleg/readme.md b/layouts/community/ortho_3x10/wanleg/readme.md
index 8696cccf6..255e19c2a 100644
--- a/layouts/community/ortho_3x10/wanleg/readme.md
+++ b/layouts/community/ortho_3x10/wanleg/readme.md
@@ -1,4 +1,4 @@
1![Gherkin Wanleg Layout Image](https://i.imgur.com/nCPog2W.png) 1![Gherkin Wanleg Layout Image](https://i.imgur.com/iNkR90W.png)
2# Gherkin Wanleg Layout 2# Gherkin Wanleg Layout
3This 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. 3This 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.
4Here are the two Tap Dance keys I've set up for this board: 4Here are the two Tap Dance keys I've set up for this board:
@@ -47,9 +47,9 @@ The instructions below have been adapted from https://www.reddit.com/r/olkb/comm
47| Arduino | ProMicro | 47| Arduino | ProMicro |
48| --- | --- | 48| --- | --- |
49| 10 | RST | 49| 10 | RST |
50| 11 | 16 | 50| 11 (MOSI) | 16 |
51| 12 | 14 | 51| 12 (MISO) | 14 |
52| 13 | 15 | 52| 13 (SCK) | 15 |
53| GND | GND | 53| GND | GND |
54| 5V | VCC | 54| 5V | VCC |
55 55
diff --git a/layouts/community/ortho_3x10/wanleg/rules.mk b/layouts/community/ortho_3x10/wanleg/rules.mk
index 90841d2ab..efd11f7f8 100644
--- a/layouts/community/ortho_3x10/wanleg/rules.mk
+++ b/layouts/community/ortho_3x10/wanleg/rules.mk
@@ -1,3 +1 @@
1SWAP_HANDS_ENABLE = no
2
3BOOTLOADER = qmk-dfu \ No newline at end of file BOOTLOADER = qmk-dfu \ No newline at end of file
diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h
index f7650ddd3..bcf2756f6 100644
--- a/layouts/community/ortho_4x12/wanleg/config.h
+++ b/layouts/community/ortho_4x12/wanleg/config.h
@@ -20,6 +20,13 @@
20#define EE_HANDS 20#define EE_HANDS
21#endif 21#endif
22 22
23// set top left key as bootloader mode escape key on Nori
24#if defined(KEYBOARD_40percentclub_nori)
25#define QMK_LED B0
26#define QMK_ESC_OUTPUT F4 // usually COL
27#define QMK_ESC_INPUT D3 // usually ROW
28#endif
29
23// set top left key as bootloader mode escape key on 4x4 48key layout 30// set top left key as bootloader mode escape key on 4x4 48key layout
24#if defined(KEYBOARD_40percentclub_4x4) && !defined(PRO_MICRO) 31#if defined(KEYBOARD_40percentclub_4x4) && !defined(PRO_MICRO)
25#define QMK_LED B0 32#define QMK_LED B0
diff --git a/layouts/community/ortho_4x12/wanleg/keymap.c b/layouts/community/ortho_4x12/wanleg/keymap.c
index 23e794dc4..bcf6671ae 100644
--- a/layouts/community/ortho_4x12/wanleg/keymap.c
+++ b/layouts/community/ortho_4x12/wanleg/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 _____________DIRECTIONS_Row__2_____________, 21 _____________DIRECTIONS_Row__2_____________,
22 _______, _______, ONEHAND, _______, _______, _______, _______, _______, _______, _______, _______, _______ 22 _______, _______, ONEHAND, _______, _______, _______, _______, _______, _______, _______, _______, _______
23), 23),
24#elif defined(KEYBOARD_40percentclub_4x4) 24#elif defined(KEYBOARD_40percentclub_4x4) || defined(KEYBOARD_40percentclub_nori)
25[_GK] = LAYOUT_ortho_4x12_wrapper( 25[_GK] = LAYOUT_ortho_4x12_wrapper(
26 _______________GherkinLike_0_______________, 26 _______________GherkinLike_0_______________,
27 _______________GherkinLike_1_______________, 27 _______________GherkinLike_1_______________,
@@ -36,14 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 _______________NUMPAD_Row__3_______________ 36 _______________NUMPAD_Row__3_______________
37), 37),
38 38
39#elif defined(KEYBOARD_jj40)
40[_GK] = LAYOUT_ortho_4x12_wrapper(
41 _______________GherkinLike_0_______________,
42 _______________GherkinLike_1_______________,
43 _______________GherkinLike_2_______________,
44 TD(RST_TAP_DANCE), BL_TOGG, BL_STEP, BL_BRTG, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
45),
46
47#else 39#else
48[_GK] = LAYOUT_ortho_4x12_wrapper( 40[_GK] = LAYOUT_ortho_4x12_wrapper(
49 _______________GherkinLike_0_______________, 41 _______________GherkinLike_0_______________,
@@ -94,4 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
94 ______________ETCETERA_Row__3______________ 86 ______________ETCETERA_Row__3______________
95), 87),
96 88
89[_FN] = LAYOUT_ortho_4x12_wrapper(
90 _______, _______________Gherkin_FN_0________________, _______,
91 _______, _______________Gherkin_FN_0________________, _______,
92 _______, _______________Gherkin_FN_0________________, _______,
93 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
94),
95
97}; 96};
diff --git a/layouts/community/ortho_4x12/wanleg/rules.mk b/layouts/community/ortho_4x12/wanleg/rules.mk
index e8277610b..0b3917e98 100644
--- a/layouts/community/ortho_4x12/wanleg/rules.mk
+++ b/layouts/community/ortho_4x12/wanleg/rules.mk
@@ -7,4 +7,9 @@ endif
7 7
8ifeq ($(strip $(KEYBOARD)), planck/rev6) 8ifeq ($(strip $(KEYBOARD)), planck/rev6)
9 AUDIO_ENABLE = yes 9 AUDIO_ENABLE = yes
10endif
11
12#disable RGB on version 1 of jj40 keyboard (does not exist)
13ifeq ($(strip $(KEYBOARD)), jj40)
14 RGBLIGHT_ENABLE = no
10endif \ No newline at end of file 15endif \ No newline at end of file
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index a98f61988..ea4521d3d 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -11,7 +11,7 @@
11 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \ 11 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
12 ) \ 12 ) \
13 LAYOUT_ortho_5x15_wrapper( \ 13 LAYOUT_ortho_5x15_wrapper( \
14 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, QWERTY, GHERKIN, FUNCTION, \ 14 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, QWERTY, GHERKIN, FUNCTION, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, \
15 K00, K01, K02, K03, K04, K05, K0c, K0d, K0e, K06, K07, K08, K09, K0a, K0b, \ 15 K00, K01, K02, K03, K04, K05, K0c, K0d, K0e, K06, K07, K08, K09, K0a, K0b, \
16 K10, K11, K12, K13, K14, K15, K1c, K1d, K1e, K16, K17, K18, K19, K1a, K1b, \ 16 K10, K11, K12, K13, K14, K15, K1c, K1d, K1e, K16, K17, K18, K19, K1a, K1b, \
17 K20, K21, K22, K23, K24, K25, K2c, K2d, K2e, K26, K27, K28, K29, K2a, K2b, \ 17 K20, K21, K22, K23, K24, K25, K2c, K2d, K2e, K26, K27, K28, K29, K2a, K2b, \
@@ -26,7 +26,7 @@
26 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \ 26 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
27 ) \ 27 ) \
28 LAYOUT_ortho_5x15_wrapper( \ 28 LAYOUT_ortho_5x15_wrapper( \
29 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, QWERTY, GHERKIN, FUNCTION, \ 29 QWERTY, GHERKIN, FUNCTION, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, \
30 K0c, K0d, K0e, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \ 30 K0c, K0d, K0e, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
31 K1c, K1d, K1e, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \ 31 K1c, K1d, K1e, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
32 K2c, K2d, K2e, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \ 32 K2c, K2d, K2e, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
110), 110),
111#endif 111#endif
112#else 112#else
113 /* Gherkin 113 /* Gherkin-Like
114 * .--------------------------------------------------------------------------------------------------------------------------------------. 114 * .--------------------------------------------------------------------------------------------------------------------------------------.
115 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN | 115 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN |
116 * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------| 116 * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
@@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
190 ________________SUPRA_Row_3________________, _______, _______, _______ 190 ________________SUPRA_Row_3________________, _______, _______, _______
191), 191),
192 192
193/* Gherkin Numbers 193/* Gherkin-Like Numbers
194 * .--------------------------------------------------------------------------------------------------------------------------------------. 194 * .--------------------------------------------------------------------------------------------------------------------------------------.
195 * | | | | | | | | | | | | | | | | 195 * | | | | | | | | | | | | | | | |
196 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| 196 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -210,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
210 _______________NUMBERS_Row_3_______________, _______, _______, _______ 210 _______________NUMBERS_Row_3_______________, _______, _______, _______
211), 211),
212 212
213/* Gherkin Et Cetera 213/* Gherkin-Like Et Cetera
214 * .--------------------------------------------------------------------------------------------------------------------------------------. 214 * .--------------------------------------------------------------------------------------------------------------------------------------.
215 * | | | | | | | | | | | | | | | | 215 * | | | | | | | | | | | | | | | |
216 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| 216 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
230 ______________ETCETERA_Row__3______________, _______, _______, _______ 230 ______________ETCETERA_Row__3______________, _______, _______, _______
231), 231),
232 232
233/* Gherkin Directional Keys 233/* Gherkin-Like Directional Keys
234 * .--------------------------------------------------------------------------------------------------------------------------------------. 234 * .--------------------------------------------------------------------------------------------------------------------------------------.
235 * | | | | | | | | | | | | | | | | 235 * | | | | | | | | | | | | | | | |
236 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------| 236 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -250,25 +250,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
250 _____________DIRECTIONS_Row__3_____________, _______, _______, _______ 250 _____________DIRECTIONS_Row__3_____________, _______, _______, _______
251), 251),
252 252
253 253/* Gherkin FN/Lighting
254/* FUNCTION
255 * .--------------------------------------------------------------------------------------------------------------------------------------. 254 * .--------------------------------------------------------------------------------------------------------------------------------------.
256 * | | | | | | | | | | | | | | | | 255 * | | | | | | | | | | | | | | | |
257 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 256 * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
258 * | | | | | | | | | | | | | | | | 257 * | | | | |
259 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 258 * | |--------+--------+--------|
260 * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | | | WHEEL+ | 259 * | 4x12 FN/Lighting LAYOUT | | | |
261 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 260 * | |--------+--------+--------|
262 * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | | | MOUS U | WHEEL- | 261 * | | | | |
263 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 262 * | |--------+--------+--------|
264 * | | | | | | | MS BT1 | | | | | | MOUS L | MOUS D | MOUS R | 263 * | | | | |
265 * '--------------------------------------------------------------------------------------------------------------------------------------' 264 * '--------------------------------------------------------------------------------------------------------------------------------------'
266 */ 265 */
266
267[_FN] = LAYOUT_75_base_wrapper( 267[_FN] = LAYOUT_75_base_wrapper(
268 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 268 _______, _______________Gherkin_FN_0________________, _______, _______, _______, _______,
269 KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U, 269 _______, _______________Gherkin_FN_1________________, _______, _______, _______, _______,
270 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, 270 _______, _______________Gherkin_FN_2________________, _______, _______, _______, _______,
271 _______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R 271 _______, _________________BLANK_50__________________, _______, _______, _______, _______
272), 272),
273 273
274}; 274};
diff --git a/users/wanleg/config.h b/users/wanleg/config.h
index 0c8b048af..d29054694 100644
--- a/users/wanleg/config.h
+++ b/users/wanleg/config.h
@@ -6,9 +6,9 @@
6 6
7 7
8//MIGHT HAVE TO SPLIT THIS INTO TWO CONDITIONS 8//MIGHT HAVE TO SPLIT THIS INTO TWO CONDITIONS
9#if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_iris_rev2) 9#if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_keebio_iris_rev2)
10//Kailh Coppers activate quickly and don't need a long tapping term 10//Kailh Coppers activate quickly and don't need a long tapping term
11#define TAPPING_TERM 100 11#define TAPPING_TERM 180
12 12
13#elif defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_bigswitch) 13#elif defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_bigswitch)
14#define TAPPING_TERM 700 14#define TAPPING_TERM 700
@@ -38,7 +38,14 @@
38#define NO_ACTION_FUNCTION 38#define NO_ACTION_FUNCTION
39#define NO_ACTION_ONESHOT 39#define NO_ACTION_ONESHOT
40 40
41// Disable mod tap interrrupt 41
42#ifndef IGNORE_MOD_TAP_INTERRUPT 42#define PERMISSIVE_HOLD
43#define IGNORE_MOD_TAP_INTERRUPT 43//// Disable mod tap interrrupt
44#endif // !mod tap interrrupt \ No newline at end of file 44//#ifndef IGNORE_MOD_TAP_INTERRUPT
45//#define IGNORE_MOD_TAP_INTERRUPT
46//#endif // !mod tap interrrupt
47
48//set max breathing brightness on kbd6x
49#if defined(KEYBOARD_kbdfans_kbd6x)
50#define RGBLIGHT_EFFECT_BREATHE_MAX 128 // 0-255
51#endif
diff --git a/users/wanleg/readme.md b/users/wanleg/readme.md
index f687b92f4..427611128 100644
--- a/users/wanleg/readme.md
+++ b/users/wanleg/readme.md
@@ -1,14 +1,125 @@
1Copyright 2018 Brian Fong @wanleg 1# Contents
2 * [Git Basics](#git-basics)
3 * [Update a Feature Branch](#update-a-development-branch)
4 * [Delete Branch Locally and Remotely](#delete-branch-locally-and-remotely)
5 * [Merge TEST branch into DEV branch](#merge-test-branch-into-dev-branch)
6 * [STM32F103C8T6 Setup](#STM32F103C8T6-setup)
7 * [Bootloader](#bootloader)
8 * [Flashing QMK](#flashing-qmk)
2 9
3This program is free software: you can redistribute it and/or modify 10---
4it under the terms of the GNU General Public License as published by 11## Git Basics
5the Free Software Foundation, either version 2 of the License, or 12### Update a Development Branch
6(at your option) any later version.
7 13
8This program is distributed in the hope that it will be useful, 14This is how to update a working branch with upstream changes.
9but WITHOUT ANY WARRANTY; without even the implied warranty of 15First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16```bash
11GNU General Public License for more details. 17$ git checkout master
18```
12 19
13You should have received a copy of the GNU General Public License 20Fetch the remote, bringing the branches and their commits from the remote repository.
14along with this program. If not, see <http://www.gnu.org/licenses/>. 21You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master
22```bash
23$ git fetch -p origin
24```
25
26Merge the changes from origin/master into your local master branch. This brings your master branch in sync with the remote repository, without losing your local changes. If your local branch didn't have any unique commits, Git will instead perform a "fast-forward".
27```bash
28$ git merge origin/master
29```
30
31Checkout the branch you want to merge into
32```bash
33$ git checkout <feature-branch>
34```
35
36Merge your (now updated) master branch into your feature branch to update it with the latest changes from your team.
37```bash
38$ git merge master
39```
40
41This will open your git-configured text editor. Edit the message as desired, save, and exit the editor.
42
43The above steps only update your local feature branch. To update it on GitHub, push your changes.
44```bash
45$ git push origin <feature-branch>
46```
47
48### Delete Branch Locally and Remotely
49
50Executive Summary
51```bash
52$ git push --delete <remote_name> <branch_name>
53$ git branch -d <branch_name>
54```
55Note that in most cases the remote name is origin.
56
57Delete Local Branch
58To delete the local branch use one of the following:
59```bash
60$ git branch -d branch_name
61$ git branch -D branch_name
62```
63Note: The -d option is an alias for --delete, which only deletes the branch if it has already been fully merged in its upstream branch. You could also use -D, which is an alias for --delete --force, which deletes the branch "irrespective of its merged status." [Source: man git-branch]
64
65Delete Remote Branch [Updated on 8-Sep-2017]
66As of Git v1.7.0, you can delete a remote branch using
67```bash
68$ git push <remote_name> --delete <branch_name>
69```
70which might be easier to remember than
71```bash
72$ git push <remote_name> :<branch_name>
73```
74which was added in Git v1.5.0 "to delete a remote branch or a tag."
75
76Starting on Git v2.8.0 you can also use `git push` with the `-d` option as an alias for `--delete`.
77
78Therefore, the version of Git you have installed will dictate whether you need to use the easier or harder syntax.
79
80### Merge TEST branch into DEV branch
81
82Executive Summary
83```bash
84$ git checkout DEV
85$ git merge TEST
86$ git push <remote_name> DEV
87$ git branch -d TEST
88$ git push <remote_name> :TEST
89```
90Note that in most cases the remote name is origin.
91The above code will merge, push to remote, and delete both the local and remote TEST branches
92
93---
94## STM32F103C8T6 Setup
95Cheap "Blue/Black Pills" typically do not come with a bootloader installed. The Black Pill uses [generic_boot20_pb12.bin](https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/binaries/generic_boot20_pb12.bin). The Blue Pill uses [generic_boot20_pc13.bin](https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/binaries/generic_boot20_pc13.bin).
96The following instructions have been adapted from [here](http://wiki.stm32duino.com/index.php?title=Burning_the_bootloader).
97### Bootloader
98Flashing a bootloader on to a Black Pill can be done via a USB to Serial converter (e.g. CP2102). This process should be roughly the same for all F103 boards.
99
1001. Download the correct bootloader binary
1012. Set the 'boot 0' pin/jumper high, and 'boot 1' low
102 B0+ to center pin
103 B1- to center pin
1043. Connect the board to the PC using a USB to serial converter
105 RX to PA9
106 TX to PA10
107 GND to Ground
108 3.3V to 3.3 Volts
1094. Download and install __Flash Loader Demonstrator__ from [here](http://www.st.com/content/st_com/en/products/development-tools/software-development-tools/stm32-software-development-tools/stm32-programmers/flasher-stm32.html)
1105. Use __Flash Loader Demonstrator__ to flash the bootloader
111 Ensure the correct COM port is selected. Leave other options with their default values/selections.
112 Use the "Download to Device" option, with "Erase necessary pages" selected
1136. After a successful flash, set 'boot 0' pin/jumper low
114 B0- to center pin
115 B1- to center pin (no change)
116
117### Flashing QMK
118As of April 2019, the `:dfu-util` target doesn't work on a \*Pill. You will need to use dfu-util directly.
1191. Use QMK to build your `.bin`
1202. Run `dfu-util.exe -d 1eaf:0003 -a 2 -D YOUR_FIRMWARE.bin"`
121 If this is the first QMK flash on the \*Pill, you will need to synchronize your Reset Button-push with starting the command. By default, the \*Pill only stays in bootloader mode for about 3 seconds before returning to normal operation.
122
123See [this page](https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader) if Windows can't see anything to upload to.
124
125---
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk
index b069cd8d3..eb66a49e6 100644
--- a/users/wanleg/rules.mk
+++ b/users/wanleg/rules.mk
@@ -36,4 +36,10 @@ ifeq ($(strip $(padc)), yes)
36endif 36endif
37ifeq ($(strip $(padl)), yes) 37ifeq ($(strip $(padl)), yes)
38 OPT_DEFS += -DPADL 38 OPT_DEFS += -DPADL
39endif
40
41#change gherkin orientation (i.e. move USB port from right side to left side)
42#example usage: make gherkin:wanleg flip=yes
43ifeq ($(strip $(flip)), yes)
44 OPT_DEFS += -DFLIP
39endif \ No newline at end of file 45endif \ No newline at end of file
diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c
index 274c74f72..aa7b1c9a4 100644
--- a/users/wanleg/wanleg.c
+++ b/users/wanleg/wanleg.c
@@ -6,20 +6,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
6 switch (keycode) { 6 switch (keycode) {
7 case QWERTY: 7 case QWERTY:
8 if (record->event.pressed) { 8 if (record->event.pressed) {
9 print("mode just switched to qwerty and this is a huge string\n");
10 set_single_persistent_default_layer(_QW); 9 set_single_persistent_default_layer(_QW);
10 #if defined(RGBLIGHT_ENABLE)
11 rgblight_sethsv_noeeprom(0,0,128);
12 rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING);
13 #endif
11 } 14 }
12 return false; 15 return false;
13 break; 16 break;
14 case GHERKIN: 17 case GHERKIN:
15 if (record->event.pressed) { 18 if (record->event.pressed) {
16 set_single_persistent_default_layer(_GK); 19 set_single_persistent_default_layer(_GK);
20 #if defined(RGBLIGHT_ENABLE)
21 rgblight_sethsv_noeeprom(128,255,64);
22 #endif
17 } 23 }
18 return false; 24 return false;
19 break; 25 break;
20 case gGHERKIN: 26 case gGHERKIN:
21 if (record->event.pressed) { 27 if (record->event.pressed) {
22 set_single_persistent_default_layer(gGK); 28 set_single_persistent_default_layer(gGK);
29 #if defined(RGBLIGHT_ENABLE)
30 rgblight_sethsv_noeeprom(128,255,128);
31 rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT);
32 #endif
23 } 33 }
24 return false; 34 return false;
25 break; 35 break;
@@ -113,6 +123,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
113 } 123 }
114 return false; 124 return false;
115 break; 125 break;
126 //on RESET, underglow red if present
127 case RESET:
128 if (record->event.pressed) {
129 #if defined(RGBLIGHT_ENABLE)
130 rgblight_enable_noeeprom(); // enables Rgb, without saving settings
131 rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
132 rgblight_sethsv_noeeprom_red();
133 #endif
134 }
135 return true; // Let QMK send the press/release events as normal
136 break;
116 } 137 }
117 return true; 138 return true;
118} 139}
@@ -128,6 +149,7 @@ void matrix_init_keymap(void) {}
128 149
129// Call user matrix init, then call the keymap's init function 150// Call user matrix init, then call the keymap's init function
130void matrix_init_user(void) { 151void matrix_init_user(void) {
152//turn off pro micro LEDs
131#if defined(KEYBOARD_lets_split_rev2) 153#if defined(KEYBOARD_lets_split_rev2)
132 DDRD &= ~(1<<5); 154 DDRD &= ~(1<<5);
133 PORTD &= ~(1<<5); 155 PORTD &= ~(1<<5);
@@ -135,5 +157,20 @@ void matrix_init_user(void) {
135 DDRB &= ~(1<<0); 157 DDRB &= ~(1<<0);
136 PORTB &= ~(1<<0); 158 PORTB &= ~(1<<0);
137#endif 159#endif
160
161//disable backlight breathing for keyboard using random flashing RGB LEDs for backlight
162//(breathing provides insufficient power to integrated LED IC)
163#if defined(KEYBOARD_kbdfans_kbd6x) && defined(BACKLIGHT_BREATHING)
164 breathing_disable();
165#endif
138 matrix_init_keymap(); 166 matrix_init_keymap();
139} \ No newline at end of file 167}
168
169//at end of firmware startup process, change powerup default layer and underglow colour for kbd6x
170void keyboard_post_init_user(void) {
171 #if defined(KEYBOARD_kbdfans_kbd6x)
172 set_single_persistent_default_layer(_QW);
173 rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 5);
174 rgblight_sethsv_noeeprom(0,0,128);
175 #endif
176}
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h
index 9d07760a7..2aea1a31e 100644
--- a/users/wanleg/wanleg.h
+++ b/users/wanleg/wanleg.h
@@ -3,7 +3,7 @@
3#include "quantum.h" 3#include "quantum.h"
4 4
5// Define layer names and order 5// Define layer names and order
6#ifdef KEYBOARD_gherkin 6#if defined(KEYBOARD_40percentclub_gherkin) || defined(KEYBOARD_kbdfans_kbd6x)
7enum userspace_layers { 7enum userspace_layers {
8 gGK = 0, 8 gGK = 0,
9 gNUM, 9 gNUM,
@@ -118,22 +118,22 @@ enum {
118// lengths consistent. 118// lengths consistent.
119 119
120 120
121/* Pure Gherkin 121/* Gherkin
122 * .-----------------------------------------------------------------------------------------. 122 * .-----------------------------------------------------------------------------------------.
123 * | Q//ESC | W | E | R | T | Y | U | I | O | P | 123 * | Q//ESC | W | E | R | T | Y | U | I | O | P |
124 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 124 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
125 * | A | S | D | F | G | H | J | K | L | SPACE | 125 * | A | S | D | F | G | H | J | K | L | SPACE |
126 * | | | | | | | | | |SFThold | 126 * | | | | | | | | | |SFThold |
127 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 127 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
128 * | Z | X | C | V/gNUM | B/gETC | N | M/gDIR | ,/GUI | ./ALT | BSPC | 128 * | Z | X | C | V/gNUM | B/gETC | N/Fn | M/gDIR | ,/GUI | ./ALT | BSPC |
129 * | SFThold| | | | | | | | |CTRLhold| 129 * | SFThold| | | | | | | | |CTRLhold|
130 * '-----------------------------------------------------------------------------------------' 130 * '-----------------------------------------------------------------------------------------'
131 */ 131 */
132#define _______________Gherkin_Row_0_______________ TD(TD_Q_ESC), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P 132#define _______________Gherkin_Row_0_______________ TD(TD_Q_ESC), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P
133#define _______________Gherkin_Row_1_______________ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SFT_T(KC_SPC) 133#define _______________Gherkin_Row_1_______________ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SFT_T(KC_SPC)
134#define _______________Gherkin_Row_2_______________ SFT_T(KC_Z), KC_X, KC_C, LT(gNUM,KC_V), LT(gETC,KC_B), KC_N, LT(gDIR,KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC) 134#define _______________Gherkin_Row_2_______________ SFT_T(KC_Z), KC_X, KC_C, LT(gNUM,KC_V), LT(gETC,KC_B), LT(_FN,KC_N), LT(gDIR,KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC)
135 135
136/* Directional Keys 136/* Gherkin Directional Keys
137 * .-----------------------------------------------------------------------------------------. 137 * .-----------------------------------------------------------------------------------------.
138 * | TAB | up | | INS | CTRL | SHIFT | PgUp | HOME | - | = | 138 * | TAB | up | | INS | CTRL | SHIFT | PgUp | HOME | - | = |
139 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 139 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -146,7 +146,7 @@ enum {
146#define _______________Gherkin_DIR_1_______________ KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC 146#define _______________Gherkin_DIR_1_______________ KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC
147#define _______________Gherkin_DIR_2_______________ KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_LALT, KC_SLSH 147#define _______________Gherkin_DIR_2_______________ KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_LALT, KC_SLSH
148 148
149/* Numbers 149/* Gherkin Numbers
150 * .-----------------------------------------------------------------------------------------. 150 * .-----------------------------------------------------------------------------------------.
151 * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | 151 * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 |
152 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 152 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -160,16 +160,16 @@ enum {
160#define _______________Gherkin_NUM_1_______________ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 160#define _______________Gherkin_NUM_1_______________ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0
161#define _______________Gherkin_NUM_2_______________ KC_F11, KC_F12, _______,_______, _______, KC_ENT, KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC) 161#define _______________Gherkin_NUM_2_______________ KC_F11, KC_F12, _______,_______, _______, KC_ENT, KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC)
162 162
163/* Et Cetera 163/* Gherkin Et Cetera
164 * .-----------------------------------------------------------------------------------------. 164 * .-----------------------------------------------------------------------------------------.
165 * | ` | mUP | | | RESET | SHIFT | mScrDn | mScrUp | | \ | 165 * | ` | mUP | | ESC | RESET | SHIFT | mScrDn | mScrUp | | \ |
166 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 166 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
167 * | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' | 167 * | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' |
168 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 168 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
169 * | Sft//Cp| CAPS | | | | C-A-D | mScrL | mScrR | ALT | DEL | 169 * | Sft//Cp| CAPS | | | | C-A-D | mScrL | mScrR | ALT | DEL |
170 * '-----------------------------------------------------------------------------------------' 170 * '-----------------------------------------------------------------------------------------'
171 */ 171 */
172#define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,_______, RESET, KC_RSFT, KC_WH_D, KC_WH_U, _______, KC_BSLS 172#define _______________Gherkin_ETC_0_______________ KC_GRV, KC_MS_U, _______,KC_ESC, RESET, KC_RSFT, KC_WH_D, KC_WH_U, _______, KC_BSLS
173#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 173#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
174#define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL 174#define _______________Gherkin_ETC_2_______________ TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)), KC_WH_L, KC_WH_R, KC_LALT, KC_DEL
175 175
@@ -180,7 +180,7 @@ enum {
180 * | TAB | A | S | D | F | G | H | J | K | L | SPACE | ' | 180 * | TAB | A | S | D | F | G | H | J | K | L | SPACE | ' |
181 * | | | | | | | | | | |SFThold | | 181 * | | | | | | | | | | |SFThold | |
182 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 182 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
183 * |SFT/CAPS| Z | X | C | V/NUM | B/ETC | N | M/DIR | ,/GUI | ./ALT | BSPC | ENT/SFT| 183 * |SFT/CAPS| Z | X | C | V/NUM | B/ETC | N/Fn | M/DIR | ,/GUI | ./ALT | BSPC | ENT/SFT|
184 * | |SFThold | | | | | | | | |CTRLhold| | 184 * | |SFThold | | | | | | | | |CTRLhold| |
185 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 185 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
186 * | LCTRL | LGUI | ALT | ONEHAND| NUM | ETC | SPACE | DIR | RGUI | ALT | DEL | CTRL | 186 * | LCTRL | LGUI | ALT | ONEHAND| NUM | ETC | SPACE | DIR | RGUI | ALT | DEL | CTRL |
@@ -188,7 +188,7 @@ enum {
188 */ 188 */
189#define _______________GherkinLike_0_______________ KC_ESC, _______________Gherkin_Row_0_______________, KC_BSPC 189#define _______________GherkinLike_0_______________ KC_ESC, _______________Gherkin_Row_0_______________, KC_BSPC
190#define _______________GherkinLike_1_______________ KC_TAB, _______________Gherkin_Row_1_______________, KC_QUOT 190#define _______________GherkinLike_1_______________ KC_TAB, _______________Gherkin_Row_1_______________, KC_QUOT
191#define _______________GherkinLike_2_______________ TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM, KC_V),LT(ETC, KC_B),KC_N, LT(DIR, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT) 191#define _______________GherkinLike_2_______________ TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM, KC_V),LT(ETC, KC_B),LT(_FN,KC_N), LT(DIR, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT)
192#define _______________GherkinLike_3_______________ KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL 192#define _______________GherkinLike_3_______________ KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
193#define _______________GherkinLike_3_OneHand_______ KC_LCTL, KC_LGUI, KC_LALT, ONEHAND, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, ONEHAND, KC_RCTL 193#define _______________GherkinLike_3_OneHand_______ KC_LCTL, KC_LGUI, KC_LALT, ONEHAND, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, ONEHAND, KC_RCTL
194 194
@@ -241,7 +241,7 @@ enum {
241#define _______________SUBTER_Row__2_______________ _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_RGUI,ALT_T(KC_DOT), CTL_T(KC_BSPC), _______ 241#define _______________SUBTER_Row__2_______________ _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_RGUI,ALT_T(KC_DOT), CTL_T(KC_BSPC), _______
242#define _______________SUBTER_Row__3_______________ _______, _______, GHERKIN, _______, _______, _______, KC_ENT, KC_LSFT, _______,_______, _______, _______ 242#define _______________SUBTER_Row__3_______________ _______, _______, GHERKIN, _______, _______, _______, KC_ENT, KC_LSFT, _______,_______, _______, _______
243 243
244/* Gherkin Numbers 244/* Gherkin-Like Numbers
245 * .-----------------------------------------------------------------------------------------------------------. 245 * .-----------------------------------------------------------------------------------------------------------.
246 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | BSPC | 246 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | BSPC |
247 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 247 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -259,7 +259,7 @@ enum {
259#define _______________NUMBERS_Row_3_______________ _______, _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______, _______ 259#define _______________NUMBERS_Row_3_______________ _______, _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______, _______
260 260
261 261
262/* Gherkin Directional Keys 262/* Gherkin-Like Directional Keys
263 * .-----------------------------------------------------------------------------------------------------------. 263 * .-----------------------------------------------------------------------------------------------------------.
264 * | | TAB | up | | INS | CTRL | SHIFT | PgUp | HOME | - | = | DEL | 264 * | | TAB | up | | INS | CTRL | SHIFT | PgUp | HOME | - | = | DEL |
265 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 265 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -275,9 +275,9 @@ enum {
275#define _____________DIRECTIONS_Row__2_____________ _______, _______________Gherkin_DIR_2_______________, _______ 275#define _____________DIRECTIONS_Row__2_____________ _______, _______________Gherkin_DIR_2_______________, _______
276#define _____________DIRECTIONS_Row__3_____________ _______, _______, QWERTY, _______, _______, _______, _______, _______, _______, _______, _______, _______ 276#define _____________DIRECTIONS_Row__3_____________ _______, _______, QWERTY, _______, _______, _______, _______, _______, _______, _______, _______, _______
277 277
278/* Gherkin Et Cetera 278/* Gherkin-Like Et Cetera
279 * .-----------------------------------------------------------------------------------------------------------. 279 * .-----------------------------------------------------------------------------------------------------------.
280 * | | ` | mUP | | | RESET | SHIFT | mScrUp |mScrDown| | \ | DEL | 280 * | | ` | mUP | | | RESET | SHIFT | mScrDn | mScrUp | | \ | DEL |
281 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 281 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
282 * | | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' | | 282 * | | mLeft | mDown | mRight | | SHIFT | mBtn3 | mBtn1 | mBtn2 | ; | ' | |
283 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 283 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -290,7 +290,7 @@ enum {
290#define ______________ETCETERA_Row__1______________ _______, _______________Gherkin_ETC_1_______________, _______ 290#define ______________ETCETERA_Row__1______________ _______, _______________Gherkin_ETC_1_______________, _______
291#define ______________ETCETERA_Row__2______________ _______, _______________Gherkin_ETC_2_______________, _______ 291#define ______________ETCETERA_Row__2______________ _______, _______________Gherkin_ETC_2_______________, _______
292#define ______________ETCETERA_Row__3______________ _______, _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______, _______ 292#define ______________ETCETERA_Row__3______________ _______, _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______, _______
293 293
294/* Single 4x4 board only 294/* Single 4x4 board only
295 * .-----------------------------------. 295 * .-----------------------------------.
296 * | 7 | 8 | 9 | BSPC | 296 * | 7 | 8 | 9 | BSPC |
@@ -307,3 +307,16 @@ enum {
307#define _______________NUMPAD_Row__1_______________ KC_KP_4, KC_KP_5, KC_KP_6, KC_SPC 307#define _______________NUMPAD_Row__1_______________ KC_KP_4, KC_KP_5, KC_KP_6, KC_SPC
308#define _______________NUMPAD_Row__2_______________ KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT 308#define _______________NUMPAD_Row__2_______________ KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT
309#define _______________NUMPAD_Row__3_______________ KC_KP_0, TD(LYR_TAP_DANCE), KC_KP_DOT, KC_PMNS 309#define _______________NUMPAD_Row__3_______________ KC_KP_0, TD(LYR_TAP_DANCE), KC_KP_DOT, KC_PMNS
310
311/* Gherkin FN/Lighting
312 * .-----------------------------------------------------------------------------------------------------.
313 * | BL_breathe | BL_brite- | BL_brite+ | BL_toggle | BL_briteCyc | BL_briteMax | | | | |
314 * |------------+-----------+-----------+-----------+-------------+-------------+-----+-----+-----+------|
315 * | UG_breathe | UG_brite- | UG_brite+ | UG_toggle | UG_modeCycle| | | | | |
316 * |------------+-----------+-----------+-----------+-------------+-------------+-----+-----+-----+------|
317 * | UG_hue- | UG_hue+ | UG_sat- | UG_sat+ | | | | | |QWERTY|
318 * '-----------------------------------------------------------------------------------------------------'
319 */
320#define _______________Gherkin_FN_0________________ BL_BRTG, BL_DEC, BL_INC, BL_TOGG, BL_STEP, BL_ON, _______, _______, _______, _______
321#define _______________Gherkin_FN_1________________ RGB_M_B, RGB_VAD, RGB_VAI, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______
322#define _______________Gherkin_FN_2________________ RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, QWERTY