tidbit: update to use encoder map (#2007)

the-via · Sep 2, 2023 · a423b62 · a423b62
1 parent 7e98405
commit a423b62
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 136 deletions.
diff --git a/src/nullbitsco/tidbit.json b/src/nullbitsco/tidbit.json
@@ -3,81 +3,23 @@
   "vendorId": "0x6E61",
   "productId": "0x6064",
   "lighting": "qmk_rgblight",
-  "matrix": {"rows": 5, "cols": 6},
+  "matrix": {"rows": 5,"cols": 6},
   "layouts": {
     "labels": [
-      "Split 2U + Key",
-      "Split 2U Enter Key",
-      "Split 2U 0 Key",
+      "2U + Key",
+      "2U Enter Key",
       ["Rotary Encoder 1", "Enabled", "Disabled"],
       ["Rotary Encoder 2", "Enabled", "Disabled"],
       ["Rotary Encoder 3", "Enabled", "Disabled"],
-      ["Rotary Encoder 4", "Enabled", "Disabled"]
+      ["Rotary Encoder 4/2U 0 Key", "Split 0 Keys", "2U 0 Key", "Rotary Encoder 4"]
     ],
     "keymap": [
-      [{"x": 3.25}, "0,3", "0,4", "0,5"],
-      [
-        "1,0\n\n\n3,0",
-        "1,1\n\n\n3,0",
-        {"x": 0.25},
-        "1,2",
-        "1,3",
-        {"x": -1},
-        "1,3",
-        "1,4",
-        {"h": 2},
-        "1,5\n\n\n0,0",
-        {"x": 0.25},
-        "1,5\n\n\n0,1",
-        {"x": 0.25, "d": true},
-        "1,0\n\n\n3,1",
-        {"d": true},
-        "1,1\n\n\n3,1"
-      ],
-      [
-        "2,0\n\n\n4,0",
-        "2,1\n\n\n4,0",
-        {"x": 0.25},
-        "2,2",
-        "2,3",
-        "2,4",
-        {"x": 1.25},
-        "2,5\n\n\n0,1",
-        {"x": 0.25, "d": true},
-        "2,0\n\n\n4,1",
-        {"d": true},
-        "2,1\n\n\n4,1"
-      ],
-      [
-        "3,0\n\n\n5,0",
-        "3,1\n\n\n5,0",
-        {"x": 0.25},
-        "3,2",
-        "3,3",
-        "3,4",
-        {"h": 2},
-        "3,5\n\n\n1,0",
-        {"x": 0.25},
-        "3,5\n\n\n1,1",
-        {"x": 0.25, "d": true},
-        "3,0\n\n\n5,1",
-        {"d": true},
-        "3,1\n\n\n5,1"
-      ],
-      [
-        "4,0\n\n\n6,0",
-        "4,1\n\n\n6,0",
-        {"x": 0.25, "w": 2},
-        "4,2\n\n\n2,0",
-        "4,4",
-        {"x": 1.25},
-        "4,5\n\n\n1,1",
-        {"x": 0.25, "d": true},
-        "4,0\n\n\n6,1",
-        {"d": true},
-        "4,1\n\n\n6,1"
-      ],
-      [{"y": 0.25, "x": 2.25}, "4,2\n\n\n2,1", "4,3\n\n\n2,1"]
+      [{"x":3.25},"0,3","0,4","0,5"],
+      [{"x":1},"1,2\n\n\n2,1",{"x":0.25},"1,2\n\n\n2,0\n\n\n\n\n\ne0","1,3",{"x":-1},"1,3","1,4","1,5\n\n\n0,0",{"x":0.25,"h":2},"1,5\n\n\n0,1"],
+      [{"x":1},"2,2\n\n\n3,1",{"x":0.25},"2,2\n\n\n3,0\n\n\n\n\n\ne1","2,3","2,4","2,5\n\n\n0,0"],
+      [{"x":1},"3,2\n\n\n4,1",{"x":0.25},"3,2\n\n\n4,0\n\n\n\n\n\ne2","3,3","3,4","3,5\n\n\n1,0",{"x":0.25,"h":2},"3,5\n\n\n1,1"],
+      [{"x":1},"4,2\n\n\n5,2\n\n\n\n\n\ne3","4,3\n\n\n5,2",{"x":-0.75},"4,2\n\n\n5,0","4,3\n\n\n5,0","4,4","4,5\n\n\n1,0"],
+      [{"y":0.25,"x":2.25,"w":2},"4,2\n\n\n5,1"]
     ]
   }
 }
