aboutsummaryrefslogtreecommitdiffstats
path: root/layouts/community
diff options
context:
space:
mode:
Diffstat (limited to 'layouts/community')
-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
8 files changed, 67 insertions, 36 deletions
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 @@
//QMK DFU settings (ProMicro boards)
// set top left key as bootloader mode escape key on Gherkin
-#if defined(KEYBOARD_gherkin)
+#if defined(KEYBOARD_40percentclub_gherkin) && !defined(FLIP)
#define QMK_LED B0
#define QMK_ESC_OUTPUT B4 // usually COL
#define QMK_ESC_INPUT F7 // usually ROW
#endif
+
+//change gherkin orientation (i.e. move USB port from right side to left side)
+#if defined(KEYBOARD_40percentclub_gherkin) && defined(FLIP)
+//need to fix QMKdfu setting:
+#define QMK_ESC_OUTPUT B6 // usually COL
+#define QMK_ESC_INPUT D0 // usually ROW
+#define QMK_LED B0
+
+//need to undefine standard 4x4 array before defining alternate ProMicro array
+#undef MATRIX_ROW_PINS
+#undef MATRIX_COL_PINS
+//standard config:
+//#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
+//#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
+#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
+#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4 }
+#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] = {
_______________Gherkin_ETC_2_______________
),
+[_FN] = LAYOUT_ortho_3x10_wrapper(
+ _______________Gherkin_FN_0________________,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
};
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 @@
-![Gherkin Wanleg Layout Image](https://i.imgur.com/nCPog2W.png)
+![Gherkin Wanleg Layout Image](https://i.imgur.com/iNkR90W.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.
Here 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
| Arduino | ProMicro |
| --- | --- |
| 10 | RST |
-| 11 | 16 |
-| 12 | 14 |
-| 13 | 15 |
+| 11 (MOSI) | 16 |
+| 12 (MISO) | 14 |
+| 13 (SCK) | 15 |
| GND | GND |
| 5V | VCC |
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 @@
-SWAP_HANDS_ENABLE = no
-
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 @@
#define EE_HANDS
#endif
+// set top left key as bootloader mode escape key on Nori
+#if defined(KEYBOARD_40percentclub_nori)
+#define QMK_LED B0
+#define QMK_ESC_OUTPUT F4 // usually COL
+#define QMK_ESC_INPUT D3 // usually ROW
+#endif
+
// set top left key as bootloader mode escape key on 4x4 48key layout
#if defined(KEYBOARD_40percentclub_4x4) && !defined(PRO_MICRO)
#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] = {
_____________DIRECTIONS_Row__2_____________,
_______, _______, ONEHAND, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
-#elif defined(KEYBOARD_40percentclub_4x4)
+#elif defined(KEYBOARD_40percentclub_4x4) || defined(KEYBOARD_40percentclub_nori)
[_GK] = LAYOUT_ortho_4x12_wrapper(
_______________GherkinLike_0_______________,
_______________GherkinLike_1_______________,
@@ -36,14 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______________NUMPAD_Row__3_______________
),
-#elif defined(KEYBOARD_jj40)
-[_GK] = LAYOUT_ortho_4x12_wrapper(
- _______________GherkinLike_0_______________,
- _______________GherkinLike_1_______________,
- _______________GherkinLike_2_______________,
- TD(RST_TAP_DANCE), BL_TOGG, BL_STEP, BL_BRTG, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
-),
-
#else
[_GK] = LAYOUT_ortho_4x12_wrapper(
_______________GherkinLike_0_______________,
@@ -94,4 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
______________ETCETERA_Row__3______________
),
+[_FN] = LAYOUT_ortho_4x12_wrapper(
+ _______, _______________Gherkin_FN_0________________, _______,
+ _______, _______________Gherkin_FN_0________________, _______,
+ _______, _______________Gherkin_FN_0________________, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
};
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
ifeq ($(strip $(KEYBOARD)), planck/rev6)
AUDIO_ENABLE = yes
+endif
+
+#disable RGB on version 1 of jj40 keyboard (does not exist)
+ifeq ($(strip $(KEYBOARD)), jj40)
+ RGBLIGHT_ENABLE = no
endif \ 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 @@
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
) \
LAYOUT_ortho_5x15_wrapper( \
- 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, \
+ 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, \
K00, K01, K02, K03, K04, K05, K0c, K0d, K0e, K06, K07, K08, K09, K0a, K0b, \
K10, K11, K12, K13, K14, K15, K1c, K1d, K1e, K16, K17, K18, K19, K1a, K1b, \
K20, K21, K22, K23, K24, K25, K2c, K2d, K2e, K26, K27, K28, K29, K2a, K2b, \
@@ -26,7 +26,7 @@
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
) \
LAYOUT_ortho_5x15_wrapper( \
- 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, \
+ 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, \
K0c, K0d, K0e, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
K1c, K1d, K1e, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
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] = {
),
#endif
#else
- /* Gherkin
+ /* Gherkin-Like
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | NUMLOCK| qwerty | gherkin| FN |
* |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
@@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________________SUPRA_Row_3________________, _______, _______, _______
),
-/* Gherkin Numbers
+/* Gherkin-Like Numbers
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -210,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______________NUMBERS_Row_3_______________, _______, _______, _______
),
-/* Gherkin Et Cetera
+/* Gherkin-Like Et Cetera
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
______________ETCETERA_Row__3______________, _______, _______, _______
),
-/* Gherkin Directional Keys
+/* Gherkin-Like Directional Keys
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -250,25 +250,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_____________DIRECTIONS_Row__3_____________, _______, _______, _______
),
-
-/* FUNCTION
+/* Gherkin FN/Lighting
* .--------------------------------------------------------------------------------------------------------------------------------------.
* | | | | | | | | | | | | | | | |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | | | | | | | | | | | | | | | |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | | | WHEEL+ |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | 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- |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | | | | | | | MS BT1 | | | | | | MOUS L | MOUS D | MOUS R |
+ * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
+ * | | | | |
+ * | |--------+--------+--------|
+ * | 4x12 FN/Lighting LAYOUT | | | |
+ * | |--------+--------+--------|
+ * | | | | |
+ * | |--------+--------+--------|
+ * | | | | |
* '--------------------------------------------------------------------------------------------------------------------------------------'
*/
+
[_FN] = LAYOUT_75_base_wrapper(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- 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,
- 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
+ _______, _______________Gherkin_FN_0________________, _______, _______, _______, _______,
+ _______, _______________Gherkin_FN_1________________, _______, _______, _______, _______,
+ _______, _______________Gherkin_FN_2________________, _______, _______, _______, _______,
+ _______, _________________BLANK_50__________________, _______, _______, _______, _______
),
};
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 11:45:07 +0000