diff --git a/colemak-dhm/colemak-dhm.ino b/colemak-dhm/colemak-dhm.ino
index 5d54185..94268d5 100644
--- a/colemak-dhm/colemak-dhm.ino
+++ b/colemak-dhm/colemak-dhm.ino
@@ -65,28 +65,27 @@ KEYMAPS(
Key_de_Q ,Key_de_W ,Key_de_F ,Key_de_P ,Key_de_B
,Key_de_A ,Key_de_R ,Key_de_S ,Key_de_T ,Key_de_G
,Key_de_Y ,Key_de_X ,Key_de_C ,Key_de_D ,Key_de_V ,Key_de_Hash
- ,Key_de_Tab ,Key_de_Tab ,Key_LeftGui ,Key_de_LeftShift ,Key_de_Spacebar ,Key_de_Escape
+ ,Key_de_Tab ,___ ,___ ,Key_de_Delete ,Key_de_Spacebar ,Key_de_Escape
,Key_de_J ,Key_de_L ,Key_de_U ,Key_de_Z ,Key_de_Semicolon
,Key_de_M ,Key_de_N ,Key_de_E ,Key_de_I ,Key_de_O
,Key_de_LessThan ,Key_de_K ,Key_de_H ,Key_de_Comma ,Key_de_Period ,Key_de_Slash
- ,Key_de_LeftAlt ,MO(SYMBOLS) ,Key_de_Backspace ,MO(NAVI) ,TG(GAME) ,Key_Enter
+ ,Key_de_LeftAlt ,MO(SYMBOLS) ,Key_de_Backspace ,___ ,TG(GAME) ,Key_Enter
),
-
[SYMBOLS] = KEYMAP_STACKED
(
Key_de_ExlamationMark ,Key_de_DoubleQuote ,Key_de_QuestionMark ,Key_de_Dollar ,Key_de_Percent
- ,Key_de_Tilde ,Key_de_LeftCurly ,Key_de_LeftParen ,Key_de_LeftBracket ,Key_de_Quote
- ,Key_de_Pipe ,Key_de_RightCurly ,Key_de_RightParen ,Key_de_RightBracket ,Key_de_Backslash ,Key_de_At
- ,___ ,___ ,___ ,Key_de_LeftShift ,Key_de_Spacebar ,___
+ ,Key_de_LessThan ,Key_de_LeftCurly ,Key_de_LeftParen ,Key_de_LeftBracket ,Key_de_Quote
+ ,Key_de_GreaterThan ,Key_de_RightCurly ,Key_de_RightParen ,Key_de_RightBracket ,Key_de_Backslash ,Key_de_At
+ ,___ ,___ ,___ ,Key_de_Pipe ,Key_de_Tilde ,Key_de_Ampersand
,Key_de_Slash ,Key_de_7 ,Key_de_8 ,Key_de_9 ,Key_de_Plus
,Key_de_Asterisk ,Key_de_4 ,Key_de_5 ,Key_de_6 ,Key_de_Minus
- ,Key_de_GreaterThan ,Key_de_0 ,Key_de_1 ,Key_de_2 ,Key_de_3 ,Key_de_Equals
- ,___ ,___ ,___ ,Key_de_Comma ,Key_de_Period ,Key_de_Equals
+ ,Key_de_Backtick ,Key_de_0 ,Key_de_1 ,Key_de_2 ,Key_de_3 ,Key_de_Equals
+ ,___ ,___ ,___ ,___ ,___ ,Key_de_Equals
),
[NAVI] = KEYMAP_STACKED
@@ -171,10 +170,10 @@ const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) {
void setup() {
QUKEYS(
- //Qukey(layer, key_addr, alternate_key)
+ // Qukey(layer, key_addr, alternate_key)
- //umlaute
- // kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 2), Key_de_SS), // s -> ß
+ // Umlauts
+ kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 2), Key_de_SS), // s -> ß
kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 0), Key_de_AUml), // a -> ä
// kaleidoscope::plugin::Qukey(SHIFT, KeyAddr(1, 0), LSHIFT(Key_de_AUml)), // A -> Ä
kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 11), Key_de_OUml), // o -> ö
@@ -185,22 +184,22 @@ void setup() {
//common special characters
kaleidoscope::plugin::Qukey(BASE, KeyAddr(0, 0), Key_de_At), // q -> @
kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 9), Key_de_Euro), // e -> €
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 8), Key_de_Tilde), // n -> ~
//layer shifts/switches
kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 0), Key_de_LeftControl), // bottom left TAB to LCtrl
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 11), Key_de_LeftControl), // bottom right Enter to LCtrl
+ kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 3), Key_de_LeftShift), // left thumb to shift
+ kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 8), Key_de_RightShift), // right thumb to shift
+ kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 11), Key_de_RightControl), // bottom right Enter to LCtrl
kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 5), Key_LeftGui), // Esc to SUPER
kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 7), MO(MOUSE)), // M key to mouse layer
kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 4), MO(NAVI)), // Space to NAVI layer
- // kaleidoscope::plugin::Qukey(BASE, KeyAddr(3, 8), MO(NAVI)), // Backspace to NAVI layer
- //hold for "ctrl+" version of the key
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 2), LCTRL(Key_de_C)), // c copy
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 4), LCTRL(Key_de_V)), // v paste
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 1), LCTRL(Key_de_X)), // x cut
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 0), LCTRL(Key_de_Z)), // z undo
- kaleidoscope::plugin::Qukey(BASE, KeyAddr(0, 10), LCTRL(Key_de_Y)), // y redo
+ // hold for "ctrl+" version of the key
+ // kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 2), LCTRL(Key_de_C)), // c copy
+ // kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 4), LCTRL(Key_de_V)), // v paste
+ // kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 1), LCTRL(Key_de_X)), // x cut
+ // kaleidoscope::plugin::Qukey(BASE, KeyAddr(2, 0), LCTRL(Key_de_Z)), // z undo
+ // kaleidoscope::plugin::Qukey(BASE, KeyAddr(0, 10), LCTRL(Key_de_Y)), // y redo
// kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 3), LCTRL(Key_de_F)), // f find
// kaleidoscope::plugin::Qukey(BASE, KeyAddr(0, 8), LCTRL(Key_de_L)), // l select address bar
// kaleidoscope::plugin::Qukey(BASE, KeyAddr(1, 1), LCTRL(Key_de_R)), // r reload page
@@ -216,7 +215,7 @@ void setup() {
//Qukey settings
Qukeys.setHoldTimeout(490);
Qukeys.setMaxIntervalForTapRepeat(100);
- Qukeys.setOverlapThreshold(50);
+ Qukeys.setOverlapThreshold(80);
Kaleidoscope.setup();
SpaceCadet.disable();
MouseKeys.setSpeedLimit(100);
diff --git a/keyboard-layout-colemak-DHm.json b/keyboard-layout-colemak-DHm.json
index 95a3d50..ed5d3f9 100644
--- a/keyboard-layout-colemak-DHm.json
+++ b/keyboard-layout-colemak-DHm.json
@@ -119,7 +119,7 @@
"y": -0.75,
"t": "#267dff\n\n\n\n\n\n\n\n\n000000\n#b906d6"
},
- "~\n\n\n\n\n\n\n\n\nA\nÄ"
+ "<\n\n\n\n\n\n\n\n\nA\nÄ"
],
[
{
@@ -147,7 +147,7 @@
"}\n\n\n\nCtrl+X\n\n\n\n\nX",
{
"x": 1,
- "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000",
+ "t": "267dff\n\n\n#c76c00\n\n\n\n\n\n000000",
"f": 3
},
"]\n\n\n\n\n\n\n\n\nD"
@@ -157,7 +157,7 @@
"y": -0.75,
"t": "#267dff\n\n\n\n\n\n\n\n\n000000"
},
- "|\n\n\n\n\n\n\n\n\nY",
+ ">\n\n\n\n\n\n\n\n\nY",
{
"x": 4,
"t": "#267dff"
@@ -186,7 +186,8 @@
"a": 7,
"fa": [
9
- ]
+ ],
+ "d": true
},
""
],
@@ -194,52 +195,67 @@
{
"y": -0.6499999999999999,
"x": 1,
- "f": 6
+ "f": 6,
+ "d": true
},
"",
{
"x": 1,
+ "t": "#267dff\n\n\n\n#b906d6",
+ "a": 4,
"f": 3,
"fa": [
- 6
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 5
]
},
- ""
+ "|\n\n\n\n\n\n\n\n\n"
],
[
{
"y": -0.75,
- "t": "#000000\n\n\n\n#b906d6"
+ "t": "#000000\n\n\n\n#b906d6",
+ "a": 7,
+ "fa": [
+ 6
+ ]
},
"\n\n\n\nCtrl",
{
"x": 4,
- "t": "#000000\n#1fa12e\n\n\n#b906d6",
+ "t": "#267dff\n#1fa12e\n\n\n#b906d6",
"a": 4,
- "fa": [
- 6,
- 2
- ]
+ "f2": 2
},
- "\nScr \n\n\n LGui\n\n\n\n\nEsc"
+ "&\nScr \n\n\n LGui\n\n\n\n\nEsc"
],
[
{
"y": -0.8999999999999999,
- "x": 4
+ "x": 4,
+ "f2": 2
},
- "\nLclick\n\n\nNAV\n\n\n\n\nSpace"
+ "~\nLclick\n\n\nNAV\n\n\n\n\nSpace"
],
[
{
"r": -10,
"y": -0.34999999999999964,
"x": 4.75,
- "t": "#000000",
- "a": 5,
- "f": 3
+ "t": "#267dff",
+ "fa": [
+ 9
+ ]
},
- ">\n\n\n\n\n\n<"
+ "`\n\n\n\n\n\n\n\n>\n<"
],
[
{
@@ -248,7 +264,6 @@
"y": -0.20000000000000018,
"x": 2,
"t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6",
- "a": 4,
"fa": [
0,
1,
@@ -307,20 +322,29 @@
"y": -0.7000000000000002,
"x": 2,
"t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000",
- "f2": 1
+ "fa": [
+ 4,
+ 1,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1
+ ]
},
"5\ncenter\n\n\n\n\n\n\n\nE"
],
[
{
"y": -0.6499999999999999,
- "x": 1,
- "f2": 1
+ "x": 1
},
"4\nW\n\n\n\n\n\n\n\nN",
{
- "x": 1,
- "f2": 1
+ "x": 1
},
"6\nE\n\n\n\n\n\n\n\nI"
],
@@ -332,13 +356,13 @@
"fa": [
0,
1,
- 1,
0,
- 1,
- 1,
- 1,
- 1,
- 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
0,
2
]
@@ -358,7 +382,18 @@
"y": -0.7000000000000002,
"x": 2,
"t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000",
- "f2": 1
+ "fa": [
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1
+ ]
},
"2\nS\n\n\n\n\n\n\n;\n,"
],
@@ -366,14 +401,12 @@
{
"y": -0.6499999999999999,
"x": 1,
- "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n\n000000",
- "f2": 1
+ "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n\n000000"
},
"1\nSW\n\n\n\n\n\n\n\nH",
{
"x": 1,
- "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000",
- "f2": 1
+ "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000"
},
"3\nSE\n\n\n\n\n\n\n:\n."
],
@@ -400,8 +433,9 @@
{
"y": -0.6999999999999997,
"x": 2,
- "c": "#c76c00",
+ "c": "",
"t": "#267dff",
+ "g": true,
"sm": "cherry",
"sb": "nimxo",
"fa": [
@@ -416,20 +450,15 @@
"x": 1,
"c": "#cccccc",
"t": "#000000\n\n\n\n#b906d6",
+ "g": false,
"sm": "alps",
"sb": "matias",
- "a": 5,
+ "a": 7,
"fa": [
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
5
]
},
- "\n\n\n\nNAV\n\n",
+ "\n\n\n\nNAV",
{
"x": 1,
"c": "#1cc700",
@@ -437,7 +466,8 @@
"a": 4,
"fa": [
4
- ]
+ ],
+ "d": true
},
".\n\n\n\n\n\n\n\n\nGAME"
],
@@ -458,7 +488,7 @@
{
"y": -0.8849999999999998,
"x": 4,
- "t": "#267dff\n\n\n\n#b906d6",
+ "t": "#267dff",
"f": 8,
"fa": [
4
@@ -470,7 +500,7 @@
{
"y": -0.9000000000000004,
"c": "#267dff",
- "t": "#000000\n#00ff19",
+ "t": "#000000\n#00ff19\n\n\n#b906d6",
"f": 3,
"fa": [
0,
@@ -482,9 +512,9 @@
0,
0,
0,
- 2
+ 0
]
},
- "\nRclick\n\n\n\n\n\n\n\nSYMB"
+ "\nRclick\n\n\nSYMB"
]
]
\ No newline at end of file
diff --git a/keyboard-layout-colemak-DHm.png b/keyboard-layout-colemak-DHm.png
index 43a0ef6..0d0dc3b 100644
Binary files a/keyboard-layout-colemak-DHm.png and b/keyboard-layout-colemak-DHm.png differ