feat: rst_boot, page up + down, more F keys

villalj · villalj · commit e66ae14918f8 · 2024-10-10T15:03:10.000-04:00
diff --git a/keymap-drawer/corneish_zen.svg b/keymap-drawer/corneish_zen.svg
@@ -93,6 +93,12 @@
 <svg id="mdi:transfer">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-transfer" viewBox="0 0 24 24"><path d="M8 4A2 2 0 0 0 6 6V10H8V6H16V9H13.5L17 12.5L20.5 9H18V6A2 2 0 0 0 16 4H8M3 12V14H11V12H3M3 15V17H11V15H3M13 15V17H21V15H13M3 18V20H11V18H3M13 18V20H21V18H13Z" /></svg>
 </svg>
+<svg id="mdi:transfer-down">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-transfer-down" viewBox="0 0 24 24"><path d="M16,3V5H8V3H16M16,7V9H8V7H16M16,11V13H8V11H16M5,15H19L12,22L5,15Z" /></svg>
+</svg>
+<svg id="mdi:transfer-up">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-transfer-up" viewBox="0 0 24 24"><path d="M8,21V19H16V21H8M8,17V15H16V17H8M8,13V11H16V13H8M19,9H5L12,2L19,9Z" /></svg>
+</svg>
 <svg id="mdi:triangle">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-triangle" viewBox="0 0 24 24"><path d="M1,21H23L12,2" /></svg>
 </svg>
