Version 37 (2024-09-15)

sunaku · Sep 16, 2024 · 1e21101 · 1e21101
1 parent 7ccb995
commit 1e21101
Show file tree

Hide file tree

Showing 8 changed files with 1,826 additions and 1,840 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ also provided as "training wheels" to aid your transition to the full glory.
 
 ## Keymap
 
-Version 36 (2024-03-21)
-- Changes: https://github.com/sunaku/glove80-keymaps/releases/v36
-- Release: https://my.glove80.com/#/layout/user/f4372744-fce9-4678-ac4b-3d8ef8768160
+Version 37 (2024-09-15)
+- Changes: https://github.com/sunaku/glove80-keymaps/releases/v37
+- Release: https://my.glove80.com/#/layout/user/13c16910-9689-4408-a392-39a6e0e15162
 
 ### Legend
 
@@ -117,14 +117,21 @@ provides a difficulty level setting (like in a video game) that you can set:
 //
 // DIFFICULTY_LEVEL specifies your level of expertise with this keymap.
 // It's meant to help newcomers gradually work their way up to mastery.
-// You can disable this setting by omitting it or assigning a `0` zero.
 //
-#define DIFFICULTY_LEVEL 0 // custom (see defaults below)
 #define DIFFICULTY_LEVEL 1 // novice (500ms)
 #define DIFFICULTY_LEVEL 2 // slower (400ms)
 #define DIFFICULTY_LEVEL 3 // normal (300ms)
 #define DIFFICULTY_LEVEL 4 // faster (200ms)
 #define DIFFICULTY_LEVEL 5 // expert (100ms)
