summaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
authorwanleg <32079073+wanleg@users.noreply.github.com>2018-10-19 11:01:40 -0700
committerDrashna Jaelre <drashna@live.com>2018-10-19 11:01:40 -0700
commit6f6d28fa8d81063691d2fd11540675eaa5b6989c (patch)
tree6a80736f959e9b4029bc180304b790c06d391e12 /layouts
parent9ca73a9edcb8cfaeba13baae16b8c8cc5c9fafe6 (diff)
Big Switch and 5x5 edits (#4168)
* 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
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ortho_3x10/wanleg/readme.md9
-rw-r--r--layouts/community/ortho_5x10/wanleg/config.h9
-rw-r--r--layouts/community/ortho_5x10/wanleg/keymap.c38
-rw-r--r--layouts/community/ortho_5x10/wanleg/rules.mk3
-rw-r--r--layouts/community/ortho_5x15/wanleg/config.h11
-rw-r--r--layouts/community/ortho_5x15/wanleg/keymap.c89
-rw-r--r--layouts/community/ortho_5x5/layout.json1
-rw-r--r--layouts/community/ortho_5x5/readme.md3
8 files changed, 85 insertions, 78 deletions
diff --git a/layouts/community/ortho_3x10/wanleg/readme.md b/layouts/community/ortho_3x10/wanleg/readme.md
index ef6c1f9dbb..8696cccf6b 100644
--- a/layouts/community/ortho_3x10/wanleg/readme.md
+++ b/layouts/community/ortho_3x10/wanleg/readme.md
@@ -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*
diff --git a/layouts/community/ortho_5x10/wanleg/config.h b/layouts/community/ortho_5x10/wanleg/config.h
deleted file mode 100644
index 2d24f2771b..0000000000
--- a/layouts/community/ortho_5x10/wanleg/config.h
+++ /dev/null
@@ -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
diff --git a/layouts/community/ortho_5x10/wanleg/keymap.c b/layouts/community/ortho_5x10/wanleg/keymap.c
deleted file mode 100644
index 5d06e53ae4..0000000000
--- a/layouts/community/ortho_5x10/wanleg/keymap.c
+++ /dev/null
@@ -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)), _______, _______, _______, _______
-),
-
-};
diff --git a/layouts/community/ortho_5x10/wanleg/rules.mk b/layouts/community/ortho_5x10/wanleg/rules.mk
deleted file mode 100644
index 90841d2abe..0000000000
--- a/layouts/community/ortho_5x10/wanleg/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SWAP_HANDS_ENABLE = no
-
-BOOTLOADER = qmk-dfu \ No newline at end of file
diff --git a/layouts/community/ortho_5x15/wanleg/config.h b/layouts/community/ortho_5x15/wanleg/config.h
index a55fc6a3eb..1043986f7a 100644
--- a/layouts/community/ortho_5x15/wanleg/config.h
+++ b/layouts/community/ortho_5x15/wanleg/config.h
@@ -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 \ 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 7731edb6a2..df74241157 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -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)), _______, _______, _______, _______
+),
};
diff --git a/layouts/community/ortho_5x5/layout.json b/layouts/community/ortho_5x5/layout.json
new file mode 100644
index 0000000000..ab4eef8e1b
--- /dev/null
+++ b/layouts/community/ortho_5x5/layout.json
@@ -0,0 +1 @@
+["","","","",""],["","","","",""],["","","","",""],["","","","",""],["","","","",""]
diff --git a/layouts/community/ortho_5x5/readme.md b/layouts/community/ortho_5x5/readme.md
new file mode 100644
index 0000000000..3dd75765d1
--- /dev/null
+++ b/layouts/community/ortho_5x5/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x5
+
+ LAYOUT_ortho_5x5 \ No newline at end of file