Merge branch 'hardware-65percent' into dev

hardware/68percent/68percent.csv

@@ -0,0 +1,26 @@
+2"Reference","Qty","Value","DNP","Exclude from BOM","Exclude from Board","Footprint","Datasheet"
+"C1,C2","2","20pF","","","","PCM_Capacitor_SMD_AKL:C_0805_2012Metric","~"
+"C3,C4,C5,C6","4","100nF","","","","PCM_Capacitor_SMD_AKL:C_0805_2012Metric","~"
+"C7,C10","2","1uF","","","","PCM_Capacitor_SMD_AKL:C_0805_2012Metric","~"
+"C8","1","10uF","","","","PCM_Capacitor_SMD_AKL:C_0805_2012Metric","~"
+"C9","1","4.7uF","","","","PCM_Capacitor_SMD_AKL:C_0805_2012Metric","~"
+"C11","1","0.1uF","","","","PCM_Capacitor_SMD_AKL:C_0805_2012Metric","~"
+"D1","1","PRTR5V0U2X","","","","PCM_Package_TO_SOT_SMD_AKL:SOT-143_Handsoldering","https://www.tme.eu/Document/4eac14af69261014af6cc93b35742953/PRTR5V0U2X-DTE.pdf"
+"D2","1","BAT60JFILM","","","","PCM_Diode_SMD_AKL:D_SOD-323",""
+"D3,D4,D5,D6,D7,D8,D9,D10,D11,D12,D13,D14,D15,D16,D17,D18,D19,D20,D21,D22,D23,D24,D25,D26,D27,D28,D29","27","1N4148W","","","","PCM_Diode_SMD_AKL:D_SOD-123","https://datasheet.octopart.com/1N4148W-HE3-18-Vishay-datasheet-17291302.pdf"
+"East1,North1,South1,West1","4","Conn_01x04","","","","Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical",""
+"FB1","1","Ferrite_Bead","","","","PCM_Fuse_AKL:Fuse_0805_2012Metric_Pad1.15x1.40mm_BigPads","~"
+"IC1","1","LD1117-3.3V-SOT223","","","","PCM_4ms_Package_SOT:SOT223","https://www.mouser.com/datasheet/2/389/cd00000544-1795431.pdf"
+"J1","1","Conn_01x06","","","","Connector_PinSocket_2.54mm:PinSocket_1x06_P2.54mm_Horizontal",""
+"LED1,LED2,LED3,LED4,LED5,LED6,LED7,LED8,LED9,LED10,LED11,LED12,LED13,LED14,LED15,LED16,LED17,LED18,LED19,LED20,LED21,LED22,LED23,LED24,LED25,LED26,LED27","27","MX_SK6812MINI-E","","","","PCM_marbastlib-mx:LED_MX_6028R",""
+"MACRO_A1,MACRO_B1,MACRO_C1,MACRO_D1,MACRO_E1,MACRO_F1,MACRO_G1,MACRO_H1,MACRO_I1,NUM_0,NUM_1,NUM_2,NUM_3,NUM_4,NUM_5,NUM_6,NUM_7,NUM_8,NUM_10,NUM_ADD1,NUM_DIV1,NUM_ENTER1,NUM_LOCK1,NUM_MULT1,NUM_PERIOD1,NUM_SUB1","26","MX_SW_HS","","","","PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u","~"
+"R1,R2","2","5.1k","","","","PCM_Resistor_SMD_AKL:R_0805_2012Metric","~"
+"R3,R4,R6,R7,R8,R9","6","22","","","","PCM_Resistor_SMD_AKL:R_0805_2012Metric","~"
+"R5","1","10k","","","","PCM_Resistor_SMD_AKL:R_0805_2012Metric","~"
+"R10,R13","2","DNP","","","","PCM_Resistor_SMD_AKL:R_0805_2012Metric","~"
+"S1,S2,S3","3","MX_stab","","","","PCM_marbastlib-mx:STAB_MX_P_2u",""
+"SW1","1","ROT_SKYLOONG_HS","","Excluded from BOM","","PCM_marbastlib-various:ROT_SKYLOONG_HS-Switch","https://skyloong.vip/products/abs-hot-swappable-knobs-madule"
+"SW2","1","Push_Button","","","","PCM_marbastlib-various:SW_SPST_SKQG_WithStem",""
+"U1","1","~","","","","footprints:LQFP64-10x10mm",""
+"USB1","1","HRO-TYPE-C-31-M-12","","","","Type-C.pretty-master:HRO-TYPE-C-31-M-12-HandSoldering",""
+"Y1","1","8MHz","","","","PCM_Crystal_AKL:Crystal_HC52-U_Vertical",""

hardware/68percent/68percent.kicad_dru

