Merge branch 'hardware-65percent' of https://github.com/Kymkim/modular-kbd into hardware-65percent

hardware/68percent/68percent.kicad_prl

@@ -1,6 +1,6 @@
 {
   "board": {
-    "active_layer": 0,
+    "active_layer": 25,
     "active_layer_preset": "",
     "auto_track_width": true,
     "hidden_netclasses": [],

hardware/68percent/68percent.kicad_pro

@@ -667,6 +667,10 @@
     [
       "1d905906-6e74-4741-8b2e-53dc470a7c79",
       "Keymatrix"
+    ],
+    [
+      "0330dd45-2776-4667-9e47-eb2dbca2bb32",
+      "RGB Lights"
     ]
   ],
   "text_variables": {}

hardware/68percent/68percent.kicad_sch

@@ -4690,16 +4690,6 @@
 		)
 		(uuid "0bdf774e-a5a9-4aa3-84c3-cb36cab53577")
 	)
-	(wire
-		(pts
-			(xy 162.56 132.08) (xy 162.56 151.13)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "0c365f9b-ec33-45c0-bcaa-f753e4bca3a2")
-	)
 	(wire
 		(pts
 			(xy 147.32 77.47) (xy 147.32 88.9)
@@ -5080,16 +5070,6 @@
 		)
 		(uuid "4cca7c1a-d12a-4d5b-8dd4-4401bb342c6d")
 	)
-	(wire
-		(pts
-			(xy 154.94 132.08) (xy 154.94 147.32)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4d52ae93-a4ca-4383-bb89-91e9056bf0db")
-	)
 	(wire
 		(pts
 			(xy 119.38 129.54) (xy 113.03 129.54)
@@ -5790,16 +5770,6 @@
 		)
 		(uuid "a21450c8-f3ae-43eb-a9d5-11adce89c1f1")
 	)
-	(wire
-		(pts
-			(xy 160.02 132.08) (xy 160.02 151.13)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a53cb74b-b460-44ad-b050-031ab179966a")
-	)
 	(wire
 		(pts
 			(xy 170.18 74.93) (xy 170.18 88.9)
@@ -6670,16 +6640,6 @@
 		)
 		(uuid "4908fc84-621c-47df-aa9c-5c6724d4e267")
 	)
-	(label "ROT_TIMA"
-		(at 162.56 151.13 90)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "49a74743-1f19-4803-95ce-65fbcfcf3666")
-	)
 	(label "COL3"
 		(at 237.49 26.67 270)
 		(effects
@@ -7060,6 +7020,16 @@
 		)
 		(uuid "98066d23-6bbb-440b-b346-e60179dceea1")
 	)
+	(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_RX_WEST"
 		(at 212.09 106.68 180)
 		(effects
@@ -7270,16 +7240,6 @@
 		)
 		(uuid "e9b26d3d-3813-4e99-8ea8-af0648067087")
 	)
-	(label "ROT_SW"
-		(at 154.94 147.32 90)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "ecce62bc-b4cc-48bb-a6e3-988ce1c4f4c4")
-	)
 	(label "UART_RX_SOUTH"
 		(at 53.34 92.71 0)
 		(effects
@@ -7310,16 +7270,6 @@
 		)
 		(uuid "f325fd11-511d-4af8-8e04-8af1e81ceee5")
 	)
-	(label "ROT_TIMB"
-		(at 160.02 151.13 90)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "fe355360-6bef-43f4-a60d-7c9f0aed2700")
-	)
 	(symbol
 		(lib_id "PCM_4ms_Power-symbol:GND")
 		(at 149.86 144.145 0)
@@ -11702,6 +11652,48 @@
 			)
 		)
 	)