+//
+// You can disable this setting by omitting it or assigning a `0` zero,
+// in which case it will default to my personal set of time thresholds.
+//
+#define DIFFICULTY_LEVEL 0 // sunaku (150ms)
+//
+// No matter what difficulty level you choose, you can always override
+// any settings in this keymap at the beginning of this configuration.
+//
 ```
 
 Unless you're already proficient in using home row mods, you might consider

diff --git a/README/all-layer-diagrams.pdf b/README/all-layer-diagrams.pdf
diff --git a/README/function-layer-diagram.json b/README/function-layer-diagram.json
@@ -94,7 +94,7 @@
       "g": false,
       "a": 7
     },
-    "Web <small>browser</small>",
+    "Calc<small>-ulator</small>",
     {
       "c": "#dcedc8",
       "f": 4
@@ -151,7 +151,7 @@
       "a": 7,
       "f": 3
     },
-    "Calc<small>-ulator</small>",
+    "Web <small>browser</small>",
     {
       "c": "#dcedc8",
       "f": 4,

diff --git a/README/function-layer-diagram.png b/README/function-layer-diagram.png
diff --git a/keymap.dtsi b/keymap.dtsi
@@ -7,7 +7,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 //
-// Sunaku's Keymap v36 -- "Glorious Engrammer"
+// Sunaku's Keymap v37 -- "Glorious Engrammer"
 // - https://github.com/sunaku/glove80-keymaps
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -209,7 +209,7 @@
 #define KEY_RH_C4R4 S
 #define KEY_RH_C5R4 N
 #define KEY_RH_C6R4 Q
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 G
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 J
@@ -226,16 +226,16 @@
 #define KEY_RH_C3R5 M
 #define KEY_RH_C4R5 F
 #define KEY_RH_C5R5 P
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -291,7 +291,7 @@
 #define KEY_RH_C4R4 S
 #define KEY_RH_C5R4 N
 #define KEY_RH_C6R4 Q
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 G
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 J
@@ -308,16 +308,16 @@
 #define KEY_RH_C3R5 M
 #define KEY_RH_C4R5 F
 #define KEY_RH_C5R5 P
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -373,7 +373,7 @@
 #define KEY_RH_C4R4 N
 #define KEY_RH_C5R4 S
 #define KEY_RH_C6R4 MINUS
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 SEMI
 #define KEY_LH_C4R5 Q
 #define KEY_LH_C3R5 J
@@ -390,16 +390,16 @@
 #define KEY_RH_C3R5 W
 #define KEY_RH_C4R5 V
 #define KEY_RH_C5R5 Z
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -455,7 +455,7 @@
 #define KEY_RH_C4R4 I
 #define KEY_RH_C5R4 O
 #define KEY_RH_C6R4 SQT
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 Z
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 C
@@ -472,16 +472,16 @@
 #define KEY_RH_C3R5 COMMA
 #define KEY_RH_C4R5 DOT
 #define KEY_RH_C5R5 FSLH
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -537,7 +537,7 @@
 #define KEY_RH_C4R4 I
 #define KEY_RH_C5R4 O
 #define KEY_RH_C6R4 SQT
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 Z
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 C
@@ -554,16 +554,16 @@
 #define KEY_RH_C3R5 COMMA
 #define KEY_RH_C4R5 DOT
 #define KEY_RH_C5R5 FSLH
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -619,7 +619,7 @@
 #define KEY_RH_C4R4 L
 #define KEY_RH_C5R4 SEMI
 #define KEY_RH_C6R4 SQT
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 Z
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 C
@@ -636,16 +636,16 @@
 #define KEY_RH_C3R5 COMMA
 #define KEY_RH_C4R5 DOT
 #define KEY_RH_C5R5 FSLH
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -701,7 +701,7 @@
 #define KEY_RH_C4R4 O
 #define KEY_RH_C5R4 H
 #define KEY_RH_C6R4 SQT
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 Z
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 C
@@ -718,16 +718,16 @@
 #define KEY_RH_C3R5 COMMA
 #define KEY_RH_C4R5 DOT
 #define KEY_RH_C5R5 FSLH
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -783,7 +783,7 @@
 #define KEY_RH_C4R4 O
 #define KEY_RH_C5R4 I
 #define KEY_RH_C6R4 SQT
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 Z
 #define KEY_LH_C4R5 X
 #define KEY_LH_C3R5 M
@@ -800,16 +800,16 @@
 #define KEY_RH_C3R5 COMMA
 #define KEY_RH_C4R5 DOT
 #define KEY_RH_C5R5 FSLH
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR
@@ -865,7 +865,7 @@
 #define KEY_RH_C4R4 O
 #define KEY_RH_C5R4 I
 #define KEY_RH_C6R4 SQT
-#define KEY_LH_C6R5 LSHFT
+#define KEY_LH_C6R5 LSFT
 #define KEY_LH_C5R5 F
 #define KEY_LH_C4R5 M
 #define KEY_LH_C3R5 V
@@ -882,16 +882,16 @@
 #define KEY_RH_C3R5 X
 #define KEY_RH_C4R5 K
 #define KEY_RH_C5R5 Y
-#define KEY_RH_C6R5 RSHFT
+#define KEY_RH_C6R5 RSFT
 #define KEY_LH_C6R6 0
 #define KEY_LH_C5R6 HOME
 #define KEY_LH_C4R6 PG_UP
 #define KEY_LH_C3R6 PG_DN
 #define KEY_LH_C2R6 END
 #define KEY_LH_T4 BACKSPACE
 #define KEY_LH_T5 DELETE
-#define KEY_LH_T6 LSFT
-#define KEY_RH_T6 LSFT
+#define KEY_LH_T6 0
+#define KEY_RH_T6 0
 #define KEY_RH_T5 TAB
 #define KEY_RH_T4 SPACE
 #define KEY_RH_C2R6 LPAR

diff --git a/keymap.dtsi.erb b/keymap.dtsi.erb
@@ -7,7 +7,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 //
-// Sunaku's Keymap v36 -- "Glorious Engrammer"
+// Sunaku's Keymap v37 -- "Glorious Engrammer"
 // - https://github.com/sunaku/glove80-keymaps
 //
 //////////////////////////////////////////////////////////////////////////////