@@ -0,0 +1,169 @@
+(version 1)
+#PCBWay Custom DRC for Kicad 7
+
+# ----------------------------------- Minimum trace width and spacing (PICK ONE) --------------------
+
+# 2oz copper
+#(rule "Minimum Trace Width and Spacing (outer layer)"
+#(constraint track_width (min 0.1524mm))
+#(constraint clearance (min 0.1778mm))
+#(layer outer)
+#(condition "A.Type == 'track'"))
+
+#(rule "Minimum Trace Width and Spacing (innner layer)"
+#(constraint track_width (min 0.1524mm))
+#(constraint clearance (min 0.1778mm))
+#(layer inner)
+#(condition "A.Type == 'track'"))
+
+
+# 2-layer, 1oz copper
+(rule "Minimum Trace Width and Spacing (outer layer)"
+(constraint track_width (min 0.127mm))
+(constraint clearance (min 0.127mm))
+(layer outer)
+(condition "A.Type == 'track'"))
+
+(rule "Minimum Trace Width and Spacing (inner layer)"
+(constraint track_width (min 0.1mm))
+(constraint clearance (min 0.1mm))
+(layer inner)
+(condition "A.Type == 'track'"))
+
+# 4-layer , 1oz and 0.5oz copper
+#(rule "Minimum Trace Width and Spacing (outer layer)"
+#(constraint track_width (min 0.09mm))
+#(constraint clearance (min 0.09mm))
+#(layer outer)
+#(condition "A.Type == 'track'"))
+
+#(rule "Minimum Trace Width and Spacing (inner layer)"
+#(constraint track_width (min 0.1mm))
+#(constraint clearance (min 0.09mm))
+#(layer inner)
+#(condition "A.Type == 'track'"))
+
+# ------------------------------------------------------------------------------------------------------
+
+# Drill/hole size - listed here to maintain order of rule application. Must not override rule set in Via hole/diameter size below.
+(rule "drill hole size (mechanical)"
+(constraint hole_size (min 0.15mm) (max 6.3mm)))
+
+# ----------------------------------- Via hole/diameter size (PICK ONE) ------------------------------------
+
+# 2-layer standard
+(rule "Minimum Via Diameter and Hole Size"
+(constraint hole_size (min 0.3mm))
+(constraint via_diameter (min 0.5mm))
+(condition "A.Type == 'via'"))
+
+# 4-layer standard
+#(rule "Minimum Via Diameter and Hole Size"
+#(constraint hole_size (min 0.3mm))
+#(constraint via_diameter (min 0.45mm))
+#(condition "A.Type == 'via'"))
+
+# 4-layer advanced
+#(rule "Minimum Via Diameter and Hole Size"
+#(constraint hole_size (min 0.25mm))
+#(constraint via_diameter (min 0.4mm))
+#(constraint disallow buried_via)
+#(condition "A.Type == 'via'"))
+
+# 4-layer advanced
+#(rule "Minimum Via Diameter and Hole Size"
+#(constraint hole_size (min 0.2mm))
+#(constraint via_diameter (min 0.35mm))
+#(condition "A.Type == 'via'"))
+
+# 4-layer advanced
+#(rule "Minimum Via Diameter and Hole Size"
+#(constraint hole_size (min 0.15mm))
+#(constraint via_diameter (min 0.3mm))
+#(condition "A.Type == 'via'"))
+
+# ----------------------------------- Drill/hole size ------------------------------------
+
+(rule "PTH Hole Size"
+(constraint hole_size (min 0.2mm) (max 6.35mm))
+(condition "A.Type != 'Via' && A.isPlated()"))
+
+(rule "Minimum Non-plated Hole Size"
+(constraint hole_size (min 0.5mm))
+(condition "A.Type == 'pad' && !A.isPlated()"))
+
+(rule "Pad Size"
+(constraint hole_size (min 0.5mm))
+(constraint annular_width (min 0.25mm))
+(condition "A.Type == 'Pad' && A.isPlated()"))
+
+(rule "Minimum Castellated Hole Size"
+(constraint hole_size (min 0.6mm))
+(condition "A.Type == 'pad' && A.Fabrication_Property == 'Castellated pad'"))
+
+(rule "Min. Plated Slot Width"
+(constraint hole_size (min 0.5mm))
+(condition "(A.Hole_Size_X != A.Hole_Size_Y) && A.isPlated()"))
+
+(rule "Min. Non-Plated Slot Width"
+(constraint hole_size (min 0.8mm))
+(condition "(A.Hole_Size_X != A.Hole_Size_Y) && !A.isPlated()"))
+
+# ----------------------------------- Minimum clearance ----------------------------------
+(rule "hole to hole clearance (different nets)"
+(constraint hole_to_hole (min 0.5mm))
+(condition "A.Net != B.Net"))
+
+(rule "via to track clearance"
+(constraint hole_clearance (min 0.254mm))
+(condition "A.Type == 'via' && B.Type == 'track'"))
+
+(rule "via to via clearance (same nets)"
+(constraint hole_to_hole (min 0.254mm))
+(condition "A.Type == 'via' && B.Type == A.Type && A.Net == B.Net"))
+
+(rule "pad to pad clearance (with hole, different nets)"
+(constraint hole_to_hole (min 0.5mm))
+(condition "A.Type == 'pad' && B.Type == A.Type && A.Net != B.Net"))
+
+(rule "pad to pad clearance (without hole, different nets)"
+(constraint clearance (min 0.127mm))
+(condition "A.Type == 'Pad' && B.Type == 'Pad'"))
+
+(rule "NPTH to Track clearance"
+(constraint hole_clearance (min 0.254mm))
+(condition "A.Pad_Type == 'NPTH, mechanical' && B.Type == 'track'"))
+
+(rule "NPTH with copper around"
+(constraint hole_clearance (min 0.20mm))
+(condition "A.Pad_Type == 'NPTH, mechanical' && B.Type != 'track'"))
+
+(rule "PTH to Track clearance"
+(constraint hole_clearance (min 0.33mm))
+(condition "A.isPlated() && A.Type != 'Via' && B.Type == 'track'"))
+
+(rule "Pad to Track clearance"
+(constraint clearance (min 0.2mm))
+(condition "A.isPlated() && A.Type != 'Via' && B.Type == 'track'"))
+
+# ----------------------------------- Board Outlines (PICK ONE) -------------------------------------
+#Default Routed Edge Clearance
+(rule "Trace to Outline"
+(constraint edge_clearance (min 0.3mm))
+(condition "A.Type == 'track'"))
+
+#Special Clearance for V-Score Edges
+#(rule "Trace to V-Cut"
+#(constraint edge_clearance (min 0.4mm))
+#(condition "A.Type == 'track'"))
+
+# ----------------------------------- silkscreen --------------------------
+(rule "Minimum Text"
+(constraint text_thickness (min 0.15mm))
+(constraint text_height (min 0.8mm))
+(layer "?.Silkscreen"))
+
+(rule "Pad to Silkscreen"
+(constraint silk_clearance (min 0.15mm))
+(layer outer)
+(condition "A.Type == 'pad' && (B.Type == 'text' || B.Type == 'graphic')"))

hardware/68percent/68percent.kicad_prl

@@ -12,8 +12,13 @@
       "pads": 1.0,
       "shapes": 1.0,
       "tracks": 1.0,
+<<<<<<< HEAD
       "vias": 1.0,
       "zones": 0.6
+=======
+      "vias": 0.75,
+      "zones": 0.2199999988079071
+>>>>>>> hardware-65percent
     },
     "selection_filter": {
       "dimensions": true,
@@ -63,9 +68,54 @@
     "version": 5
   },
   "net_inspector_panel": {
+<<<<<<< HEAD
     "col_hidden": [],
     "col_order": [],
     "col_widths": [],
+=======
+    "col_hidden": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ],
+    "col_order": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11
+    ],
+    "col_widths": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+>>>>>>> hardware-65percent
     "custom_group_rules": [],
     "expanded_rows": [],
     "filter_by_net_name": true,
@@ -76,7 +126,11 @@
     "show_unconnected_nets": false,
     "show_zero_pad_nets": false,
     "sort_ascending": true,
+<<<<<<< HEAD
     "sorting_column": -1
+=======
+    "sorting_column": 0
+>>>>>>> hardware-65percent
   },
   "open_jobsets": [],
   "project": {

hardware/68percent/68percent.kicad_pro

@@ -63,17 +63,35 @@
           "width": 0.8
         }
       ],
+<<<<<<< HEAD
       "drc_exclusions": [],