@@ -709,21 +715,29 @@ path.combo {
 <text x="1000" y="76" class="combo shifted">:</text>
 </g>
 <g class="combo combopos-13">
+<rect rx="4" ry="4" x="742" y="82" width="36" height="36" class="combo"/>
+<use href="#mdi:transfer-up" xlink:href="#mdi:transfer-up" x="747" y="87" height="26" width="26.0" class="combo tap glyph mdi:transfer-up"/>
+</g>
+<g class="combo combopos-14">
+<rect rx="4" ry="4" x="742" y="162" width="36" height="36" class="combo"/>
+<use href="#mdi:transfer-down" xlink:href="#mdi:transfer-down" x="747" y="167" height="26" width="26.0" class="combo tap glyph mdi:transfer-down"/>
+</g>
+<g class="combo combopos-15">
 <rect rx="4" ry="4" x="822" y="152" width="36" height="36" class="combo"/>
 <text x="840" y="184" class="combo hold">[</text>
 <text x="840" y="156" class="combo shifted">{</text>
 </g>
-<g class="combo combopos-14">
+<g class="combo combopos-16">
 <rect rx="4" ry="4" x="902" y="142" width="36" height="36" class="combo"/>
 <text x="920" y="174" class="combo hold">]</text>
 <text x="920" y="146" class="combo shifted">}</text>
 </g>
-<g class="combo combopos-15">
+<g class="combo combopos-17">
 <rect rx="4" ry="4" x="982" y="152" width="36" height="36" class="combo"/>
 <text x="1000" y="184" class="combo hold">\</text>
 <text x="1000" y="156" class="combo shifted">|</text>
 </g>
-<g class="combo combopos-16">
+<g class="combo combopos-18">
 <rect rx="4" ry="4" x="782" y="37" width="36" height="36" class="combo"/>
 <use href="#mdi:play-pause" xlink:href="#mdi:play-pause" x="787" y="42" height="26" width="26.0" class="combo tap glyph mdi:play-pause"/>
 </g>
@@ -975,21 +989,29 @@ path.combo {
 <text x="1000" y="76" class="combo shifted">:</text>
 </g>
 <g class="combo combopos-13">
+<rect rx="4" ry="4" x="742" y="82" width="36" height="36" class="combo"/>
+<use href="#mdi:transfer-up" xlink:href="#mdi:transfer-up" x="747" y="87" height="26" width="26.0" class="combo tap glyph mdi:transfer-up"/>
+</g>
+<g class="combo combopos-14">
+<rect rx="4" ry="4" x="742" y="162" width="36" height="36" class="combo"/>
+<use href="#mdi:transfer-down" xlink:href="#mdi:transfer-down" x="747" y="167" height="26" width="26.0" class="combo tap glyph mdi:transfer-down"/>
+</g>
+<g class="combo combopos-15">
 <rect rx="4" ry="4" x="822" y="152" width="36" height="36" class="combo"/>
 <text x="840" y="184" class="combo hold">[</text>
 <text x="840" y="156" class="combo shifted">{</text>
 </g>
-<g class="combo combopos-14">
+<g class="combo combopos-16">
 <rect rx="4" ry="4" x="902" y="142" width="36" height="36" class="combo"/>
 <text x="920" y="174" class="combo hold">]</text>
 <text x="920" y="146" class="combo shifted">}</text>
 </g>
-<g class="combo combopos-15">
+<g class="combo combopos-17">
 <rect rx="4" ry="4" x="982" y="152" width="36" height="36" class="combo"/>
 <text x="1000" y="184" class="combo hold">\</text>
 <text x="1000" y="156" class="combo shifted">|</text>
 </g>
-<g class="combo combopos-16">
+<g class="combo combopos-18">
 <rect rx="4" ry="4" x="782" y="37" width="36" height="36" class="combo"/>
 <use href="#mdi:play-pause" xlink:href="#mdi:play-pause" x="787" y="42" height="26" width="26.0" class="combo tap glyph mdi:play-pause"/>
 </g>
@@ -1051,6 +1073,7 @@ path.combo {
 <g transform="translate(40, 150)" class="key bootloader keypos-12">
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key bootloader"/>
 <use href="#mdi:backup-restore" xlink:href="#mdi:backup-restore" x="-13" y="-13" height="26" width="26.0" class="key bootloader tap glyph mdi:backup-restore"/>
+<use href="#mdi:progress-download" xlink:href="#mdi:progress-download" x="-9" y="16" height="18" width="18.0" class="key bootloader hold glyph mdi:progress-download"/>
 </g>
 <g transform="translate(120, 150)" class="key keypos-13">
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
@@ -1095,6 +1118,7 @@ path.combo {
 <g transform="translate(1160, 150)" class="key bootloader keypos-23">
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key bootloader"/>
 <use href="#mdi:backup-restore" xlink:href="#mdi:backup-restore" x="-13" y="-13" height="26" width="26.0" class="key bootloader tap glyph mdi:backup-restore"/>
+<use href="#mdi:progress-download" xlink:href="#mdi:progress-download" x="-9" y="16" height="18" width="18.0" class="key bootloader hold glyph mdi:progress-download"/>
 </g>
 <g transform="translate(40, 230)" class="key keypos-24">
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
@@ -1110,21 +1134,21 @@ path.combo {
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
 <text x="0" y="0" class="key tap">F12</text>
 </g>
-<g transform="translate(280, 200)" class="key trans keypos-27">
-<rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key trans"/>
-<use href="#mdi:transfer" xlink:href="#mdi:transfer" x="-13" y="-13" height="26" width="26.0" class="key trans tap glyph mdi:transfer"/>
+<g transform="translate(280, 200)" class="key keypos-27">
+<rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
+<text x="0" y="0" class="key tap">F13</text>
 </g>
-<g transform="translate(360, 210)" class="key trans keypos-28">
-<rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key trans"/>
-<use href="#mdi:transfer" xlink:href="#mdi:transfer" x="-13" y="-13" height="26" width="26.0" class="key trans tap glyph mdi:transfer"/>
+<g transform="translate(360, 210)" class="key keypos-28">
+<rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
+<text x="0" y="0" class="key tap">F14</text>
 </g>
 <g transform="translate(440, 220)" class="key keypos-29">
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
-<use href="#mdi:progress-download" xlink:href="#mdi:progress-download" x="-13" y="-13" height="26" width="26.0" class="key tap glyph mdi:progress-download"/>
+<text x="0" y="0" class="key tap">F15</text>
 </g>
-<g transform="translate(760, 220)" class="key keypos-30">
-<rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key"/>
-<use href="#mdi:progress-download" xlink:href="#mdi:progress-download" x="-13" y="-13" height="26" width="26.0" class="key tap glyph mdi:progress-download"/>
+<g transform="translate(760, 220)" class="key trans keypos-30">
+<rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key trans"/>
+<use href="#mdi:transfer" xlink:href="#mdi:transfer" x="-13" y="-13" height="26" width="26.0" class="key trans tap glyph mdi:transfer"/>
 </g>
 <g transform="translate(840, 210)" class="key trans keypos-31">
 <rect rx="4" ry="4" x="-38" y="-38" width="77" height="77" class="key trans"/>
@@ -1192,54 +1216,62 @@ path.combo {
 <text x="1000" y="76" class="combo shifted">:</text>
 </g>
 <g class="combo combopos-3">
+<rect rx="4" ry="4" x="742" y="82" width="36" height="36" class="combo"/>
+<use href="#mdi:transfer-up" xlink:href="#mdi:transfer-up" x="747" y="87" height="26" width="26.0" class="combo tap glyph mdi:transfer-up"/>
+</g>
+<g class="combo combopos-4">
+<rect rx="4" ry="4" x="742" y="162" width="36" height="36" class="combo"/>
+<use href="#mdi:transfer-down" xlink:href="#mdi:transfer-down" x="747" y="167" height="26" width="26.0" class="combo tap glyph mdi:transfer-down"/>
+</g>
+<g class="combo combopos-5">
 <rect rx="4" ry="4" x="822" y="152" width="36" height="36" class="combo"/>
 <text x="840" y="184" class="combo hold">[</text>
 <text x="840" y="156" class="combo shifted">{</text>
 </g>
-<g class="combo combopos-4">
+<g class="combo combopos-6">
 <rect rx="4" ry="4" x="902" y="142" width="36" height="36" class="combo"/>
 <text x="920" y="174" class="combo hold">]</text>
 <text x="920" y="146" class="combo shifted">}</text>
 </g>
-<g class="combo combopos-5">
+<g class="combo combopos-7">
 <rect rx="4" ry="4" x="982" y="152" width="36" height="36" class="combo"/>
 <text x="1000" y="184" class="combo hold">\</text>
 <text x="1000" y="156" class="combo shifted">|</text>
 </g>
-<g class="combo combopos-6">
+<g class="combo combopos-8">
 <path d="M240,-3 h-114 a6.0,6.0 0 0 0 -6.0,6.0 v40" class="combo"/>
 <path d="M240,-3 h-34 a6.0,6.0 0 0 0 -6.0,6.0 v20" class="combo"/>
 <path d="M240,-3 h34 a6.0,6.0 0 0 1 6.0,6.0 v10" class="combo"/>
 <path d="M240,-3 h114 a6.0,6.0 0 0 1 6.0,6.0 v20" class="combo"/>
 <rect rx="4" ry="4" x="222" y="-21" width="36" height="36" class="combo"/>
 <use href="#mdi:bluetooth-off" xlink:href="#mdi:bluetooth-off" x="227" y="-16" height="26" width="26.0" class="combo tap glyph mdi:bluetooth-off"/>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-9">
 <rect rx="4" ry="4" x="102" y="92" width="36" height="36" class="combo"/>
 <text x="120" y="124" class="combo hold">1</text>
 <use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="111" y="96" height="18" width="18.0" class="combo shifted glyph mdi:bluetooth-connect"/>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-10">
 <rect rx="4" ry="4" x="182" y="72" width="36" height="36" class="combo"/>
 <text x="200" y="104" class="combo hold">2</text>
 <use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="191" y="76" height="18" width="18.0" class="combo shifted glyph mdi:bluetooth-connect"/>
 </g>
-<g class="combo combopos-9">
+<g class="combo combopos-11">
 <rect rx="4" ry="4" x="262" y="62" width="36" height="36" class="combo"/>
 <text x="280" y="94" class="combo hold">3</text>
 <use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="271" y="66" height="18" width="18.0" class="combo shifted glyph mdi:bluetooth-connect"/>
 </g>
-<g class="combo combopos-10">
+<g class="combo combopos-12">
 <rect rx="4" ry="4" x="342" y="72" width="36" height="36" class="combo"/>
 <text x="360" y="104" class="combo hold">4</text>
 <use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="351" y="76" height="18" width="18.0" class="combo shifted glyph mdi:bluetooth-connect"/>
 </g>
-<g class="combo combopos-11">
+<g class="combo combopos-13">
 <rect rx="4" ry="4" x="422" y="82" width="36" height="36" class="combo"/>
 <text x="440" y="114" class="combo hold">5</text>
 <use href="#mdi:bluetooth-connect" xlink:href="#mdi:bluetooth-connect" x="431" y="86" height="18" width="18.0" class="combo shifted glyph mdi:bluetooth-connect"/>
 </g>
-<g class="combo combopos-12">
+<g class="combo combopos-14">
 <rect rx="4" ry="4" x="782" y="37" width="36" height="36" class="combo"/>
 <use href="#mdi:play-pause" xlink:href="#mdi:play-pause" x="787" y="42" height="26" width="26.0" class="combo tap glyph mdi:play-pause"/>
 </g>
diff --git a/keymap-drawer/corneish_zen.yaml b/keymap-drawer/corneish_zen.yaml
@@ -99,7 +99,7 @@ layers:
   - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
   - $$mdi:power-standby$$
-  - {t: '$$mdi:backup-restore$$', type: bootloader}
+  - {t: '$$mdi:backup-restore$$', h: '$$mdi:progress-download$$', type: bootloader}
   - F6
   - F7
   - F8
@@ -110,15 +110,15 @@ layers:
   - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
-  - {t: '$$mdi:backup-restore$$', type: bootloader}
+  - {t: '$$mdi:backup-restore$$', h: '$$mdi:progress-download$$', type: bootloader}
   - {t: '$$mdi:close-box$$', h: Fn}
   - F11
   - F12
+  - F13
+  - F14
+  - F15
   - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
-  - $$mdi:progress-download$$
-  - $$mdi:progress-download$$
-  - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
   - {t: '$$mdi:transfer$$', type: trans}
@@ -169,6 +169,12 @@ combos:
 - p: [9, 21]
   k: {h: ;, s: ':'}
   l: [L1, L2, Fn]
+- p: [6, 18]
+  k: $$mdi:transfer-up$$
+  l: [L1, L2, Fn]
+- p: [18, 30]
+  k: $$mdi:transfer-down$$
+  l: [L1, L2, Fn]
 - p: [19, 31]
   k: {h: '[', s: '{'}
   l: [L1, L2, Fn]
diff --git a/knucklehead/Fn.dtsi b/knucklehead/Fn.dtsi
@@ -14,10 +14,10 @@
     &out OUT_TOG    &kp F1          &kp F2          &kp F3          &kp F4          &kp F5              &trans          &trans          &trans          &trans          &trans          &kp C_POWER
 // ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤   ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
 //  12              13              14              15              16              17                  18              19              20              21              22              23
-    &sys_reset      &kp F6          &kp F7          &kp F8          &kp F9          &kp F10             &trans          &trans          &trans          &trans          &trans          &sys_reset
+    &rst_boot 0 0   &kp F6          &kp F7          &kp F8          &kp F9          &kp F10             &trans          &trans          &trans          &trans          &trans          &rst_boot 0 0
 // ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤   ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
 //  24              25              26              27              28              29                  30              31              32              33              34              35
-    &cmo Fn         &kp F11         &kp F12         &trans          &trans          &bootloader         &bootloader     &trans          &trans          &trans          &trans          &cmo Fn
+    &cmo Fn         &kp F11         &kp F12         &kp F13         &kp F14         &kp F15             &trans          &trans          &trans          &trans          &trans          &cmo Fn
 // ╰───────────────┴───────────────┴───────────────┼───────────────┼───────────────┼───────────────┤   ├───────────────├───────────────┼───────────────┼───────────────┴───────────────┴───────────────╯
 //                                                  36              37              38                  39              40              41
                                                     &kp C_BRI_DN    &kp C_BRI_UP    &cmo L2             &cmo L2         &kp CAPSLOCK    &trans
diff --git a/knucklehead/behaviors.dtsi b/knucklehead/behaviors.dtsi
@@ -151,5 +151,17 @@
       mods = <(MOD_LSFT|MOD_RSFT)>;
       #binding-cells = <0>;
     };
+
+    /*
+    - tap: reset keyboard
+    - hold: enter bootloader mode
+    */
+    /omit-if-no-ref/ rst_boot: rst_boot {
+        compatible = "zmk,behavior-hold-tap";
+        #binding-cells = <2>;
+        tapping-term-ms = <500>;
+        flavor = "tap-preferred";
+        bindings = <&bootloader>, <&sys_reset>;
+    };
   };
 };
diff --git a/knucklehead/combos.dtsi b/knucklehead/combos.dtsi
@@ -40,6 +40,8 @@
     COMBO(minus, &kp MINUS, 7 19, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
     COMBO(equal, &kp EQUAL, 8 20, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
     COMBO(semicolon, &kp SEMICOLON, 9 21, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
+    COMBO(pgup, &kp PG_UP, 6 18, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
+    COMBO(pgdn, &kp PG_DN, 18 30, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
     COMBO(lbkt, &kp LBKT, 19 31, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
     COMBO(rbkt, &kp RBKT, 20 32, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
     COMBO(backslash, &kp BACKSLASH, 21 33, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