+	(sheet
+		(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)
+			)
+		)
+		(instances
+			(project "68percent"
+				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82"
+					(page "3")
+				)
+			)
+		)
+	)
 	(sheet
 		(at 217.17 33.02)
 		(size 55.88 34.925)

hardware/68percent/matrixrot.kicad_sch

@@ -4063,7 +4063,7 @@
 				)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
 			(at 81.28 135.89 0)
 			(effects
 				(font
@@ -4200,7 +4200,7 @@
 				)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1.5u"
 			(at 220.98 74.93 0)
 			(effects
 				(font
@@ -4884,7 +4884,7 @@
 				)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.75u"
 			(at 195.58 115.57 0)
 			(effects
 				(font
@@ -5635,7 +5635,7 @@
 				)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
 			(at 55.88 135.89 0)
 			(effects
 				(font
@@ -6700,70 +6700,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "PCM_marbastlib-mx:MX_stab")
-		(at 208.28 115.57 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "51fc25a2-8ccb-4202-adf4-9296b7e634f4")
-		(property "Reference" "S3"
-			(at 214.63 114.1729 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "MX_stab"
-			(at 214.63 116.7129 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_2u"
-			(at 208.28 115.57 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" ""
-			(at 208.28 115.57 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Cherry MX-style stabilizer"
-			(at 208.28 115.57 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(instances
-			(project ""
-				(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82/1d905906-6e74-4741-8b2e-53dc470a7c79"
-					(reference "S3")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "PCM_marbastlib-mx:MX_SW_HS_CPG151101S11")
 		(at 68.58 54.61 0)
@@ -8300,7 +8236,7 @@
 				)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
 			(at 68.58 135.89 0)
 			(effects
 				(font
@@ -8616,6 +8552,69 @@
 			)
 		)
 	)
+	(symbol
+		(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
 		(lib_id "PCM_Diode_AKL:1N4148W")
 		(at 71.12 142.24 270)
@@ -9031,7 +9030,7 @@
 	)
 	(symbol
 		(lib_id "PCM_marbastlib-mx:MX_stab")
-		(at 38.1 119.38 0)
+		(at 35.56 124.46 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -9040,7 +9039,7 @@
 		(fields_autoplaced yes)
 		(uuid "93b94b08-0cc9-494f-899a-9d796e095412")
 		(property "Reference" "S1"
-			(at 44.45 117.9829 0)
+			(at 41.91 123.0629 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9049,7 +9048,7 @@
 			)
 		)
 		(property "Value" "MX_stab"
-			(at 44.45 120.5229 0)
+			(at 41.91 125.6029 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9057,8 +9056,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_6.25u"
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_2.25u"
-			(at 38.1 119.38 0)
+			(at 35.56 124.46 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9067,7 +9066,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 38.1 119.38 0)
+			(at 35.56 124.46 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9076,7 +9075,7 @@
 			)
 		)
 		(property "Description" "Cherry MX-style stabilizer"
-			(at 38.1 119.38 0)
+			(at 35.56 124.46 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9325,7 +9324,7 @@
 				)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
+		(property "Footprint" "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX_Plated_1.25u"
 			(at 119.38 135.89 0)
 			(effects
 				(font
@@ -12584,7 +12583,7 @@
 	)
 	(symbol
 		(lib_id "PCM_marbastlib-mx:MX_stab")
-		(at 138.43 140.97 0)
+		(at 146.05 139.7 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -12592,7 +12591,7 @@
 		(dnp no)
 		(uuid "eef9331e-0bf5-4f92-a54f-c0b6635718b4")
 		(property "Reference" "S2"
-			(at 132.08 142.1131 0)
+			(at 139.7 140.8431 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12601,7 +12600,7 @@
 			)
 		)
 		(property "Value" "MX_stab"
-			(at 132.08 139.5731 0)
+			(at 139.7 138.3031 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12609,8 +12608,8 @@
 				(justify right)
 			)
 		)
-		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_2.75u"
+		(property "Footprint" "PCM_marbastlib-mx:STAB_MX_P_6.25u"
-			(at 138.43 140.97 0)
+			(at 146.05 139.7 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12619,7 +12618,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 138.43 140.97 0)
+			(at 146.05 139.7 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12628,7 +12627,7 @@
 			)
 		)
 		(property "Description" "Cherry MX-style stabilizer"
-			(at 138.43 140.97 0)
+			(at 146.05 139.7 0)
 			(effects
 				(font
 					(size 1.27 1.27)

hardware/68percent/~_autosave-68percent.kicad_pcb.lck

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

hardware/numpad/numpad/~numpad.kicad_pcb.lck

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