+=======
+      "drc_exclusions": [
+        [
+          "starved_thermal|86345000|62115601|64ba6b94-7dc4-4d5b-8cfc-a023f0fb7e02|46435096-ba52-4903-afbe-e937b67b5c4a|F.Cu",
+          ""
+        ]
+      ],
+>>>>>>> hardware-65percent
       "meta": {
         "version": 2
       },
       "rule_severities": {
+<<<<<<< HEAD
         "annular_width": "error",
         "clearance": "error",
         "connection_width": "warning",
         "copper_edge_clearance": "error",
         "copper_sliver": "warning",
         "courtyards_overlap": "error",
+=======
+        "annular_width": "ignore",
+        "clearance": "error",
+        "connection_width": "warning",
+        "copper_edge_clearance": "ignore",
+        "copper_sliver": "warning",
+        "courtyards_overlap": "ignore",
+>>>>>>> hardware-65percent
         "creepage": "error",
         "diff_pair_gap_out_of_range": "error",
         "diff_pair_uncoupled_length_too_long": "error",
@@ -84,7 +102,11 @@
         "footprint_filters_mismatch": "ignore",
         "footprint_symbol_mismatch": "warning",
         "footprint_type_mismatch": "ignore",
+<<<<<<< HEAD
         "hole_clearance": "error",
+=======
+        "hole_clearance": "ignore",
+>>>>>>> hardware-65percent
         "hole_to_hole": "warning",
         "holes_co_located": "warning",
         "invalid_outline": "error",
@@ -667,6 +689,13 @@
     [
       "1d905906-6e74-4741-8b2e-53dc470a7c79",
       "Keymatrix"
+<<<<<<< HEAD
+=======
+    ],
+    [
+      "0330dd45-2776-4667-9e47-eb2dbca2bb32",
+      "RGB Lights"
+>>>>>>> hardware-65percent
     ]
   ],
   "text_variables": {}

hardware/68percent/68percent.kicad_sch

