fix broken layouts

Aurora-RGB · Jan 6, 2024 · cb9d0b2 · cb9d0b2
1 parent 985d3a1
commit cb9d0b2
Show file tree

Hide file tree

Showing 24 changed files with 145 additions and 447 deletions.
diff --git a/kb_layouts/Extra Features/2zone_1logo_mousepad.json b/kb_layouts/Extra Features/2zone_1logo_mousepad.json
@@ -15,7 +15,7 @@
             "enabled": true,
             "absolute_location": true
         },
-        { //logo
+        {
             "tag": 213,
             "visualName": "",
             "margin_left": 143.5,
@@ -29,7 +29,7 @@
             "enabled": true,
             "absolute_location": true
         },
-        { //right
+        {
             "tag": 214,
             "visualName": "",
             "margin_left": 200.0,
@@ -43,7 +43,7 @@
             "enabled": true,
             "absolute_location": true
         },
-        { //left
+        {
             "tag": 215,
             "visualName": "",
             "margin_left": 15.0,

diff --git a/kb_layouts/Extra Features/generic_60_percent_right_features.json b/kb_layouts/Extra Features/generic_60_percent_right_features.json
@@ -0,0 +1,20 @@
+{
+  "group_tag": "keyboard",
+  "origin_region": 2,
+  "grouped_keys": [
+    {
+      "visualName": "\\",
+      "tag": 51,
+      "margin_left": -47,
+      "margin_top": 37,
+      "width": 47.0,
+      "height": 30.0,
+      "font_size": 9.0,
+      "enabled": true,
+      "absolute_location": true
+    }
+  ],
+  "key_conversion": {
+    "77": 51
+  }
+}
diff --git a/kb_layouts/Extra Features/keyboard22jp_numpad_left_bottom_features.json b/kb_layouts/Extra Features/keyboard22jp_numpad_left_bottom_features.json
@@ -73,22 +73,5 @@
       "enabled": true,
       "absolute_location": true
     }
-    //,
-
-    //{
-    //  "visualName": "\\",
-    //  "tag": 54,
-    //  "margin_left": 452.0,
-    //  "margin_top": -74.0,
-    //  "width": 30.0,
-    //  "height": 30.0,
-    //  "font_size": 9.0,
-    //  "width_bits": 3,
-    //  "height_bits": 3,
-    //  "margin_left_bits": 4,
-    //  "margin_top_bits": -3,
-    //  "enabled": true,
-    //  "absolute_location": true
-    //}
   ]
-}
+}
diff --git a/kb_layouts/Extra Features/keyboard22usuk_numpad_left_bottom_features.json b/kb_layouts/Extra Features/keyboard22usuk_numpad_left_bottom_features.json
@@ -61,22 +61,6 @@
       "enabled": true,
       "absolute_location": true
     },
-
-    //{
-    //  "visualName": "+",
-    //  "tag": 54,
-    //  "margin_left": 666.0,
-    //  "margin_top": -222.0,
-    //  "width": 30.0,
-    //  "height": 30.0,
-    //  "font_size": 9.0,
-    //  "width_bits": 3,
-    //  "height_bits": 3,
-    //  "margin_left_bits": 4,
-    //  "margin_top_bits": -3,
-    //  "enabled": true,
-    //  "absolute_location": true
-    //},
     {
       "visualName": "FN",
       "tag": 107,
@@ -89,4 +73,4 @@
       "absolute_location": true
     }
   ]
-}
+}
diff --git a/kb_layouts/Extra Features/logitech_g102_features.json b/kb_layouts/Extra Features/logitech_g102_features.json
@@ -12,7 +12,7 @@
       "enabled": true,
       "absolute_location": true
     },
-    { //for now G102 has to use a single zone bc Logitech is big dumb dumb and zones don't work on G102. the SDK for G102 didn't even work at all for the last x years.
+    {
       "visualName": "Logo",
       "tag": 160,
       "margin_left": 18.0,
@@ -24,4 +24,4 @@
       "absolute_location": true
     }
   ]
-}
+}
diff --git a/kb_layouts/Uniwill2ND_35X_1.json b/kb_layouts/Uniwill2ND_35X_1.json
@@ -63,7 +63,8 @@
     },
     "13": {
       "tag": 13,
-      "margin_left": 7.0
+      "margin_left": 7.0,
+      "line_break": true
     },
 
 