diff --git a/v3/nullbitsco/tidbit.json b/v3/nullbitsco/tidbit.json
@@ -4,81 +4,23 @@
   "productId": "0x6064",
   "keycodes": ["qmk_lighting"],
   "menus": ["qmk_rgblight"],
-  "matrix": {"rows": 5, "cols": 6},
+  "matrix": {"rows": 5,"cols": 6},
   "layouts": {
     "labels": [
-      "Split 2U + Key",
-      "Split 2U Enter Key",
-      "Split 2U 0 Key",
+      "2U + Key",
+      "2U Enter Key",
       ["Rotary Encoder 1", "Enabled", "Disabled"],
       ["Rotary Encoder 2", "Enabled", "Disabled"],
       ["Rotary Encoder 3", "Enabled", "Disabled"],
-      ["Rotary Encoder 4", "Enabled", "Disabled"]
+      ["Rotary Encoder 4/2U 0 Key", "Split 0 Keys", "2U 0 Key", "Rotary Encoder 4"]
     ],
     "keymap": [
-      [{"x": 3.25}, "0,3", "0,4", "0,5"],
-      [
-        "1,0\n\n\n3,0",
-        "1,1\n\n\n3,0",
-        {"x": 0.25},
-        "1,2",
-        "1,3",
-        {"x": -1},
-        "1,3",
-        "1,4",
-        {"h": 2},
-        "1,5\n\n\n0,0",
-        {"x": 0.25},
-        "1,5\n\n\n0,1",
-        {"x": 0.25, "d": true},
-        "1,0\n\n\n3,1",
-        {"d": true},
-        "1,1\n\n\n3,1"
-      ],
-      [
-        "2,0\n\n\n4,0",
-        "2,1\n\n\n4,0",
-        {"x": 0.25},
-        "2,2",
-        "2,3",
-        "2,4",
-        {"x": 1.25},
-        "2,5\n\n\n0,1",
-        {"x": 0.25, "d": true},
-        "2,0\n\n\n4,1",
-        {"d": true},
-        "2,1\n\n\n4,1"
-      ],
-      [
-        "3,0\n\n\n5,0",
-        "3,1\n\n\n5,0",
-        {"x": 0.25},
-        "3,2",
-        "3,3",
-        "3,4",
-        {"h": 2},
-        "3,5\n\n\n1,0",
-        {"x": 0.25},
-        "3,5\n\n\n1,1",
-        {"x": 0.25, "d": true},
-        "3,0\n\n\n5,1",
-        {"d": true},
-        "3,1\n\n\n5,1"
-      ],
-      [
-        "4,0\n\n\n6,0",
-        "4,1\n\n\n6,0",
-        {"x": 0.25, "w": 2},
-        "4,2\n\n\n2,0",
-        "4,4",
-        {"x": 1.25},
-        "4,5\n\n\n1,1",
-        {"x": 0.25, "d": true},
-        "4,0\n\n\n6,1",
-        {"d": true},
-        "4,1\n\n\n6,1"
-      ],
-      [{"y": 0.25, "x": 2.25}, "4,2\n\n\n2,1", "4,3\n\n\n2,1"]
+      [{"x":3.25},"0,3","0,4","0,5"],
+      [{"x":1},"1,2\n\n\n2,1",{"x":0.25},"1,2\n\n\n2,0\n\n\n\n\n\ne0","1,3",{"x":-1},"1,3","1,4","1,5\n\n\n0,0",{"x":0.25,"h":2},"1,5\n\n\n0,1"],
+      [{"x":1},"2,2\n\n\n3,1",{"x":0.25},"2,2\n\n\n3,0\n\n\n\n\n\ne1","2,3","2,4","2,5\n\n\n0,0"],
+      [{"x":1},"3,2\n\n\n4,1",{"x":0.25},"3,2\n\n\n4,0\n\n\n\n\n\ne2","3,3","3,4","3,5\n\n\n1,0",{"x":0.25,"h":2},"3,5\n\n\n1,1"],
+      [{"x":1},"4,2\n\n\n5,2\n\n\n\n\n\ne3","4,3\n\n\n5,2",{"x":-0.75},"4,2\n\n\n5,0","4,3\n\n\n5,0","4,4","4,5\n\n\n1,0"],
+      [{"y":0.25,"x":2.25,"w":2},"4,2\n\n\n5,1"]
     ]
   }
 }