@@ -4622,6 +4622,19 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
+=======
+			(xy 237.49 111.76) (xy 237.49 113.03)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "02f26d5e-f208-4852-831f-33981d6c61c3")
+	)
+	(wire
+		(pts
+>>>>>>> hardware-65percent
 			(xy 43.18 58.42) (xy 49.53 58.42)
 		)
 		(stroke
@@ -4692,6 +4705,7 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
 			(xy 162.56 132.08) (xy 162.56 151.13)
 		)
 		(stroke
@@ -4702,6 +4716,8 @@
 	)
 	(wire
 		(pts
+=======
+>>>>>>> hardware-65percent
 			(xy 147.32 77.47) (xy 147.32 88.9)
 		)
 		(stroke
@@ -5052,6 +5068,7 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
 			(xy 175.26 63.5) (xy 175.26 88.9)
 		)
 		(stroke
@@ -5062,6 +5079,8 @@
 	)
 	(wire
 		(pts
+=======
+>>>>>>> hardware-65percent
 			(xy 248.92 129.54) (xy 248.92 132.08)
 		)
 		(stroke
@@ -5082,6 +5101,7 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
 			(xy 154.94 132.08) (xy 154.94 147.32)
 		)
 		(stroke
@@ -5092,6 +5112,8 @@
 	)
 	(wire
 		(pts
+=======
+>>>>>>> hardware-65percent
 			(xy 119.38 129.54) (xy 113.03 129.54)
 		)
 		(stroke
@@ -5792,13 +5814,21 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
 			(xy 160.02 132.08) (xy 160.02 151.13)
+=======
+			(xy 180.34 74.93) (xy 180.34 88.9)
+>>>>>>> hardware-65percent
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
+<<<<<<< HEAD
 		(uuid "a53cb74b-b460-44ad-b050-031ab179966a")
+=======
+		(uuid "a57d5cf2-2916-462d-9d02-f6005455b75d")
+>>>>>>> hardware-65percent
 	)
 	(wire
 		(pts
@@ -5902,6 +5932,19 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
+=======
+			(xy 175.26 63.5) (xy 175.26 88.9)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b82c56aa-688c-40b5-b8b5-ff1b4a6b304f")
+	)
+	(wire
+		(pts
+>>>>>>> hardware-65percent
 			(xy 116.84 104.14) (xy 144.78 104.14)
 		)
 		(stroke
@@ -6002,6 +6045,7 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
 			(xy 180.34 74.93) (xy 180.34 88.9)
 		)
 		(stroke
@@ -6012,6 +6056,8 @@
 	)
 	(wire
 		(pts
+=======
+>>>>>>> hardware-65percent
 			(xy 182.88 74.93) (xy 182.88 88.9)
 		)
 		(stroke
@@ -6342,6 +6388,19 @@
 	)
 	(wire
 		(pts
+<<<<<<< HEAD
+=======
+			(xy 241.3 111.76) (xy 237.49 111.76)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "f2d50c5d-23ff-4ca6-9c6b-30baf9349883")
+	)
+	(wire
+		(pts
+>>>>>>> hardware-65percent
 			(xy 222.25 101.6) (xy 231.14 101.6)
 		)
 		(stroke
@@ -6460,6 +6519,19 @@
 		)
 		(uuid "ffd7b1eb-f0cb-4e45-bbcc-845c938910c9")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL13"
+		(at 165.1 76.2 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "0872e688-18d5-464b-b239-05b725809904")
+	)
+>>>>>>> hardware-65percent
 	(label "ROW5"
 		(at 167.64 146.05 90)
 		(effects
@@ -6500,6 +6572,19 @@
 		)
 		(uuid "1491677d-b6de-4782-8f1b-3412b5901f80")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL2"
+		(at 203.2 124.46 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "14d9996a-aa1d-461c-947b-ff3f45311543")
+	)
+>>>>>>> hardware-65percent
 	(label "UART_TX_NORTH"
 		(at 49.53 92.71 180)
 		(effects
@@ -6520,6 +6605,19 @@
 		)
 		(uuid "1a741b36-5f5e-4bd0-ab79-047d4eb60e4c")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL11"
+		(at 177.8 74.93 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "1bb7e52c-8660-41fe-b7b9-24d5679fd926")
+	)
+>>>>>>> hardware-65percent
 	(label "COL5"
 		(at 242.57 26.67 270)
 		(effects
@@ -6530,6 +6628,7 @@
 		)
 		(uuid "1fc100fc-abc3-448f-82e1-8234efa092aa")
 	)
+<<<<<<< HEAD
 	(label "COL8"
 		(at 203.2 109.22 180)
 		(effects
@@ -6540,6 +6639,8 @@
 		)
 		(uuid "2120f686-1469-485c-a964-4af544d4c8a0")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "UART_TX_SOUTH"
 		(at 53.34 95.25 0)
 		(effects
@@ -6560,6 +6661,19 @@
 		)
 		(uuid "24f3dd47-e1e3-4f7f-8d03-05628870f1ec")
 	)
+<<<<<<< HEAD
+=======
+	(label "UART_TX_NORTH"
+		(at 123.19 129.54 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "2b2b9379-b6f0-4bcf-bddf-b2315719acaf")
+	)
+>>>>>>> hardware-65percent
 	(label "Place Near VDD Ports"
 		(at 41.91 165.1 0)
 		(effects
@@ -6570,6 +6684,7 @@
 		)
 		(uuid "2bb4aae6-3cf2-49aa-87c1-180df30a6830")
 	)
+<<<<<<< HEAD
 	(label "COL12"
 		(at 203.2 119.38 180)
 		(effects
@@ -6580,6 +6695,8 @@
 		)
 		(uuid "2dd81f62-0ea1-48ba-94ce-6214aee431b5")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "ROW1"
 		(at 177.8 146.05 90)
 		(effects
@@ -6590,6 +6707,7 @@
 		)
 		(uuid "2df47b70-1930-4887-8317-8498f4292996")
 	)
+<<<<<<< HEAD
 	(label "COL1"
 		(at 160.02 76.2 270)
 		(effects
@@ -6600,6 +6718,8 @@
 		)
 		(uuid "35cf5703-b237-43e3-8def-1a83fcdd56a2")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "NRST"
 		(at 229.87 142.24 0)
 		(effects
@@ -6610,6 +6730,19 @@
 		)
 		(uuid "377aec81-2f9d-439a-8ff8-8351613b5a76")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL6"
+		(at 203.2 114.3 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "38b93aeb-c3f7-4775-8c5d-f4fdd328edc5")
+	)
+>>>>>>> hardware-65percent
 	(label "SWO"
 		(at 170.18 74.93 270)
 		(effects
@@ -6630,6 +6763,7 @@
 		)
 		(uuid "3bb57688-3b26-4654-b7b3-b2e87452539d")
 	)
+<<<<<<< HEAD
 	(label "COL7"
 		(at 182.88 74.93 270)
 		(effects
@@ -6640,6 +6774,8 @@
 		)
 		(uuid "40ac12a5-ccc3-4c63-8eaa-cd830bb4c50c")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "VDD"
 		(at 139.7 73.66 180)
 		(effects
@@ -6651,13 +6787,18 @@
 		(uuid "41d1ade5-8210-4054-9cb5-676e258ad061")
 	)
 	(label "COL3"
+<<<<<<< HEAD
 		(at 165.1 76.2 270)
+=======
+		(at 203.2 121.92 180)
+>>>>>>> hardware-65percent
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify right bottom)
 		)
+<<<<<<< HEAD
 		(uuid "450f42af-3bab-4873-883e-859e675ee261")
 	)
 	(label "UART_TX_NORTH"
@@ -6679,6 +6820,9 @@
 			(justify left bottom)
 		)
 		(uuid "49a74743-1f19-4803-95ce-65fbcfcf3666")
+=======
+		(uuid "4665b37a-1cc0-472f-9aaa-24e2ffcaec18")
+>>>>>>> hardware-65percent
 	)
 	(label "COL3"
 		(at 237.49 26.67 270)
@@ -6700,6 +6844,19 @@
 		)
 		(uuid "4f52174a-7166-4096-85f8-c4b3064c9d92")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL14"
+		(at 162.56 76.2 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "51b3d42b-59cf-4c8b-8004-acd7db548d6b")
+	)
+>>>>>>> hardware-65percent
 	(label "VDD"
 		(at 33.02 152.4 0)
 		(effects
@@ -6710,6 +6867,7 @@
 		)
 		(uuid "52f6274d-9319-425e-9856-6028f0c4375f")
 	)
+<<<<<<< HEAD
 	(label "COL6"
 		(at 180.34 74.93 270)
 		(effects
@@ -6720,6 +6878,8 @@
 		)
 		(uuid "55ef1033-52ad-4a4c-abb2-4a87f669e520")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "COL4"
 		(at 240.03 26.67 270)
 		(effects
@@ -6740,6 +6900,7 @@
 		)
 		(uuid "5795c40c-5423-450b-aa2a-1bd4abcf5b2c")
 	)
+<<<<<<< HEAD
 	(label "COL9"
 		(at 203.2 111.76 180)
 		(effects
@@ -6750,6 +6911,8 @@
 		)
 		(uuid "5972eccf-3778-4255-b912-a7f3aa8a6514")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "D+"
 		(at 231.14 99.06 180)
 		(effects
@@ -6760,6 +6923,7 @@
 		)
 		(uuid "5a0b3c86-9793-44d1-a2d8-9600402ced23")
 	)
+<<<<<<< HEAD
 	(label "COL4"
 		(at 167.64 76.2 270)
 		(effects
@@ -6770,6 +6934,8 @@
 		)
 		(uuid "5a35616b-57aa-45a3-9a4c-738dea73386b")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "NRST"
 		(at 133.35 106.68 180)
 		(effects
@@ -6780,6 +6946,7 @@
 		)
 		(uuid "5d2adaf2-8f8b-4999-9547-ccedb6613e09")
 	)
+<<<<<<< HEAD
 	(label "COL15"
 		(at 203.2 127 180)
 		(effects
@@ -6790,6 +6957,8 @@
 		)
 		(uuid "5e32798c-498a-4ed5-abb2-ce1d9bb0940a")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "SWO"
 		(at 229.87 144.78 0)
 		(effects
@@ -6800,15 +6969,34 @@
 		)
 		(uuid "5ecab8f8-63a0-4572-9b85-28a525a98633")
 	)
+<<<<<<< HEAD
 	(label "UART_RX_SOUTH"
 		(at 147.32 154.94 90)
+=======
+	(label "UART_RX_NORTH"
+		(at 147.32 139.7 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "6122bc97-e07e-4adf-89b2-180f85ee6966")
+	)
+	(label "UART_RX_SOUTH"
+		(at 172.72 78.74 90)
+>>>>>>> hardware-65percent
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify left bottom)
 		)
+<<<<<<< HEAD
 		(uuid "64a8185d-c8c9-437e-aa1e-0840591f81c7")
+=======
+		(uuid "63fc0654-be18-4f2a-a55b-53555edbe2c2")
+>>>>>>> hardware-65percent
 	)
 	(label "UART_TX_WEST"
 		(at 49.53 107.95 180)
@@ -6821,6 +7009,29 @@
 		(uuid "6a08174c-d5da-4dc2-99f0-c0d2873ea18b")
 	)
 	(label "COL10"
+<<<<<<< HEAD
+=======
+		(at 180.34 74.93 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "6a58c484-2ea3-413b-8615-ba2811c350c7")
+	)
+	(label "COL12"
+		(at 167.64 76.2 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "6b5fc549-d58c-4de2-b4bb-118b4976d050")
+	)
+	(label "COL10"
+>>>>>>> hardware-65percent
 		(at 255.27 26.67 270)
 		(effects
 			(font
@@ -6870,6 +7081,7 @@
 		)
 		(uuid "77a3d361-47a0-4b74-9b05-707429d9cf5a")
 	)
+<<<<<<< HEAD
 	(label "COL10"
 		(at 203.2 114.3 180)
 		(effects
@@ -6880,6 +7092,8 @@
 		)
 		(uuid "77a693a8-cbb0-4a16-9ffa-ff644b1ef66d")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "VSS"
 		(at 149.86 77.47 270)
 		(effects
@@ -6890,6 +7104,7 @@
 		)
 		(uuid "780166be-d300-4885-bbb9-b8b93658a286")
 	)
+<<<<<<< HEAD
 	(label "COL11"
 		(at 203.2 116.84 180)
 		(effects
@@ -6900,6 +7115,8 @@
 		)
 		(uuid "7ca58e08-c365-4691-8526-02e2f709f173")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "VSS"
 		(at 149.86 143.51 90)
 		(effects
@@ -6930,6 +7147,7 @@
 		)
 		(uuid "8348d23a-0a8c-4a80-a092-2c011e4ecf26")
 	)
+<<<<<<< HEAD
 	(label "COL13"
 		(at 203.2 121.92 180)
 		(effects
@@ -6940,6 +7158,8 @@
 		)
 		(uuid "861b9f69-5164-46d8-ad69-517a598a79a4")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "VSS"
 		(at 201.93 93.98 180)
 		(effects
@@ -7000,6 +7220,7 @@
 		)
 		(uuid "8bd4b99c-2cb7-4e42-a63a-d77ead0034b9")
 	)
+<<<<<<< HEAD
 	(label "COL2"
 		(at 162.56 76.2 270)
 		(effects
@@ -7010,6 +7231,8 @@
 		)
 		(uuid "8d5ea51c-3018-499a-9feb-77558fc69925")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "Place near USB port"
 		(at 92.71 50.8 0)
 		(effects
@@ -7030,15 +7253,34 @@
 		)
 		(uuid "92086348-c6ef-454f-890c-11a873ceb43a")
 	)
+<<<<<<< HEAD
 	(label "COL5"
 		(at 177.8 74.93 270)
+=======
+	(label "COL4"
+		(at 203.2 119.38 180)
+>>>>>>> hardware-65percent
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify right bottom)
 		)
+<<<<<<< HEAD
 		(uuid "959bf094-985a-4d26-85c6-29f58b765d35")
+=======
+		(uuid "95fa2f23-8b81-47b7-bccb-9760f7b22390")
+	)
+	(label "COL9"
+		(at 182.88 74.93 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "96ffef80-1b7b-4d2b-a1f7-1b8580e75eed")
+>>>>>>> hardware-65percent
 	)
 	(label "Place Near VBAT"
 		(at 116.84 80.01 0)
@@ -7060,6 +7302,39 @@
 		)
 		(uuid "98066d23-6bbb-440b-b346-e60179dceea1")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL15"
+		(at 160.02 76.2 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "996c67c9-193a-4c61-9328-9fc555becd3d")
+	)
+	(label "RGB_DATAIN"
+		(at 237.49 113.03 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "9fa75837-02a6-4f2b-8b4a-bf84097a30c4")
+	)
+	(label "UART_TX_SOUTH"
+		(at 175.26 78.74 90)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "a21ae7e0-711c-45a6-9e0f-0ffa2e2613b5")
+	)
+>>>>>>> hardware-65percent
 	(label "UART_RX_WEST"
 		(at 212.09 106.68 180)
 		(effects
@@ -7110,6 +7385,19 @@
 		)
 		(uuid "ae8d8e37-f38f-41fe-903a-1eb9be3bd21d")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL5"
+		(at 203.2 116.84 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "aecd807f-0dae-4de9-9f2a-7205af2df165")
+	)
+>>>>>>> hardware-65percent
 	(label "JTMS"
 		(at 229.87 139.7 0)
 		(effects
@@ -7120,6 +7408,7 @@
 		)
 		(uuid "b1459e8f-23e1-418c-abf2-ccad8c3f1fe5")
 	)
+<<<<<<< HEAD
 	(label "UART_TX_SOUTH"
 		(at 123.19 129.54 0)
 		(effects
@@ -7130,6 +7419,8 @@
 		)
 		(uuid "b1ac5c45-29f6-49be-86d9-d334cdf2d7b7")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "COL6"
 		(at 245.11 26.67 270)
 		(effects
@@ -7140,6 +7431,7 @@
 		)
 		(uuid "b6dc15c4-5294-4338-988f-8c3f870110f4")
 	)
+<<<<<<< HEAD
 	(label "COL14"
 		(at 203.2 124.46 180)
 		(effects
@@ -7150,6 +7442,8 @@
 		)
 		(uuid "bb2ad147-d245-4431-84b9-4648d501513f")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "UART_TX_EAST"
 		(at 123.19 127 0)
 		(effects
@@ -7170,6 +7464,19 @@
 		)
 		(uuid "bf953326-f2e8-4e46-9ecf-e9fe4295b6b1")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL8"
+		(at 203.2 109.22 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "c1c2ccbf-4c9e-486b-9a84-3f54fb5a6e01")
+	)
+>>>>>>> hardware-65percent
 	(label "COL2"
 		(at 234.95 26.67 270)
 		(effects
@@ -7230,6 +7537,19 @@
 		)
 		(uuid "d312f0f4-cc79-473f-a2ed-836b5642b4a2")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL1"
+		(at 203.2 127 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "d4e6b922-25eb-4849-9db9-6f6185ed1afd")
+	)
+>>>>>>> hardware-65percent
 	(label "ROW4"
 		(at 209.55 55.88 0)
 		(effects
@@ -7260,6 +7580,19 @@
 		)
 		(uuid "dfbee201-609e-420a-8bd4-bc98bce299e1")
 	)
+<<<<<<< HEAD
+=======
+	(label "COL7"
+		(at 203.2 111.76 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right bottom)
+		)
+		(uuid "e443e11e-99a4-44c1-9116-18729e86e186")
+	)
+>>>>>>> hardware-65percent
 	(label "VDD"
 		(at 201.93 91.44 180)
 		(effects
@@ -7270,6 +7603,7 @@
 		)
 		(uuid "e9b26d3d-3813-4e99-8ea8-af0648067087")
 	)