@@ -72,14 +73,6 @@
 
       "margin_left": 7.0
     },
-    //home
-    //"32": {
-    //  "tag": 32,
-
-    //  "margin_left": 7.0
-    //},
-
-    //Number lock
     "34": {
       "tag": 34,
       "margin_left": 7
@@ -107,24 +100,18 @@
       "margin_left": 7,
       "width": 30
     },
-    //number 7
     "55": {
       "tag": 55,
       "margin_left": 62
     },
-    //number 8
     "56": {
       "tag": 56,
       "margin_left": 7
     },
-
-    //number 9
     "57": {
       "tag": 57,
       "margin_left": 7
     },
-
-    //+
     "58": {
       "margin_left": 7,
       "line_break": true
@@ -144,7 +131,6 @@
     "73": {
       "margin_left": 7
     },
-    //number 6
     "75": {
       "line_break": true
     },
@@ -156,25 +142,20 @@
       "height": 30.0,
       "font_size": 12.0
     },
-    //right shift
     "88": {
       "tag": 88,
       "width": 57
     },
-
-    //"↑"
     "89": {
       "tag": 89,
       "margin_left": 7
     },
     "90": {
       "margin_left": 7.0
     },
-    //Number enter
     "93": {
       "line_break": true
     },
-    //LeftControl
     "94": {
       "tag": 94,
       "width": 41
@@ -204,7 +185,6 @@
       "margin_left": 7,
       "width": 30
     },
-    //Rith control
     "101": {
       "tag": 101,
       "margin_left": 7,
@@ -231,7 +211,6 @@
 
   "included_features": [
     "keyboard_numpad_left_bottom_features.json",
-    //"generic_laptop_numpad_right_bottom_features.json",
     "keyboard101_numpad_right_features.json"
 
   ]

diff --git a/kb_layouts/Uniwill2ND_35X_2.json b/kb_layouts/Uniwill2ND_35X_2.json
@@ -63,7 +63,8 @@
     },
     "13": {
       "tag": 13,
-      "margin_left": 7.0
+      "margin_left": 7.0,
+      "line_break": true
     },
 
 
@@ -72,14 +73,6 @@
 
       "margin_left": 7.0
     },
-    //home
-    //"32": {
-    //  "tag": 32,
-
-    //  "margin_left": 7.0
-    //},
-
-    //Number lock
     "34": {
       "tag": 34,
       "margin_left": 7
@@ -107,38 +100,29 @@
       "margin_left": 7,
       "width": 30
     },
-    //number 7
     "55": {
       "tag": 55,
       "margin_left": 62
     },
-    //number 8
     "56": {
       "tag": 56,
       "margin_left": 7
     },
-
-    //number 9
     "57": {
       "tag": 57,
       "margin_left": 7
     },
-
-    //+
     "58": {
       "margin_left": 7,
       "line_break": true
 
 
     },
-
-    //key ~
     "71": {
       "visualName": "~",
       "tag": 71
 
     },
-    //ENTER
     "72": {
       "tag": 72,
       "margin_left": 7.0,
@@ -150,11 +134,9 @@
     "73": {
       "margin_left": 7
     },
-    //number 6
     "75": {
       "line_break": true
     },
-    //left shift
     "76": {
       "tag": 76,
       "margin_left": 0.0,
@@ -163,30 +145,23 @@
       "height": 30.0,
       "font_size": 12.0
     },
-    // \
     "77": {
       "tag": 77
     },
-
-    //right shift
     "88": {
       "tag": 88,
       "width": 57
     },
-
-    //"↑"
     "89": {
       "tag": 89,
       "margin_left": 7
     },
     "90": {
       "margin_left": 7.0
     },
-    //Number enter
     "93": {
       "line_break": true
     },
-    //LeftControl
     "94": {
       "tag": 94,
       "width": 41
@@ -216,7 +191,6 @@
       "margin_left": 7,
       "width": 30
     },
-    //Rith control
     "101": {
       "tag": 101,
       "margin_left": 7,
@@ -244,7 +218,5 @@
   "included_features": [
     "keyboard_numpad_left_bottom_features.json"
 
-    //"keyboard102_numpad_right_features.json"
-
   ]
 }