diff options
author | jack <[email protected]> | 2023-01-16 14:43:18 -0700 |
---|---|---|
committer | jack <[email protected]> | 2023-01-16 14:43:18 -0700 |
commit | 1227a32f52e993b024e0887cf39732297fb99e55 (patch) | |
tree | fcb51d6485c2935ae52ecf50bfe23ba94d02ae0b | |
parent | d8a1969e591eef2e62d0792360f0762019c3428e (diff) | |
download | qmk_me-1227a32f52e993b024e0887cf39732297fb99e55.tar.gz qmk_me-1227a32f52e993b024e0887cf39732297fb99e55.zip |
change some combos around
-rw-r--r-- | img/layout.svg | 726 | ||||
-rw-r--r-- | readme.md | 29 | ||||
-rw-r--r-- | waffle/combos.def | 25 | ||||
-rw-r--r-- | waffle/waffle.h | 4 |
4 files changed, 497 insertions, 287 deletions
diff --git a/img/layout.svg b/img/layout.svg index d188a8f..156d632 100644 --- a/img/layout.svg +++ b/img/layout.svg @@ -3,14 +3,14 @@ <svg width="281mm" - height="288mm" - viewBox="0 0 281 288" + height="318mm" + viewBox="0 0 281 318" version="1.1" id="svg5" inkscape:export-filename="layout.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" - inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="layout.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -27,11 +27,11 @@ inkscape:deskcolor="#505050" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="0.61580177" - inkscape:cx="572.42446" - inkscape:cy="580.54396" + inkscape:zoom="1" + inkscape:cx="533.5" + inkscape:cy="276" inkscape:window-width="1896" - inkscape:window-height="1014" + inkscape:window-height="1017" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -67,7 +67,7 @@ y="22" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#ffffff;fill-opacity:1;stroke-width:0.257181" id="rect813-6" width="25" height="20" @@ -75,7 +75,7 @@ y="22" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#fbf8cc;fill-opacity:1;stroke-width:0.257181" id="rect813-3" width="25" height="20" @@ -83,7 +83,7 @@ y="0" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#a3c4f3;fill-opacity:1;stroke-width:0.257181" id="rect813-1" width="25" height="20" @@ -107,7 +107,7 @@ y="44" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#bae8f8;fill-opacity:1;stroke-width:0.257181" id="rect813-62" width="25" height="20" @@ -115,7 +115,7 @@ y="44" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#fcd5b5;fill-opacity:1;stroke-width:0.257181" id="rect813-17" width="25" height="20" @@ -123,7 +123,7 @@ y="-3.5527137e-15" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#ffcfd2;fill-opacity:1;stroke-width:0.257181" id="rect813-8" width="25" height="20" @@ -131,7 +131,7 @@ y="0" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#cfbaf0;fill-opacity:1;stroke-width:0.257181" id="rect813-5" width="25" height="20" @@ -139,7 +139,7 @@ y="22" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#8eecf5;fill-opacity:1;stroke-width:0.257181" id="rect813-74" width="25" height="20" @@ -155,7 +155,7 @@ y="66" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#f1c0e8;fill-opacity:1;stroke-width:0.257181" id="rect813-18" width="25" height="20" @@ -163,7 +163,7 @@ y="22" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#b9fbc0;fill-opacity:1;stroke-width:0.257181" id="rect813-59" width="25" height="20" @@ -179,7 +179,7 @@ y="66" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#ffcfd2;fill-opacity:1;stroke-width:0.257181" id="rect813-36" width="25" height="20" @@ -187,7 +187,7 @@ y="0" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#fcd5b5;fill-opacity:1;stroke-width:0.257181" id="rect813-4-7" width="25" height="20" @@ -195,7 +195,7 @@ y="0" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#f1c0e8;fill-opacity:1;stroke-width:0.257181" id="rect813-7-5" width="25" height="20" @@ -203,7 +203,7 @@ y="21.999996" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#cfbaf0;fill-opacity:1;stroke-width:0.257181" id="rect813-6-3" width="25" height="20" @@ -211,7 +211,7 @@ y="21.999996" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#fbf8cc;fill-opacity:1;stroke-width:0.257181" id="rect813-3-5" width="25" height="20" @@ -219,7 +219,7 @@ y="0" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#a3c4f3;fill-opacity:1;stroke-width:0.257181" id="rect813-1-6" width="25" height="20" @@ -227,7 +227,7 @@ y="21.999996" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#b9fbc0;fill-opacity:1;stroke-width:0.257181" id="rect813-75-2" width="25" height="20" @@ -235,7 +235,7 @@ y="43.999996" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#8eecf5;fill-opacity:1;stroke-width:0.257181" id="rect813-9-9" width="25" height="20" @@ -243,7 +243,7 @@ y="43.999996" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#bae8f8;fill-opacity:1;stroke-width:0.257181" id="rect813-62-1" width="25" height="20" @@ -267,7 +267,7 @@ y="0" ry="4.30093" /> <rect - style="fill:#ffffff;stroke-width:0.257181" + style="fill:#ffffff;fill-opacity:1;stroke-width:0.257181" id="rect813-5-0" width="25" height="20" @@ -393,7 +393,7 @@ y="28.837944" dy="2.5">d</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;text-align:center;text-anchor:middle;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;text-align:center;text-anchor:middle;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="66.923332" y="37.657394" id="tspan857">ctl</tspan></text> @@ -410,7 +410,7 @@ y="28.837944" dy="2.5">f</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;text-align:center;text-anchor:middle;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;text-align:center;text-anchor:middle;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="93.708138" y="37.657394" id="tspan961">sft</tspan></text> @@ -483,13 +483,13 @@ <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#000000;stroke-width:0.264583" - x="113.9341" + x="115.02842" y="77.456268" id="text579"><tspan sodipodi:role="line" id="tspan577" style="font-size:7.05556px;stroke-width:0.264583" - x="113.9341" + x="115.02842" y="77.456268">spc</tspan></text> <text xml:space="preserve" @@ -504,7 +504,7 @@ y="28.192362" dy="2.5">a</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;text-align:center;text-anchor:middle;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;text-align:center;text-anchor:middle;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="12.708137" y="37.01181" id="tspan585">alt</tspan></text> @@ -512,18 +512,18 @@ xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;word-spacing:-0.0105833px;text-anchor:middle;fill:#5fbcd3;stroke-width:0.264583" x="40.138527" - y="27.772556" + y="28.122553" id="text797"><tspan sodipodi:role="line" id="tspan795" style="font-size:7.05556px;fill:#000000;stroke-width:0.264583" x="40.138527" - y="27.772556" - dy="2.5">s</tspan><tspan + y="28.122553" + dy="1.8">s</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="40.138527" - y="36.592007" + y="36.942001" id="tspan799">gui</tspan></text> <text xml:space="preserve" @@ -538,7 +538,7 @@ y="72.181778" dy="2.5">esc</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="93.70108" y="81.001228" id="tspan967">lwr</tspan></text> @@ -621,7 +621,7 @@ y="28.83794" dy="2.5">j</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="187.70815" y="37.657391" id="tspan1053">sft</tspan></text> @@ -638,7 +638,7 @@ y="28.83794" dy="2.5">k</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="214.92334" y="37.657391" id="tspan1055">ctl</tspan></text> @@ -646,35 +646,35 @@ xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="242.13852" - y="28.418135" + y="28.668133" id="text1009"><tspan sodipodi:role="line" id="tspan1007" style="font-size:7.05556px;stroke-width:0.264583" x="242.13852" - y="28.418135" - dy="2.5">l</tspan><tspan + y="28.668133" + dy="2">l</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="242.13852" - y="37.237583" + y="37.487583" id="tspan1057">gui</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.70813" - y="27.977163" + y="28.827162" id="text1013"><tspan sodipodi:role="line" id="tspan1011" style="font-size:7.05556px;stroke-width:0.264583" x="268.70813" - y="27.977163" - dy="2.5">;</tspan><tspan + y="28.827162" + dy="0.80000001">;</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="268.70813" - y="36.796612" + y="37.64661" id="tspan1059">alt</tspan></text> <text xml:space="preserve" @@ -736,13 +736,19 @@ xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.46118" - y="56.268356" + y="50.800495" id="text1033"><tspan sodipodi:role="line" id="tspan1031" style="font-size:7.05556px;stroke-width:0.264583" x="268.46118" - y="56.268356">/</tspan></text> + y="50.800495" + dy="1.7">/</tspan><tspan + sodipodi:role="line" + style="font-size:7.05556px;stroke-width:0.264583" + x="268.46118" + y="59.619946" + id="tspan1033">?</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" @@ -767,7 +773,7 @@ y="72.837944" dy="2.5">pste</tspan><tspan sodipodi:role="line" - style="font-size:7.05556px;fill:#5fbcd3;stroke-width:0.264583" + style="font-size:7.05556px;fill:#808080;fill-opacity:1;stroke-width:0.264583" x="187.70108" y="81.657394" id="tspan1051">rse</tspan></text> @@ -792,14 +798,14 @@ id="tspan562" style="stroke-width:0.264583" x="224.39272" - y="130.36977"></tspan></text> + y="130.36977" /></text> <rect style="fill:#ffffff;stroke-width:0.257181" id="rect813-55" width="25" height="20" x="0" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -807,7 +813,7 @@ width="25" height="20" x="27" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -815,7 +821,7 @@ width="25" height="20" x="0" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -823,7 +829,7 @@ width="25" height="20" x="27" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -831,7 +837,7 @@ width="25" height="20" x="53.999996" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -839,7 +845,7 @@ width="25" height="20" x="53.999996" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -847,7 +853,7 @@ width="25" height="20" x="0" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -855,7 +861,7 @@ width="25" height="20" x="27" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -863,7 +869,7 @@ width="25" height="20" x="53.999996" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -871,7 +877,7 @@ width="25" height="20" x="81" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -879,7 +885,7 @@ width="25" height="20" x="108" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -887,7 +893,7 @@ width="25" height="20" x="81" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -895,7 +901,7 @@ width="25" height="20" x="81" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -903,7 +909,7 @@ width="25" height="20" x="81" - y="167" + y="197" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -911,7 +917,7 @@ width="25" height="20" x="108" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -919,7 +925,7 @@ width="25" height="20" x="108" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -927,7 +933,7 @@ width="25" height="20" x="108" - y="167" + y="197" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -935,7 +941,7 @@ width="25" height="20" x="147.99998" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -943,7 +949,7 @@ width="25" height="20" x="175.00003" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -951,7 +957,7 @@ width="25" height="20" x="147.99998" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -959,7 +965,7 @@ width="25" height="20" x="175.00003" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -967,7 +973,7 @@ width="25" height="20" x="202.00003" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -975,7 +981,7 @@ width="25" height="20" x="202.00003" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -983,7 +989,7 @@ width="25" height="20" x="147.99998" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -991,7 +997,7 @@ width="25" height="20" x="175.00003" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -999,7 +1005,7 @@ width="25" height="20" x="202.00003" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1007,7 +1013,7 @@ width="25" height="20" x="229" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1015,7 +1021,7 @@ width="25" height="20" x="256" - y="101" + y="131" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1023,7 +1029,7 @@ width="25" height="20" x="229" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1031,7 +1037,7 @@ width="25" height="20" x="229" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1039,7 +1045,7 @@ width="25" height="20" x="256" - y="123" + y="153" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1047,7 +1053,7 @@ width="25" height="20" x="256" - y="145" + y="175" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1055,7 +1061,7 @@ width="25" height="20" x="147.99998" - y="167" + y="197" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1063,7 +1069,7 @@ width="25" height="20" x="175" - y="167" + y="197" ry="4.30093" /> <text xml:space="preserve" @@ -1075,344 +1081,344 @@ id="tspan1261" style="stroke-width:0.264583" x="13.949536" - y="108.97423"></tspan></text> + y="108.97423" /></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="39.510582" - y="113.5012" + y="143.50119" id="text1271"><tspan sodipodi:role="line" id="tspan1269" style="font-size:7.05556px;stroke-width:0.264583" x="39.510582" - y="113.5012">2</tspan></text> + y="143.50119">2</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="12.951553" - y="113.49414" + y="143.49414" id="text1275"><tspan sodipodi:role="line" id="tspan1273" style="stroke-width:0.264583" x="12.951553" - y="113.49414">1</tspan></text> + y="143.49414">1</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="66.510574" - y="113.50472" + y="143.50473" id="text1279"><tspan sodipodi:role="line" id="tspan1277" style="stroke-width:0.264583" x="66.510574" - y="113.50472">3</tspan></text> + y="143.50473">3</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="93.514107" - y="113.42358" + y="143.42358" id="text1283"><tspan sodipodi:role="line" id="tspan1281" style="stroke-width:0.264583" x="93.514107" - y="113.42358">4</tspan></text> + y="143.42358">4</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="120.51058" - y="113.50472" + y="143.50473" id="text1287"><tspan sodipodi:role="line" id="tspan1285" style="stroke-width:0.264583" x="120.51058" - y="113.50472">5</tspan></text> + y="143.50473">5</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="160.47176" - y="113.44475" + y="143.44475" id="text1291"><tspan sodipodi:role="line" id="tspan1289" style="stroke-width:0.264583" x="160.47176" - y="113.44475">6</tspan></text> + y="143.44475">6</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="187.5106" - y="113.5012" + y="143.50119" id="text1295"><tspan sodipodi:role="line" id="tspan1293" style="stroke-width:0.264583" x="187.5106" - y="113.5012">7</tspan></text> + y="143.50119">7</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="214.5106" - y="113.49767" + y="143.49768" id="text1299"><tspan sodipodi:role="line" id="tspan1297" style="stroke-width:0.264583" x="214.5106" - y="113.49767">8</tspan></text> + y="143.49768">8</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="241.51057" - y="113.5012" + y="143.50119" id="text1303"><tspan sodipodi:role="line" id="tspan1301" style="stroke-width:0.264583" x="241.51057" - y="113.5012">9</tspan></text> + y="143.50119">9</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.51059" - y="113.5012" + y="143.50119" id="text1307"><tspan sodipodi:role="line" id="tspan1305" style="stroke-width:0.264583" x="268.51059" - y="113.5012">0</tspan></text> + y="143.50119">0</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="12.499997" - y="135.49767" + y="165.49767" id="text1311"><tspan sodipodi:role="line" id="tspan1309" style="stroke-width:0.264583" x="12.499997" - y="135.49767">!</tspan></text> + y="165.49767">!</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="39.496471" - y="135.49414" + y="165.49414" id="text1315"><tspan sodipodi:role="line" id="tspan1313" style="stroke-width:0.264583" x="39.496471" - y="135.49414">@</tspan></text> + y="165.49414">@</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="66.722244" - y="135.92805" + y="165.92805" id="text1319"><tspan sodipodi:role="line" id="tspan1317" style="stroke-width:0.264583" x="66.722244" - y="135.92805">#</tspan></text> + y="165.92805">#</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="93.461189" - y="135.28247" + y="165.28247" id="text1323"><tspan sodipodi:role="line" id="tspan1321" style="stroke-width:0.264583" x="93.461189" - y="135.28247">$</tspan></text> + y="165.28247">$</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="120.46472" - y="135.26836" + y="165.26836" id="text1327"><tspan sodipodi:role="line" id="tspan1325" style="stroke-width:0.264583" x="120.46472" - y="135.26836">%</tspan></text> + y="165.26836">%</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="160.50703" - y="137.04549" + y="167.04549" id="text1331"><tspan sodipodi:role="line" id="tspan1329" style="stroke-width:0.264583" x="160.50703" - y="137.04549">^</tspan></text> + y="167.04549">^</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="187.52219" - y="135.09708" + y="165.09708" id="text1335"><tspan sodipodi:role="line" id="tspan1333" style="stroke-width:0.264583" x="187.52219" - y="135.09708">&</tspan></text> + y="165.09708">&</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="214.49651" - y="135.70934" + y="165.70934" id="text1339"><tspan sodipodi:role="line" id="tspan1337" style="stroke-width:0.264583" x="214.49651" - y="135.70934">*</tspan></text> + y="165.70934">*</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="241.44708" - y="135.28247" + y="165.28247" id="text1343"><tspan sodipodi:role="line" id="tspan1341" style="stroke-width:0.264583" x="241.44708" - y="135.28247">(</tspan></text> + y="165.28247">(</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.44708" - y="135.28247" + y="165.28247" id="text1347"><tspan sodipodi:role="line" id="tspan1345" style="stroke-width:0.264583" x="268.44708" - y="135.28247">)</tspan></text> + y="165.28247">)</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="12.704609" - y="157.49414" + y="187.49414" id="text1351"><tspan sodipodi:role="line" style="stroke-width:0.264583" x="12.704609" - y="157.49414" + y="187.49414" id="tspan1353">vol-</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="39.499996" - y="157.49767" + y="187.49768" id="text1359"><tspan sodipodi:role="line" id="tspan1357" style="stroke-width:0.264583" x="39.499996" - y="157.49767">tab</tspan></text> + y="187.49768">tab</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="66.70108" - y="156.21356" + y="186.21356" id="text1363"><tspan sodipodi:role="line" id="tspan1361" style="stroke-width:0.264583" x="66.70108" - y="156.21356">caps</tspan></text> + y="186.21356">caps</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="93.464722" - y="159.01462" + y="189.01462" id="text1367"><tspan sodipodi:role="line" id="tspan1365" style="stroke-width:0.264583" x="93.464722" - y="159.01462">~</tspan></text> + y="189.01462">~</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="120.44355" - y="159.00403" + y="189.00403" id="text1371"><tspan sodipodi:role="line" id="tspan1369" style="stroke-width:0.264583" x="120.44355" - y="159.00403">`</tspan></text> + y="189.00403">`</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="160.07312" - y="157.49767" + y="187.49768" id="text1375"><tspan sodipodi:role="line" id="tspan1373" style="stroke-width:0.264583" x="160.07312" - y="157.49767">left</tspan></text> + y="187.49768">left</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="187.70111" - y="157.48709" + y="187.48709" id="text1379"><tspan sodipodi:role="line" id="tspan1377" style="stroke-width:0.264583" x="187.70111" - y="157.48709">down</tspan></text> + y="187.48709">down</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="214.69759" - y="156.21356" + y="186.21356" id="text1383"><tspan sodipodi:role="line" id="tspan1381" style="stroke-width:0.264583" x="214.69759" - y="156.21356">up</tspan></text> + y="186.21356">up</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="241.70813" - y="157.10255" + y="187.10254" id="text1387"><tspan sodipodi:role="line" id="tspan1385" style="stroke-width:0.264583" x="241.70813" - y="157.10255">right</tspan></text> + y="187.10254">right</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.49295" - y="157.49414" + y="187.49414" id="text1391"><tspan sodipodi:role="line" id="tspan1389" style="stroke-width:0.264583" x="268.49295" - y="157.49414">vol+</tspan></text> + y="187.49414">vol+</tspan></text> <rect style="fill:#ffffff;stroke-width:0.257181" id="rect813-55-5" width="25" height="20" x="0" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1420,7 +1426,7 @@ width="25" height="20" x="27.000004" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1428,7 +1434,7 @@ width="25" height="20" x="0" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1436,7 +1442,7 @@ width="25" height="20" x="27.000004" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1444,7 +1450,7 @@ width="25" height="20" x="53.999996" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1452,7 +1458,7 @@ width="25" height="20" x="53.999996" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1460,7 +1466,7 @@ width="25" height="20" x="0" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1468,7 +1474,7 @@ width="25" height="20" x="27.000004" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1476,7 +1482,7 @@ width="25" height="20" x="53.999996" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1484,7 +1490,7 @@ width="25" height="20" x="81" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1492,7 +1498,7 @@ width="25" height="20" x="108" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1500,7 +1506,7 @@ width="25" height="20" x="81" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1508,7 +1514,7 @@ width="25" height="20" x="81" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1516,7 +1522,7 @@ width="25" height="20" x="81" - y="268" + y="298" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1524,7 +1530,7 @@ width="25" height="20" x="108" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1532,7 +1538,7 @@ width="25" height="20" x="108" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1540,7 +1546,7 @@ width="25" height="20" x="108" - y="268" + y="298" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1548,7 +1554,7 @@ width="25" height="20" x="147.99998" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1556,7 +1562,7 @@ width="25" height="20" x="175.00003" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1564,7 +1570,7 @@ width="25" height="20" x="147.99998" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1572,7 +1578,7 @@ width="25" height="20" x="175.00003" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1580,7 +1586,7 @@ width="25" height="20" x="202.00003" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1588,7 +1594,7 @@ width="25" height="20" x="202.00003" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1596,7 +1602,7 @@ width="25" height="20" x="147.99998" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1604,7 +1610,7 @@ width="25" height="20" x="175.00003" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1612,7 +1618,7 @@ width="25" height="20" x="202.00003" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1620,7 +1626,7 @@ width="25" height="20" x="229" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1628,7 +1634,7 @@ width="25" height="20" x="256" - y="202" + y="232" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1636,7 +1642,7 @@ width="25" height="20" x="229" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1644,7 +1650,7 @@ width="25" height="20" x="229" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1652,7 +1658,7 @@ width="25" height="20" x="256" - y="224" + y="254" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1660,7 +1666,7 @@ width="25" height="20" x="256" - y="246" + y="276" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1668,7 +1674,7 @@ width="25" height="20" x="147.99998" - y="268" + y="298" ry="4.30093" /> <rect style="fill:#ffffff;stroke-width:0.257181" @@ -1676,379 +1682,599 @@ width="25" height="20" x="175" - y="268" + y="298" ry="4.30093" /> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="12.40122" - y="208.41814" + y="238.41815" id="text1275-0"><tspan sodipodi:role="line" id="tspan1273-9" style="stroke-width:0.264583" x="12.40122" - y="208.41814" + y="238.41815" dy="2.5">rgb</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="12.40122" - y="217.23758" + y="247.23759" id="tspan1927">togg</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="39.704613" - y="230.83794" + y="260.83795" id="text1931"><tspan sodipodi:role="line" id="tspan1929" style="stroke-width:0.264583" x="39.704613" - y="230.83794" + y="260.83795" dy="2.5">rgb</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="39.704613" - y="239.65738" + y="269.65741" id="tspan1933">mod-</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="39.492947" - y="208.83794" + y="238.83795" id="text1937"><tspan sodipodi:role="line" id="tspan1935" style="stroke-width:0.264583" x="39.492947" - y="208.83794" + y="238.83795" dy="2.5">rgb</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="39.492947" - y="217.65738" + y="247.65739" id="tspan1939">mod+</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="12.701081" - y="230.41814" + y="260.41815" id="text1943"><tspan sodipodi:role="line" id="tspan1941" style="stroke-width:0.264583" x="12.701081" - y="230.41814" + y="260.41815" dy="2.5">audio</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="12.701081" - y="239.23758" + y="269.23761" id="tspan1945">togg</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="66.704605" - y="236.51883" + y="266.51883" id="text1949"><tspan sodipodi:role="line" id="tspan1947" style="stroke-width:0.264583" x="66.704605" - y="236.51883">hue-</tspan></text> + y="266.51883">hue-</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="66.492935" - y="214.51883" + y="244.51883" id="text1953"><tspan sodipodi:role="line" id="tspan1951" style="stroke-width:0.264583" x="66.492935" - y="214.51883">hue+</tspan></text> + y="244.51883">hue+</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="93.492943" - y="214.49767" + y="244.49768" id="text1957"><tspan sodipodi:role="line" id="tspan1955" style="stroke-width:0.264583" x="93.492943" - y="214.49767">sat+</tspan></text> + y="244.49768">sat+</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="93.704613" - y="236.49767" + y="266.49768" id="text1961"><tspan sodipodi:role="line" id="tspan1959" style="stroke-width:0.264583" x="93.704613" - y="236.49767">sat-</tspan></text> + y="266.49768">sat-</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="120.49294" - y="214.49767" + y="244.49768" id="text1965"><tspan sodipodi:role="line" id="tspan1963" style="stroke-width:0.264583" x="120.49294" - y="214.49767">brt+</tspan></text> + y="244.49768">brt+</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="120.70461" - y="236.49767" + y="266.49768" id="text1969"><tspan sodipodi:role="line" id="tspan1967" style="stroke-width:0.264583" x="120.70461" - y="236.49767">brt-</tspan></text> + y="266.49768">brt-</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="13.138526" - y="258.49768" + y="288.49768" id="text1973"><tspan sodipodi:role="line" id="tspan1971" style="stroke-width:0.264583" x="13.138526" - y="258.49768">f1</tspan></text> + y="288.49768">f1</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="39.510586" - y="258.50119" + y="288.50119" id="text1977"><tspan sodipodi:role="line" id="tspan1975" style="stroke-width:0.264583" x="39.510586" - y="258.50119">f2</tspan></text> + y="288.50119">f2</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="66.510574" - y="258.50119" + y="288.50119" id="text1981"><tspan sodipodi:role="line" id="tspan1979" style="stroke-width:0.264583" x="66.510574" - y="258.50119">f3</tspan></text> + y="288.50119">f3</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="93.514107" - y="258.42358" + y="288.42358" id="text1985"><tspan sodipodi:role="line" id="tspan1983" style="stroke-width:0.264583" x="93.514107" - y="258.42358">f4</tspan></text> + y="288.42358">f4</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="120.51058" - y="258.50119" + y="288.50119" id="text1989"><tspan sodipodi:role="line" id="tspan1987" style="stroke-width:0.264583" x="120.51058" - y="258.50119">f5</tspan></text> + y="288.50119">f5</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="160.47176" - y="258.44476" + y="288.44476" id="text1993"><tspan sodipodi:role="line" id="tspan1991" style="stroke-width:0.264583" x="160.47176" - y="258.44476">f6</tspan></text> + y="288.44476">f6</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="187.5106" - y="258.50119" + y="288.50119" id="text1997"><tspan sodipodi:role="line" id="tspan1995" style="stroke-width:0.264583" x="187.5106" - y="258.50119">f7</tspan></text> + y="288.50119">f7</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="214.5106" - y="258.49768" + y="288.49768" id="text2001"><tspan sodipodi:role="line" id="tspan1999" style="stroke-width:0.264583" x="214.5106" - y="258.49768">f8</tspan></text> + y="288.49768">f8</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="241.51057" - y="258.50119" + y="288.50119" id="text2005"><tspan sodipodi:role="line" id="tspan2003" style="stroke-width:0.264583" x="241.51057" - y="258.50119">f9</tspan></text> + y="288.50119">f9</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.51059" - y="258.50119" + y="288.50119" id="text2009"><tspan sodipodi:role="line" id="tspan2007" style="stroke-width:0.264583" x="268.51059" - y="258.50119">f10</tspan></text> + y="288.50119">f10</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.70108" - y="214.49767" + y="244.49768" id="text2013"><tspan sodipodi:role="line" id="tspan2011" style="stroke-width:0.264583" x="268.70108" - y="214.49767">make</tspan></text> + y="244.49768">make</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="268.70813" - y="236.49767" + y="266.49768" id="text2017"><tspan sodipodi:role="line" id="tspan2015" style="stroke-width:0.264583" x="268.70813" - y="236.49767">reset</tspan></text> + y="266.49768">reset</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="160.70107" - y="208.19589" + y="238.19589" id="text2021"><tspan sodipodi:role="line" id="tspan2019" style="stroke-width:0.264583" x="160.70107" - y="208.19589" + y="238.19589" dy="2.5">no</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="160.70107" - y="217.01534" + y="247.01534" id="tspan2023">mode</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="160.70107" - y="236.48709" + y="266.48709" id="text2027"><tspan sodipodi:role="line" id="tspan2025" style="stroke-width:0.264583" x="160.70107" - y="236.48709">wide</tspan></text> + y="266.48709">wide</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="187.69759" - y="230.82736" + y="260.82736" id="text2031"><tspan sodipodi:role="line" id="tspan2029" style="stroke-width:0.264583" x="187.69759" - y="230.82736" + y="260.82736" dy="2.5">upside</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="187.69759" - y="239.6468" + y="269.64682" id="tspan2033">down</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="187.70464" - y="213.87325" + y="243.87323" id="text2039"><tspan sodipodi:role="line" id="tspan2037" style="stroke-width:0.264583" x="187.70464" - y="213.87325">fancy</tspan></text> + y="243.87323">fancy</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="214.70111" - y="214.49767" + y="244.49768" id="text2043"><tspan sodipodi:role="line" id="tspan2041" style="stroke-width:0.264583" x="214.70111" - y="214.49767">block</tspan></text> + y="244.49768">block</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="214.70111" - y="236.07787" + y="266.07788" id="text2047"><tspan sodipodi:role="line" id="tspan2045" style="stroke-width:0.264583" x="214.70111" - y="236.07787">zalgo</tspan></text> + y="266.07788">zalgo</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="241.50352" - y="235.87325" + y="265.87323" id="text2051"><tspan sodipodi:role="line" id="tspan2049" style="stroke-width:0.264583" x="241.50352" - y="235.87325">tiny</tspan></text> + y="265.87323">tiny</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583" x="242.74724" - y="208.55278" + y="238.5528" id="text2055"><tspan sodipodi:role="line" id="tspan2053" style="stroke-width:0.264583" x="242.74724" - y="208.55278" + y="238.5528" dy="2.5">regnl.</tspan><tspan sodipodi:role="line" style="stroke-width:0.264583" x="242.74724" - y="217.37222" + y="247.37224" id="tspan2057">indic.</tspan></text> + <rect + style="fill:#eba0ac;fill-opacity:1;stroke-width:0.12172" + id="rect52900" + width="14" + height="8" + x="73" + y="6" + ry="1.7203721" /> + <rect + style="fill:#eba0ac;fill-opacity:1;stroke-width:0.12172" + id="rect52902" + width="14" + height="8" + x="194" + y="6" + ry="1.7203721" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="75.097801" + y="12.136775" + id="text1300"><tspan + sodipodi:role="line" + id="tspan1298" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.35px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="75.097801" + y="12.136775">{/}</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.35px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#eba0ac;fill-opacity:1;stroke-width:0.264583" + x="195.89461" + y="12.05105" + id="text21940"><tspan + sodipodi:role="line" + id="tspan21938" + style="fill:#000000;stroke-width:0.264583" + x="195.89461" + y="12.05105">[/]</tspan></text> + <circle + style="fill:#fbf8cc;fill-opacity:1;stroke-width:0.228312" + id="path23517" + cx="18.5" + cy="106" + r="10" /> + <circle + style="fill:#fcd5b5;fill-opacity:1;stroke-width:0.228314" + id="circle23999" + cx="49" + cy="106" + r="10" /> + <circle + style="fill:#ffcfd2;fill-opacity:1;stroke-width:0.228314" + id="circle28357" + cx="79.5" + cy="106" + r="10" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="51.717957" + y="100.47611" + id="text29927"><tspan + sodipodi:role="line" + id="tspan29925" + style="stroke-width:0.264583" + x="51.717957" + y="100.47611" /></text> + <circle + style="fill:#f1c0e8;fill-opacity:1;stroke-width:0.228314" + id="circle29931" + cx="110" + cy="106" + r="10" /> + <circle + style="fill:#cfbaf0;fill-opacity:1;stroke-width:0.228314" + id="circle31385" + cx="140.5" + cy="106" + r="10" /> + <circle + style="fill:#a3c4f3;fill-opacity:1;stroke-width:0.228314" + id="circle31387" + cx="171" + cy="106" + r="10" /> + <circle + style="fill:#bae8f8;fill-opacity:1;stroke-width:0.228314" + id="circle31391" + cx="201.5" + cy="106" + r="10" /> + <circle + style="fill:#8eecf5;fill-opacity:1;stroke-width:0.228314" + id="circle31393" + cx="232" + cy="106" + r="10" /> + <circle + style="fill:#b9fbc0;fill-opacity:1;stroke-width:0.228314" + id="circle32121" + cx="262.5" + cy="106" + r="10" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';letter-spacing:-1.19062px;fill:#b9fbc0;fill-opacity:1;stroke-width:0.264583" + x="12.075911" + y="108.12373" + id="text32177"><tspan + sodipodi:role="line" + id="tspan32175" + style="fill:#000000;stroke-width:0.264583" + x="12.075911" + y="108.12373">\ / |</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="43.535473" + y="108.49767" + id="text32181"><tspan + sodipodi:role="line" + id="tspan32179" + style="stroke-width:0.264583" + x="43.535473" + y="108.49767">ent</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="79.151031" + y="105.47487" + id="text32185"><tspan + sodipodi:role="line" + id="tspan32183" + style="stroke-width:0.264583" + x="79.151031" + y="105.47487"></tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.46667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="75.046532" + y="108.1844" + id="text32189"><tspan + sodipodi:role="line" + id="tspan32187" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:'Lilex Nerd Font Mono';-inkscape-font-specification:'Lilex Nerd Font Mono';stroke-width:0.264583" + x="75.046532" + y="108.1844">:</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:-0.79375px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="101.86079" + y="108.4077" + id="text32193"><tspan + sodipodi:role="line" + id="tspan32191" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';stroke-width:0.264583" + x="101.86079" + y="108.4077" + dx="0">' / "</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.05556px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="140.70108" + y="102.13883" + id="text32197"><tspan + sodipodi:role="line" + id="tspan32195" + style="text-align:center;text-anchor:middle;stroke-width:0.264583" + x="140.70108" + y="102.13883" + dy="2.5999999">cap</tspan><tspan + sodipodi:role="line" + style="text-align:center;text-anchor:middle;stroke-width:0.264583" + x="140.70108" + y="110.95828" + id="tspan32199">word</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.46667px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="171.00423" + y="108.99297" + id="text32203"><tspan + sodipodi:role="line" + id="tspan32201" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:8.46667px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Medium';stroke-width:0.264583" + x="171.00423" + y="108.99297">=</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:8.46667px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Medium';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="201.50423" + y="108.73473" + id="text32207"><tspan + sodipodi:role="line" + id="tspan32205" + style="font-size:8.46667px;stroke-width:0.264583" + x="201.50423" + y="108.73473">+</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:8.46667px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Medium';text-align:center;letter-spacing:-0.79375px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="231.75023" + y="108.72203" + id="text32211"><tspan + sodipodi:role="line" + id="tspan32209" + style="stroke-width:0.264583" + x="231.35335" + y="108.72203">-/—</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:8.46667px;font-family:'3270Medium Nerd Font';-inkscape-font-specification:'3270Medium Nerd Font Medium';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583" + x="262.49152" + y="108.73473" + id="text32215"><tspan + sodipodi:role="line" + id="tspan32213" + style="stroke-width:0.264583" + x="262.49152" + y="108.73473">_</tspan></text> </g> </svg> @@ -1,5 +1,6 @@ ### qmk.me -this is a self-contained repository for my personal [qmk](https://github.com/qmk/qmk_firmware) userspace & keyboard code.\ +this is a self-contained repository for my personal [qmk](https://github.com/qmk/qmk_firmware) userspace & keyboard code. + ![keyboard](https://i.imgur.com/s0dN0JDh.jpeg) ### building @@ -14,35 +15,22 @@ qmk compile -kb relic -km waffle ``` ### layout -![layout](https://i.imgur.com/uKNJuKi.png) +a simple 34-key layout that makes use of 2 (primary) layers, home-row mods, & combos for many symbols. +![layout](img/layout.svg) ### combos +(illustrated in colored circles above) [combos.h](waffle/combos.h) contains macros that allow for combos be simply defined in a `combos.def` file as ``` CMB(<name>, <output>, <trigger keycodes>) ``` -`#define COMBO_TERM 40` -| trigger | output (single/double tap) | -| :-----: | :------------------------: | -| r + u | enter | -| v + m | ? | -| t + y | : | -| b + n | _ | -| s + l | + | -| d + k | = | -| g + h | ' / " | -| w + o | - / — | -| e + r | { / } | -| u + i | [ / ] | -| e + i | \ / \| | -| d + f | left click | -| f + g | right click | ### oled [font file](waffle/oledfont.h) can be viewed and modified at [qmk logo editor](https://joric.github.io/qle)\ all the boring animation code is stored in [oled.h](waffle/oled.h) **animations:**\ +[bongo cat](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L151-#L168)\ [felix the dog](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L128-#L149)\ ![sit](img/sit.png) ![walk](img/walk.png) ![run](img/run.png) ![bark](img/bark.png) ![sneak](img/sneak.png)\ [layer animation](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L203-#L226)\ @@ -50,8 +38,7 @@ all the boring animation code is stored in [oled.h](waffle/oled.h) ![sym](img/sym.png)\ ![sys](img/sys.png)\ [wpm graph](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L170-#L201)\ -![gif](img/wpm_graph.gif)\ -[bongo cat](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L151-#L168) +![gif](img/wpm_graph.gif) the below snippet is used to render the big byte arrays used by animations. where `size` is the array size and `action` is the animation frame name. @@ -145,7 +132,7 @@ cross-arm-none-eabi/gcc -openmp -fortran -hardened -sanitize -vtv -selinux -boun cross-arm-none-eabi/newlib -selinux -libraries multilib nano ``` additionally, if any sort of optimization is enabled (eg. O3), `_FORTIFY_SOURCE` is enabled for unknown reason. (see [`gentoo/01_all_default-fortify-source.patch`](https://gitweb.gentoo.org/proj/gcc-patches.git/tree/11.3.0/gentoo/01_all_default-fortify-source.patch))\ -which subsequently defines `__SSP_FORTIFY_LEVEL` and clashes with [QMK's printf](https://github.com/qmk/printf/tree/master) library: +which subsequently defines `__SSP_FORTIFY_LEVEL` and clashes with [qmk's printf](https://github.com/qmk/printf/tree/master) library: ```c #if __SSP_FORTIFY_LEVEL > 0 #include <ssp/stdio.h> diff --git a/waffle/combos.def b/waffle/combos.def index 3646ec1..8a7e051 100644 --- a/waffle/combos.def +++ b/waffle/combos.def @@ -1,17 +1,14 @@ // Copyright 2022 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later -// name output keys -CMB(ru_ent, KC_ENT, KC_R, KC_U) -CMB(dk_eql, KC_EQL, LCTL_T(KC_D), RCTL_T(KC_K)) -CMB(gh_quot, TD(QUOT_DQUO), KC_G, KC_H) -CMB(vm_ques, KC_QUES, KC_V, KC_M) -CMB(ty_coln, KC_COLN, KC_T, KC_Y) -CMB(bn_unds, KC_UNDS, KC_B, KC_N) -CMB(er_cbkt, TD(CBRKT), KC_E, KC_R) -CMB(ui_brkt, TD(BRKT), KC_U, KC_I) -CMB(sl_plus, KC_PLUS, LGUI_T(KC_S), RGUI_T(KC_L)) -CMB(ei_bsls, TD(BSLS_PIPE), KC_E, KC_I) -CMB(wo_mins, TD(EM_DASH), KC_W, KC_O) -CMB(df_btn1, KC_BTN1, KC_D, KC_F) -CMB(fg_btn2, KC_BTN2, KC_F, KC_G) +// name output keys +CMB(ru_ent, KC_ENT, KC_R, KC_U) +CMB(dk_eql, KC_EQL, LCTL_T(KC_D), RCTL_T(KC_K)) +CMB(gh_quot, TD(QUOT_DQUO), KC_G, KC_H) +CMB(ty_coln, KC_COLN, KC_T, KC_Y) +CMB(bn_unds, KC_UNDS, KC_B, KC_N) +CMB(er_cbkt, TD(CBRKT), KC_E, KC_R) +CMB(ui_brkt, TD(BRKT), KC_U, KC_I) +CMB(ccom_plus, KC_PLUS, KC_C, KC_COMM) +CMB(ei_bsls, TD(BSLS_PIPE), KC_E, KC_I) +CMB(vm_mins, TD(EM_DASH), KC_V, KC_M) diff --git a/waffle/waffle.h b/waffle/waffle.h index b6226e7..dbaa015 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -20,9 +20,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record); enum layers { _BASE, - _ADJUST, _LOWER, - _RAISE + _RAISE, + _ADJUST }; enum tapdances { |