+<<<<<<< HEAD
 	(label "ROT_SW"
 		(at 154.94 147.32 90)
 		(effects
@@ -7280,6 +7614,8 @@
 		)
 		(uuid "ecce62bc-b4cc-48bb-a6e3-988ce1c4f4c4")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "UART_RX_SOUTH"
 		(at 53.34 92.71 0)
 		(effects
@@ -7290,6 +7626,7 @@
 		)
 		(uuid "ef17a05a-3c4b-4a77-a598-a5f8ad4599a9")
 	)
+<<<<<<< HEAD
 	(label "UART_RX_NORTH"
 		(at 172.72 63.5 270)
 		(effects
@@ -7300,6 +7637,8 @@
 		)
 		(uuid "f0af64ee-d378-41f3-842f-24d5ad4f75d3")
 	)
+=======
+>>>>>>> hardware-65percent
 	(label "COL8"
 		(at 250.19 26.67 270)
 		(effects
@@ -7310,6 +7649,7 @@
 		)
 		(uuid "f325fd11-511d-4af8-8e04-8af1e81ceee5")
 	)
+<<<<<<< HEAD
 	(label "ROT_TIMB"
 		(at 160.02 151.13 90)
 		(effects
@@ -7320,6 +7660,8 @@
 		)
 		(uuid "fe355360-6bef-43f4-a60d-7c9f0aed2700")
 	)
