Merge branch 'main' into r6

faceplate/faceplate-footprints.pretty/JD-T1800.kicad_mod

@@ -9,16 +9,6 @@
       (effects (font (size 1.524 1.524) (thickness 0.15)))
     (tstamp 6d232cc5-1e84-4b3a-8fce-910b4457008e)
   )
-  (fp_line (start -16.99768 -22.9997) (end 16.99768 -22.9997)
-    (stroke (width 0.127) (type solid)) (layer "B.SilkS") (tstamp 5a93f7bd-03d7-4aff-8dd9-6b993f184879))
-  (fp_line (start -16.99768 22.9997) (end -16.99768 -22.9997)
-    (stroke (width 0.127) (type solid)) (layer "B.SilkS") (tstamp a9c3045a-a7ee-4eff-bb1f-3ffb254cea07))
-  (fp_line (start -5.19938 12.89812) (end 5.19938 12.89812)
-    (stroke (width 0.127) (type solid)) (layer "B.SilkS") (tstamp ff88240b-5a99-4776-978a-6c137fd9ed56))
-  (fp_line (start 16.99768 -22.9997) (end 16.99768 22.9997)
-    (stroke (width 0.127) (type solid)) (layer "B.SilkS") (tstamp 4175039e-64a7-43b1-97b6-0ae94931c76b))
-  (fp_line (start 16.99768 22.9997) (end -16.99768 22.9997)
-    (stroke (width 0.127) (type solid)) (layer "B.SilkS") (tstamp 5d022126-47a4-4046-b764-67b0b1f1c248))
   (fp_line (start -13.09878 16.89862) (end -12.49934 16.89862)
     (stroke (width 0.127) (type solid)) (layer "F.SilkS") (tstamp bb1ccf38-0d81-4709-bc56-eb4b083b0ce0))
   (fp_line (start -12.79906 17.19834) (end -12.79906 16.5989)

faceplate/faceplate-footprints.pretty/qtouch-button.kicad_mod

@@ -1,6 +1,5 @@
-(footprint "qtouch-button" (version 20211014) (generator pcbnew)
+(footprint "qtouch-button" (version 20221018) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 0)
   (attr smd)
   (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
@@ -14,6 +13,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
     (tstamp c5d799e9-aa64-4815-b5df-94355890efbe)
   )
-  (fp_circle (center 0 0) (end 2.5 0) (layer "F.Cu") (width 0) (fill solid) (tstamp ebb1347e-43ce-4ede-81fd-1525081de778))
-  (pad "1" smd roundrect (at 0 -2.6) (size 0.254 1) (layers "F.Cu") (roundrect_rratio 0.25) (tstamp e0c76109-6a41-4332-bb61-eedc26860458))
+  (fp_circle (center 0 0) (end 2.5 0)
+    (stroke (width 0) (type solid)) (fill solid) (layer "F.Cu") (tstamp ebb1347e-43ce-4ede-81fd-1525081de778))
+  (pad "1" thru_hole circle (at 0 0) (size 1 1) (drill 0.2) (layers "*.Cu") (tstamp bb5ba437-b5e3-47b4-9ad6-c4769338f968))
 )

faceplate/gay-ipod-faceplate.kicad_prl

@@ -1,11 +1,11 @@
 {
   "board": {
-    "active_layer": 39,
+    "active_layer": 0,
     "active_layer_preset": "",
     "auto_track_width": true,
     "hidden_netclasses": [],
     "hidden_nets": [],
-    "high_contrast_mode": 0,
+    "high_contrast_mode": 1,
     "net_color_mode": 1,
     "opacity": {
       "images": 0.6,
@@ -39,7 +39,6 @@
       9,
       10,
       11,
-      12,
       13,
       15,
       16,

faceplate/gay-ipod-faceplate.kicad_pro

@@ -34,9 +34,9 @@
         "other_text_thickness": 0.15,
         "other_text_upright": false,
         "pads": {
-          "drill": 0.762,
-          "height": 1.524,
-          "width": 1.524
+          "drill": 0.0,
+          "height": 0.3,
+          "width": 1.45
         },
         "silk_line_width": 0.15,
         "silk_text_italic": false,
@@ -46,7 +46,7 @@
         "silk_text_upright": false,
         "zones": {
           "45_degree_only": false,
-          "min_clearance": 0.254
+          "min_clearance": 0.127
         }
       },
       "diff_pair_dimensions": [
@@ -175,10 +175,12 @@
         }
       ],
       "track_widths": [
+        0.0,
         0.0,
         0.127,
-        0.254,
-        0.5
+        0.25,
+        0.5,
+        0.8
       ],
       "via_dimensions": [
         {
@@ -437,14 +439,42 @@
         "via_diameter": 0.8,
         "via_drill": 0.4,
         "wire_width": 6
+      },
+      {
+        "bus_width": 12,
+        "clearance": 0.5,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.3,
+        "microvia_drill": 0.1,
+        "name": "QTouch",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.25,
+        "via_diameter": 0.8,
+        "via_drill": 0.4,
+        "wire_width": 6
       }
     ],
     "meta": {
       "version": 3
     },
     "net_colors": null,
-    "netclass_assignments": null,
-    "netclass_patterns": []
+    "netclass_assignments": {
+      "Net-(SW1-Pin_1)": "QTouch",
+      "Net-(SW2-Pin_1)": "QTouch",
+      "Net-(SW2-Pin_2)": "QTouch",
+      "Net-(SW2-Pin_3)": "QTouch",
+      "Net-(SW3-Pin_1)": "QTouch"
+    },
+    "netclass_patterns": [
+      {
+        "netclass": "QTouch",
+        "pattern": "SW."
+      }
+    ]
   },
   "pcbnew": {
     "last_paths": {

mainboard/gay-ipod.kicad_prl

@@ -5,7 +5,7 @@
     "auto_track_width": true,
     "hidden_netclasses": [],
     "hidden_nets": [],
-    "high_contrast_mode": 1,
+    "high_contrast_mode": 0,
     "net_color_mode": 1,
     "opacity": {
       "images": 0.6,