+=======
+>>>>>>> hardware-65percent
 	(symbol
 		(lib_id "PCM_4ms_Power-symbol:GND")
 		(at 149.86 144.145 0)
@@ -11703,6 +12045,61 @@
 		)
 	)
 	(sheet
+<<<<<<< HEAD
+=======
+		(at 241.3 93.98)
+		(size 36.83 20.32)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(stroke
+			(width 0.1524)
+			(type solid)
+		)
+		(fill
+			(color 0 0 0 0.0000)
+		)
+		(uuid "0330dd45-2776-4667-9e47-eb2dbca2bb32")
+		(property "Sheetname" "RGB Lights"
+			(at 241.3 93.2684 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left bottom)
+			)
+		)
+		(property "Sheetfile" "untitled.kicad_sch"
+			(at 241.3 114.8846 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left top)
+			)
+		)
+		(pin "RGB IN" input
+			(at 241.3 111.76 180)
+			(uuid "2bc0b118-22f4-44df-9631-a4ce548bbecf")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(instances
+			(project "68percent"
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82"
+					(page "3")
+				)
+			)
+		)
+	)
+	(sheet
+>>>>>>> hardware-65percent
 		(at 217.17 33.02)
 		(size 55.88 34.925)
 		(exclude_from_sim no)

hardware/68percent/_autosave-numpad.kicad_prl

@@ -0,0 +1,131 @@
+{
+  "board": {
+    "active_layer": 2,
+    "active_layer_preset": "",
+    "auto_track_width": false,
+    "hidden_netclasses": [],
+    "hidden_nets": [],
+    "high_contrast_mode": 0,
+    "net_color_mode": 1,
+    "opacity": {
+      "images": 0.6899999976158142,
+      "pads": 1.0,
+      "shapes": 1.0,
+      "tracks": 1.0,
+      "vias": 1.0,
+      "zones": 0.1599999964237213
+    },
+    "selection_filter": {
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
+      "lockedItems": false,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
+      "tracks": true,
+      "vias": true,
+      "zones": true
+    },
+    "visible_items": [
+      "vias",
+      "footprint_text",
+      "footprint_anchors",
+      "ratsnest",
+      "grid",
+      "footprints_front",
+      "footprints_back",
+      "footprint_values",
+      "footprint_references",
+      "tracks",
+      "drc_errors",
+      "drawing_sheet",
+      "bitmaps",
+      "pads",
+      "zones",
+      "drc_warnings",
+      "drc_exclusions",
+      "locked_item_shadows",
+      "conflict_shadows",
+      "shapes"
+    ],
+    "visible_layers": "ffffffff_ffffffff_ffffffff_ffffffff",
+    "zone_display_mode": 0
+  },
+  "git": {
+    "repo_type": "",
+    "repo_username": "",
+    "ssh_key": ""
+  },
+  "meta": {
+    "filename": "_autosave-numpad.kicad_prl",
+    "version": 5
+  },
+  "net_inspector_panel": {
+    "col_hidden": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ],
+    "col_order": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9
+    ],
+    "col_widths": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+    "custom_group_rules": [],
+    "expanded_rows": [],
+    "filter_by_net_name": true,
+    "filter_by_netclass": true,
+    "filter_text": "",
+    "group_by_constraint": false,
+    "group_by_netclass": false,
+    "show_unconnected_nets": false,
+    "show_zero_pad_nets": false,
+    "sort_ascending": true,
+    "sorting_column": 0
+  },
+  "open_jobsets": [],
+  "project": {
+    "files": []
+  },
+  "schematic": {
+    "selection_filter": {
+      "graphics": true,
+      "images": true,
+      "labels": true,
+      "lockedItems": false,
+      "otherItems": true,
+      "pins": true,
+      "symbols": true,
+      "text": true,
+      "wires": true
+    }
+  }
+}

hardware/68percent/_autosave-powfilt.kicad_sch

@@ -0,0 +1,8 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "0555e65a-78c9-4198-a94d-afc4eb14f658")
+	(paper "A4")
+	(lib_symbols)
+)

hardware/68percent/_autosave-rgb.kicad_sch

@@ -0,0 +1,8 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "b20b0154-0369-4bd1-a7a4-7485a0c59449")
+	(paper "A4")
+	(lib_symbols)
+)

hardware/68percent/clock.kicad_sch

@@ -0,0 +1,41 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "bd7a78ae-d57e-4c8d-8079-f4714c8f1856")
+	(paper "A4")
+	(lib_symbols)
+	(text "24MHz external clock. \n\nOutput\nOSC_OUT\nOSC_IN"
+		(exclude_from_sim no)
+		(at 128.27 99.568 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "0b078972-8867-4a81-bdfc-f286a00b7261")
+	)
+	(hierarchical_label "OSC_OUT"
+		(shape input)
+		(at 186.69 76.2 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "fccd57b1-b731-4457-b9bb-32fe414af52c")
+	)
+	(hierarchical_label "OSC_IN"
+		(shape input)
+		(at 186.69 83.82 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "fe808684-ead0-47da-b31a-21623b281a81")
+	)
+)

hardware/68percent/fp-lib-table

@@ -0,0 +1,8 @@
+(fp_lib_table
+  (version 7)
+  (lib (name "footprints")(type "KiCad")(uri "/home/ukim/Projects/mskbd/hardware/footprint/stm32f446re/footprints.pretty")(options "")(descr ""))
+  (lib (name "Package_QFP.3dshapes")(type "KiCad")(uri "/home/ukim/Projects/mskbd/hardware/footprint/Package_QFP.3dshapes")(options "")(descr ""))
+  (lib (name "Type-C.pretty-master")(type "KiCad")(uri "/home/ukim/Projects/modular-kbd/hardware/Type-C.pretty-master")(options "")(descr ""))
+  (lib (name "kicad-footprints-master")(type "KiCad")(uri "/home/ukim/Projects/modular-kbd/hardware/footprint/generic/kicad-footprints-master")(options "")(descr ""))
+  (lib (name "Connector_PinSocket_2.54mm")(type "KiCad")(uri "/home/ukim/Projects/modular-kbd/hardware/footprint/generic/kicad-footprints-master/Connector_PinSocket_2.54mm.pretty")(options "")(descr ""))
+)

hardware/68percent/hummatrix.kicad_sch

@@ -0,0 +1,129 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "a78709a7-612d-422d-97ca-ad2b463f3c34")
+	(paper "A4")
+	(lib_symbols)
+	(text "Numpad Matrix\n\nStandard numpad matrix with 4 macro buttons. \n4x6 keyboard matrix. \nUse MX-style hot swap sockets. marstlib should have them\nUse 1N4148 Diodes for each key to prevent ghosting.\nIf possible find an SMD 1N4148 Diode Package\nAdd stabilizers for the large buttons\n\nInput:\nCOL1 - COL4\n\nOutput\nROW1 - ROW6\n\n"
+		(exclude_from_sim no)
+		(at 114.046 95.504 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "1a257982-b075-487c-a45b-3e42f3d00030")
+	)
+	(hierarchical_label "COL1"
+		(shape input)
+		(at 168.91 57.15 90)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "2489cc9d-3f3f-49f3-b5f8-fca7de0bd406")
+	)
+	(hierarchical_label "ROW5"
+		(shape input)
+		(at 214.63 86.36 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "2b6565a3-aed1-40b1-8bdb-7e077c868565")
+	)
+	(hierarchical_label "COL3"
+		(shape input)
+		(at 179.07 57.15 90)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "39f72fa4-5a13-4c27-b584-4b35e7decd41")
+	)
+	(hierarchical_label "ROW2"
+		(shape input)
+		(at 214.63 71.12 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "3e384b07-13e8-47ab-854a-4749d9f7c1f2")
+	)
+	(hierarchical_label "ROW1"
+		(shape input)
+		(at 214.63 66.04 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "46575829-cb89-44d7-a910-1712e863bbc4")
+	)
+	(hierarchical_label "ROW3"
+		(shape input)
+		(at 214.63 76.2 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "5927c7ba-a23d-49be-ad4c-26b7549c4aa5")
+	)
+	(hierarchical_label "ROW6"
+		(shape input)
+		(at 214.63 91.44 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "7904c4f1-0a76-47a4-a64d-305fdecb43ca")
+	)
+	(hierarchical_label "COL2"
+		(shape input)
+		(at 173.99 57.15 90)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "7c3f9e57-1e77-49a0-897c-74f99b2da1cf")
+	)
+	(hierarchical_label "ROW4"
+		(shape input)
+		(at 214.63 81.28 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "aef0586f-1483-45c4-b342-4de1dc00658b")
+	)
+	(hierarchical_label "COL4"
+		(shape input)
+		(at 184.15 57.15 90)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "d6ddda30-e8a3-436c-8315-8c1fc1bf77f1")
+	)
+)

hardware/68percent/matrixrot.kicad_sch

@@ -4063,7 +4063,11 @@
 				)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+=======
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
+>>>>>>> hardware-65percent
 			(at 81.28 135.89 0)
 			(effects
 				(font
@@ -4200,7 +4204,11 @@
 				)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+=======
+		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1.5u"
+>>>>>>> hardware-65percent
 			(at 220.98 74.93 0)
 			(effects
 				(font
@@ -4884,7 +4892,11 @@
 				)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+=======
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.75u"
+>>>>>>> hardware-65percent
 			(at 195.58 115.57 0)
 			(effects
 				(font
@@ -5635,7 +5647,11 @@
 				)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+=======
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
+>>>>>>> hardware-65percent
 			(at 55.88 135.89 0)
 			(effects
 				(font
@@ -5882,6 +5898,7 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
 		(lib_id "PCM_marbastlib-mx:MX_stab")
 		(at 220.98 99.06 0)
 		(unit 1)
@@ -5945,6 +5962,8 @@
 		)
 	)
 	(symbol
+=======
+>>>>>>> hardware-65percent
 		(lib_id "PCM_marbastlib-mx:MX_SW_HS_CPG151101S11")
 		(at 208.28 95.25 0)
 		(unit 1)
@@ -6491,6 +6510,7 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
 		(lib_id "PCM_marbastlib-mx:MX_stab")
 		(at 143.51 139.7 0)
 		(unit 1)
@@ -6555,6 +6575,8 @@
 		)
 	)
 	(symbol
+=======
+>>>>>>> hardware-65percent
 		(lib_id "PCM_Diode_AKL:1N4148W")
 		(at 198.12 142.24 270)
 		(unit 1)
@@ -8089,7 +8111,11 @@
 				(justify right)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_Diode_SMD_AKL:D_SOD-123"
+=======
+		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+>>>>>>> hardware-65percent
 			(at 96.52 60.96 0)
 			(effects
 				(font
@@ -8363,7 +8389,11 @@
 				)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+=======
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
+>>>>>>> hardware-65percent
 			(at 68.58 135.89 0)
 			(effects
 				(font
@@ -8680,6 +8710,72 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
+=======
+		(lib_id "PCM_marbastlib-mx:MX_stab")
+		(at 208.28 116.84 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "8d5b1b13-433e-4172-99dd-087f80a0e93a")
+		(property "Reference" "S3"
+			(at 206.756 109.22 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "MX_stab"
+			(at 206.756 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_2u"
+			(at 208.28 116.84 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 208.28 116.84 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Cherry MX-style stabilizer"
+			(at 208.28 116.84 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(instances
+			(project "68percent"
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
+					(reference "S3")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+>>>>>>> hardware-65percent
 		(lib_id "PCM_Diode_AKL:1N4148W")
 		(at 71.12 142.24 270)
 		(unit 1)
@@ -9094,15 +9190,26 @@
 	)
 	(symbol
 		(lib_id "PCM_marbastlib-mx:MX_stab")
+<<<<<<< HEAD
 		(at 39.37 120.65 0)
+=======
+		(at 35.56 124.46 0)
+>>>>>>> hardware-65percent
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
+<<<<<<< HEAD
 		(uuid "93c7c81f-a3ab-4c0b-bb9d-73eae870398b")
 		(property "Reference" "LeftStab1"
 			(at 35.56 113.284 0)
+=======
+		(fields_autoplaced yes)
+		(uuid "93b94b08-0cc9-494f-899a-9d796e095412")
+		(property "Reference" "S1"
+			(at 41.91 123.0629 0)
+>>>>>>> hardware-65percent
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9111,7 +9218,11 @@
 			)
 		)
 		(property "Value" "MX_stab"
+<<<<<<< HEAD
 			(at 35.56 115.824 0)
+=======
+			(at 41.91 125.6029 0)
+>>>>>>> hardware-65percent
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9119,8 +9230,13 @@
 				(justify left)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_2.25u"
 			(at 39.37 120.65 0)
+=======
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_2.25u"
+			(at 35.56 124.46 0)
+>>>>>>> hardware-65percent
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9129,7 +9245,11 @@
 			)
 		)
 		(property "Datasheet" ""
+<<<<<<< HEAD
 			(at 39.37 120.65 0)
+=======
+			(at 35.56 124.46 0)
+>>>>>>> hardware-65percent
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9138,7 +9258,11 @@
 			)
 		)
 		(property "Description" "Cherry MX-style stabilizer"
+<<<<<<< HEAD
 			(at 39.37 120.65 0)
+=======
+			(at 35.56 124.46 0)
+>>>>>>> hardware-65percent
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9147,9 +9271,15 @@
 			)
 		)
 		(instances
+<<<<<<< HEAD
 			(project "68percent"
 				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
 					(reference "LeftStab1")
+=======
+			(project ""
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
+					(reference "S1")
+>>>>>>> hardware-65percent
 					(unit 1)
 				)
 			)
@@ -9387,7 +9517,11 @@
 				)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+=======
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
+>>>>>>> hardware-65percent
 			(at 119.38 135.89 0)
 			(effects
 				(font
@@ -9499,6 +9633,7 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
 		(lib_id "PCM_marbastlib-mx:MX_stab")
 		(at 246.38 58.42 0)
 		(unit 1)
@@ -9562,6 +9697,8 @@
 		)
 	)
 	(symbol
+=======
+>>>>>>> hardware-65percent
 		(lib_id "PCM_Diode_AKL:1N4148W")
 		(at 223.52 81.28 270)
 		(unit 1)
@@ -9795,7 +9932,11 @@
 				(justify right)
 			)
 		)
+<<<<<<< HEAD
 		(property "Footprint" "PCM_Diode_SMD_AKL:D_SOD-123"
+=======
+		(property "Footprint" "PCM_4ms_Diode:D_DO-35_P7.62mm_Horizontal"
+>>>>>>> hardware-65percent
 			(at 58.42 60.96 0)
 			(effects
 				(font
@@ -9975,6 +10116,73 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
+=======
+		(lib_id "PCM_marbastlib-mx:MX_stab")
+		(at 220.98 95.25 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "af972c0f-6e96-4756-b25b-143313580e39")
+		(property "Reference" "S4"
+			(at 227.33 93.8529 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "MX_stab"
+			(at 227.33 96.3929 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_2.25u"
+			(at 220.98 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 220.98 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Cherry MX-style stabilizer"
+			(at 220.98 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(instances
+			(project ""
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
+					(reference "S4")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+>>>>>>> hardware-65percent
 		(lib_id "PCM_marbastlib-mx:MX_SW_HS_CPG151101S11")
 		(at 233.68 74.93 0)
 		(unit 1)
@@ -12512,6 +12720,73 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
+=======
+		(lib_id "PCM_marbastlib-mx:MX_stab")
+		(at 220.98 31.75 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "e7176b98-73ca-4dca-9202-098fd5c88eef")
+		(property "Reference" "S5"
+			(at 227.33 30.3529 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "MX_stab"
+			(at 227.33 32.8929 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_2u"
+			(at 220.98 31.75 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 220.98 31.75 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Cherry MX-style stabilizer"
+			(at 220.98 31.75 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(instances
+			(project "68percent"
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
+					(reference "S5")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+>>>>>>> hardware-65percent
 		(lib_id "PCM_marbastlib-mx:MX_SW_HS_CPG151101S11")
 		(at 106.68 74.93 0)
 		(unit 1)
@@ -12580,6 +12855,72 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
+=======
+		(lib_id "PCM_marbastlib-mx:MX_stab")
+		(at 146.05 139.7 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "eef9331e-0bf5-4f92-a54f-c0b6635718b4")
+		(property "Reference" "S2"
+			(at 139.7 140.8431 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Value" "MX_stab"
+			(at 139.7 138.3031 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_6.25u"
+			(at 146.05 139.7 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 146.05 139.7 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Cherry MX-style stabilizer"
+			(at 146.05 139.7 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(instances
+			(project ""
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
+					(reference "S2")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+>>>>>>> hardware-65percent
 		(lib_id "PCM_marbastlib-mx:MX_SW_HS_CPG151101S11")
 		(at 55.88 115.57 0)
 		(unit 1)
@@ -12923,6 +13264,7 @@
 		)
 	)
 	(symbol
+<<<<<<< HEAD
 		(lib_id "PCM_marbastlib-mx:MX_stab")
 		(at 208.28 116.84 0)
 		(unit 1)
@@ -12986,6 +13328,8 @@
 		)
 	)
 	(symbol
+=======
+>>>>>>> hardware-65percent
 		(lib_id "PCM_marbastlib-mx:MX_SW_HS_CPG151101S11")
 		(at 208.28 54.61 0)
 		(unit 1)

hardware/68percent/powerreg.kicad_sch

@@ -0,0 +1,41 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "f14782a9-74f0-4b79-b235-64b38935fcc4")
+	(paper "A4")
+	(lib_symbols)
+	(text "Power Regulation.\nBuck Converter 5v to 3.3v\n"
+		(exclude_from_sim no)
+		(at 97.79 99.568 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "9465db75-1792-401f-bad5-ceb4816ae4a0")
+	)
+	(hierarchical_label "3.3v"
+		(shape input)
+		(at 142.24 102.87 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "9b32d2cf-97f6-491a-86fb-388101641b9e")
+	)
+	(hierarchical_label "5v"
+		(shape input)
+		(at 142.24 93.98 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "bb6e74f4-ec74-4d40-9ebe-00f80b06a840")
+	)
+)

hardware/68percent/powfilt.kicad_sch

@@ -0,0 +1,19 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "0555e65a-78c9-4198-a94d-afc4eb14f658")
+	(paper "A4")
+	(lib_symbols)
+	(text "Coupling Capacitors. \nCheck the data sheet for specific specification and placement\nMight have to ask Eric about this"
+		(exclude_from_sim no)
+		(at 127.762 97.282 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "9644dd45-3348-491a-9fea-f726a1224392")
+	)
+)

hardware/68percent/rstboot.kicad_sch

@@ -0,0 +1,8 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "d551aaba-f1c8-452e-b7fa-708c317ac4ce")
+	(paper "A4")
+	(lib_symbols)
+)

hardware/68percent/sym-lib-table

@@ -0,0 +1,6 @@
+(sym_lib_table
+  (version 7)
+  (lib (name "stm32f446ret6")(type "KiCad")(uri "/home/kymkim/Projects/modular-kbd/hardware/symbols/stm32f446ret6/stm32f446ret6.kicad_sym")(options "")(descr ""))
+  (lib (name "Type-C")(type "Legacy")(uri "/home/kymkim/Projects/modular-kbd/hardware/Type-C.pretty-master/Type-C.lib")(options "")(descr ""))
+  (lib (name "T36K3BGR-05D000121U1930")(type "KiCad")(uri "/home/ukim/Projects/modular-kbd/hardware/symbols/T36K3BGR-05D000121U1930/T36K3BGR-05D000121U1930.kicad_sym")(options "")(descr ""))
+)

hardware/68percent/untitled.kicad_sc.kicad_sch

@@ -0,0 +1,8 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "6f2c82b5-c9ad-40d0-84fe-43041274abb2")
+	(paper "A4")
+	(lib_symbols)
+)

hardware/68percent/usbpow.kicad_sch

@@ -0,0 +1,52 @@
+(kicad_sch
+	(version 20250114)
+	(generator "eeschema")
+	(generator_version "9.0")
+	(uuid "3cb9f3e3-5e6a-4c23-8d8d-52b5ae63fbaf")
+	(paper "A4")
+	(lib_symbols)
+	(text "USB Receptacle. Needs to be a USB C connector.\nESD Protection would be nice\nAdd a diode to prevent backflow from other 5v sources (i.e. modules)\nMake sure D+/D- are differential lines"
+		(exclude_from_sim no)
+		(at 101.346 90.932 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "b8671ba6-87fa-4960-bcc3-fbddf17f4d76")
+	)
+	(hierarchical_label "D-"
+		(shape input)
+		(at 177.8 72.39 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "5cbd4a5a-ac39-4a2d-a0ad-0c3ce3f9d635")
+	)
+	(hierarchical_label "D+"
+		(shape input)
+		(at 177.8 67.31 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "80d42395-23c2-4264-878d-42f2e81a4374")
+	)
+	(hierarchical_label "5v"
+		(shape input)
+		(at 177.8 78.74 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "b70746ac-3765-45c4-a69a-b93b10cc6628")
+	)
+)

hardware/68percent/~matrixrot.kicad_sch-bak.lck

@@ -0,0 +1 @@
+{"hostname":"framework16","username":"ukim"}

hardware/68percent/~matrixrot.kicad_sch.lck

@@ -0,0 +1 @@
+{"hostname":"framework16","username":"ukim"}