diff --git a/hardware/common/unikbd.pretty/diode-combined.kicad_mod b/hardware/common/unikbd.pretty/diode-combined.kicad_mod index 642b4e5..0fad246 100644 --- a/hardware/common/unikbd.pretty/diode-combined.kicad_mod +++ b/hardware/common/unikbd.pretty/diode-combined.kicad_mod @@ -1,85 +1,130 @@ -(footprint "diode-combined" (version 20211014) (generator pcbnew) +(footprint "diode-combined" (version 20221018) (generator pcbnew) (layer "F.Cu") - (tedit 5F23BF4D) (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf") (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm length 4mm diameter 2mm") (attr smd) - (fp_text reference "REF**" (at 1.3462 3.9742) (layer "B.SilkS") - (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (fp_text reference "REF**" (at 7.4168 0.381) (layer "B.SilkS") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp 9a5031ed-ec12-4b1a-ae77-88564238f6fa) ) - (fp_text value "D_DO-35_SOD27_P7.62mm_Horizontal" (at -2.921 -16.4474) (layer "F.Fab") - (effects (font (size 1 1) (thickness 0.15))) + (fp_text value "D_DO-35_SOD27_P7.62mm_Horizontal" (at -2.921 -16.4474) (layer "F.Fab") hide + (effects (font (size 1 1) (thickness 0.15))) (tstamp a3d628b6-e450-4e14-a382-ea42b01e5e46) ) - (fp_text user "${REFERENCE}" (at -1.8288 3.8862) (layer "F.SilkS") - (effects (font (size 0.8 0.8) (thickness 0.12))) + (fp_text user "${REFERENCE}" (at 5.9944 -1.524) (layer "F.SilkS") + (effects (font (size 0.8 0.8) (thickness 0.12))) (tstamp 91433c11-a5d3-4c05-b727-fdf95e7fa55a) ) - (fp_line (start -2.516 0) (end -1.866 0) (layer "B.SilkS") (width 0.12) (tstamp 2ebfa4c0-52f6-477d-84ae-fde44362e12d)) - (fp_line (start 3.024 0) (end 2.374 0) (layer "B.SilkS") (width 0.12) (tstamp 319a4a95-c418-4326-a8b7-8a6c7430ffaf)) - (fp_line (start 2.374 -1.12) (end 2.374 1.12) (layer "B.SilkS") (width 0.12) (tstamp 57f9526e-4c99-4072-97b8-066d0a57bbfa)) - (fp_line (start -1.146 1.12) (end -1.146 -1.12) (layer "B.SilkS") (width 0.12) (tstamp 65d199a4-3f39-4027-92d8-8b96a11565c3)) - (fp_line (start -1.266 1.12) (end -1.266 -1.12) (layer "B.SilkS") (width 0.12) (tstamp 9cfee364-0a36-4168-9a03-9e2b8aa1532c)) - (fp_line (start -1.866 -1.12) (end 2.374 -1.12) (layer "B.SilkS") (width 0.12) (tstamp acd118ef-5003-4a76-b509-9118820b4c3a)) - (fp_line (start -1.866 1.12) (end -1.866 -1.12) (layer "B.SilkS") (width 0.12) (tstamp b46bc59c-2358-4b59-a25d-fbb3cb16df2e)) - (fp_line (start 2.374 1.12) (end -1.866 1.12) (layer "B.SilkS") (width 0.12) (tstamp f31b7a91-9d17-405c-9333-5c2c7b64a125)) - (fp_line (start -1.026 1.12) (end -1.026 -1.12) (layer "B.SilkS") (width 0.12) (tstamp ffc7539d-4080-44cf-b011-f3b2023c7bdd)) - (fp_line (start -0.76 -1.58) (end -0.76 -0.65) (layer "F.SilkS") (width 0.12) (tstamp 400aa8b9-525e-4b74-8431-08f160c18c9a)) - (fp_line (start -0.76 1.58) (end 1.4 1.58) (layer "F.SilkS") (width 0.12) (tstamp 7dc4b7e6-40cd-4d0c-af62-f4afd387d198)) - (fp_line (start -0.76 1.58) (end -0.76 0.65) (layer "F.SilkS") (width 0.12) (tstamp 82c6902a-689e-4107-a05f-01e99ead1a0a)) - (fp_line (start -0.76 -1.58) (end 0.7 -1.58) (layer "F.SilkS") (width 0.12) (tstamp d79dc885-3d55-4139-9cfe-95a99b1b887f)) - (fp_line (start -4.606 1.25) (end -4.606 -1.25) (layer "B.CrtYd") (width 0.05) (tstamp 4cbd7873-db33-4daf-831f-89f5cb785cd7)) - (fp_line (start -4.606 -1.25) (end 5.114 -1.25) (layer "B.CrtYd") (width 0.05) (tstamp 6bacd9ba-ac8c-4654-85ad-a3b2e6b1883b)) - (fp_line (start 5.114 1.25) (end -4.606 1.25) (layer "B.CrtYd") (width 0.05) (tstamp 8a2ceddd-9c30-4506-a364-2858aefa41cd)) - (fp_line (start 5.114 -1.25) (end 5.114 1.25) (layer "B.CrtYd") (width 0.05) (tstamp fbd02659-b43a-4653-ac5b-34a3e6ec113e)) - (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer "F.CrtYd") (width 0.05) (tstamp 5b422957-e485-42a4-b147-9fbfb29d049b)) - (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer "F.CrtYd") (width 0.05) (tstamp 854b32ac-58cf-4638-9cec-37e2c2e892fb)) - (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer "F.CrtYd") (width 0.05) (tstamp a4a5cb02-dc58-40a9-82b8-82ddeefd8d40)) - (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer "F.CrtYd") (width 0.05) (tstamp b649cec8-89c4-4cab-b1cc-6d9e01037f63)) - (fp_line (start 2.254 -1) (end 2.254 1) (layer "B.Fab") (width 0.1) (tstamp 0146e898-aeba-4624-b172-4002d1b7e289)) - (fp_line (start -1.146 1) (end -1.146 -1) (layer "B.Fab") (width 0.1) (tstamp 4be72ddf-e3fd-435f-9c6b-1ab5d5e469a6)) - (fp_line (start -1.246 1) (end -1.246 -1) (layer "B.Fab") (width 0.1) (tstamp 50603d47-6d27-4c8b-9d77-0efd2aebd9ac)) - (fp_line (start -3.556 0) (end -1.746 0) (layer "B.Fab") (width 0.1) (tstamp 6e580d05-e9c9-4854-8b1a-75c75f6abc9e)) - (fp_line (start -1.746 -1) (end 2.254 -1) (layer "B.Fab") (width 0.1) (tstamp a6cf9898-6005-45e9-96bb-3732f4d4f5bf)) - (fp_line (start -1.046 1) (end -1.046 -1) (layer "B.Fab") (width 0.1) (tstamp b327189d-ef01-441d-9738-e90f2400c9ef)) - (fp_line (start 4.064 0) (end 2.254 0) (layer "B.Fab") (width 0.1) (tstamp e105655b-06c9-4456-981a-9fb7f072f2f6)) - (fp_line (start -1.746 1) (end -1.746 -1) (layer "B.Fab") (width 0.1) (tstamp ea82f956-26e9-49c2-b514-26649aff04be)) - (fp_line (start 2.254 1) (end -1.746 1) (layer "B.Fab") (width 0.1) (tstamp f776b4a5-601c-4dd0-a822-65b1a7ca85ea)) - (fp_line (start 0.7 1.52) (end 0.7 -1.52) (layer "F.Fab") (width 0.1) (tstamp 0538aa2a-99c5-43eb-83e9-ea71514cd641)) - (fp_line (start 0.15 0.65) (end 0.15 0.25) (layer "F.Fab") (width 0.1) (tstamp 100d5a18-682a-4558-93e2-5a8dd299ab9d)) - (fp_line (start 0.15 0.25) (end -0.15 0.45) (layer "F.Fab") (width 0.1) (tstamp 110b6b8b-3d9a-49d9-a651-062dc12fd279)) - (fp_line (start -0.15 0.65) (end -0.15 0.25) (layer "F.Fab") (width 0.1) (tstamp 261fd709-b119-45e9-aff5-04154ebd9314)) - (fp_line (start 0.15 0.45) (end 0.4 0.45) (layer "F.Fab") (width 0.1) (tstamp 389cedd3-c41f-4b55-b21a-f799d09847f4)) - (fp_line (start 0.7 1.52) (end -0.7 1.52) (layer "F.Fab") (width 0.1) (tstamp 3b026976-d908-4912-bba2-893c5a17c51c)) - (fp_line (start -0.15 0.45) (end 0.15 0.65) (layer "F.Fab") (width 0.1) (tstamp 43d7e843-b9cb-4123-8cac-3b3a3f192e82)) - (fp_line (start -0.15 0.45) (end -0.4 0.45) (layer "F.Fab") (width 0.1) (tstamp 85ec75d8-d66b-4275-b3ab-be08ddca07df)) - (fp_line (start -0.7 1.52) (end -0.7 -1.52) (layer "F.Fab") (width 0.1) (tstamp b88b8d93-4be3-48cb-af37-0763f35118ac)) - (fp_line (start 0.7 -1.52) (end -0.7 -1.52) (layer "F.Fab") (width 0.1) (tstamp f13bbe1d-3f04-49c6-8270-639b62b4252f)) - (pad "1" thru_hole rect (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (tstamp 025dd152-58ec-477d-aeeb-143880b94e0e)) + (fp_line (start -2.516 0) (end -1.866 0) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2ebfa4c0-52f6-477d-84ae-fde44362e12d)) + (fp_line (start -1.866 -1.12) (end 2.374 -1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp acd118ef-5003-4a76-b509-9118820b4c3a)) + (fp_line (start -1.866 1.12) (end -1.866 -1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b46bc59c-2358-4b59-a25d-fbb3cb16df2e)) + (fp_line (start -1.266 1.12) (end -1.266 -1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9cfee364-0a36-4168-9a03-9e2b8aa1532c)) + (fp_line (start -1.146 1.12) (end -1.146 -1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 65d199a4-3f39-4027-92d8-8b96a11565c3)) + (fp_line (start -1.026 1.12) (end -1.026 -1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ffc7539d-4080-44cf-b011-f3b2023c7bdd)) + (fp_line (start 2.374 -1.12) (end 2.374 1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 57f9526e-4c99-4072-97b8-066d0a57bbfa)) + (fp_line (start 2.374 1.12) (end -1.866 1.12) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f31b7a91-9d17-405c-9333-5c2c7b64a125)) + (fp_line (start 3.024 0) (end 2.374 0) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 319a4a95-c418-4326-a8b7-8a6c7430ffaf)) + (fp_line (start -0.76 -1.58) (end -0.76 -0.65) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 400aa8b9-525e-4b74-8431-08f160c18c9a)) + (fp_line (start -0.76 -1.58) (end 0.7 -1.58) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d79dc885-3d55-4139-9cfe-95a99b1b887f)) + (fp_line (start -0.76 1.58) (end -0.76 0.65) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 82c6902a-689e-4107-a05f-01e99ead1a0a)) + (fp_line (start -0.76 1.58) (end 1.4 1.58) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7dc4b7e6-40cd-4d0c-af62-f4afd387d198)) + (fp_line (start -4.606 -1.25) (end 5.114 -1.25) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6bacd9ba-ac8c-4654-85ad-a3b2e6b1883b)) + (fp_line (start -4.606 1.25) (end -4.606 -1.25) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4cbd7873-db33-4daf-831f-89f5cb785cd7)) + (fp_line (start 5.114 -1.25) (end 5.114 1.25) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fbd02659-b43a-4653-ac5b-34a3e6ec113e)) + (fp_line (start 5.114 1.25) (end -4.606 1.25) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8a2ceddd-9c30-4506-a364-2858aefa41cd)) + (fp_line (start -1.7 -1.75) (end 1.7 -1.75) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 854b32ac-58cf-4638-9cec-37e2c2e892fb)) + (fp_line (start -1.7 1.75) (end -1.7 -1.75) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a4a5cb02-dc58-40a9-82b8-82ddeefd8d40)) + (fp_line (start 1.7 -1.75) (end 1.7 1.75) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5b422957-e485-42a4-b147-9fbfb29d049b)) + (fp_line (start 1.7 1.75) (end -1.7 1.75) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b649cec8-89c4-4cab-b1cc-6d9e01037f63)) + (fp_line (start -3.556 0) (end -1.746 0) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6e580d05-e9c9-4854-8b1a-75c75f6abc9e)) + (fp_line (start -1.746 -1) (end 2.254 -1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a6cf9898-6005-45e9-96bb-3732f4d4f5bf)) + (fp_line (start -1.746 1) (end -1.746 -1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea82f956-26e9-49c2-b514-26649aff04be)) + (fp_line (start -1.246 1) (end -1.246 -1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50603d47-6d27-4c8b-9d77-0efd2aebd9ac)) + (fp_line (start -1.146 1) (end -1.146 -1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4be72ddf-e3fd-435f-9c6b-1ab5d5e469a6)) + (fp_line (start -1.046 1) (end -1.046 -1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b327189d-ef01-441d-9738-e90f2400c9ef)) + (fp_line (start 2.254 -1) (end 2.254 1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0146e898-aeba-4624-b172-4002d1b7e289)) + (fp_line (start 2.254 1) (end -1.746 1) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f776b4a5-601c-4dd0-a822-65b1a7ca85ea)) + (fp_line (start 4.064 0) (end 2.254 0) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e105655b-06c9-4456-981a-9fb7f072f2f6)) + (fp_line (start -0.7 1.52) (end -0.7 -1.52) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b88b8d93-4be3-48cb-af37-0763f35118ac)) + (fp_line (start -0.15 0.45) (end -0.4 0.45) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 85ec75d8-d66b-4275-b3ab-be08ddca07df)) + (fp_line (start -0.15 0.45) (end 0.15 0.65) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 43d7e843-b9cb-4123-8cac-3b3a3f192e82)) + (fp_line (start -0.15 0.65) (end -0.15 0.25) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 261fd709-b119-45e9-aff5-04154ebd9314)) + (fp_line (start 0.15 0.25) (end -0.15 0.45) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 110b6b8b-3d9a-49d9-a651-062dc12fd279)) + (fp_line (start 0.15 0.45) (end 0.4 0.45) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 389cedd3-c41f-4b55-b21a-f799d09847f4)) + (fp_line (start 0.15 0.65) (end 0.15 0.25) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 100d5a18-682a-4558-93e2-5a8dd299ab9d)) + (fp_line (start 0.7 -1.52) (end -0.7 -1.52) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f13bbe1d-3f04-49c6-8270-639b62b4252f)) + (fp_line (start 0.7 1.52) (end -0.7 1.52) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3b026976-d908-4912-bba2-893c5a17c51c)) + (fp_line (start 0.7 1.52) (end 0.7 -1.52) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0538aa2a-99c5-43eb-83e9-ea71514cd641)) + (pad "1" thru_hole rect (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp 025dd152-58ec-477d-aeeb-143880b94e0e)) (pad "1" smd custom (at -1 0 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask") + (thermal_bridge_angle 45) (options (clearance outline) (anchor rect)) (primitives - (gr_poly (pts + (gr_poly + (pts (xy 0.2192 0.0762) (xy 2.048 0.0762) (xy 2.048 -0.0762) (xy 0.2192 -0.0762) - ) (width 0.1) (fill yes)) + ) + (width 0.1) (fill yes)) ) (tstamp 4425e3e4-bfde-49cd-b6d0-87896ea0174a)) (pad "2" smd custom (at 1 0.95 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask") + (thermal_bridge_angle 45) (options (clearance outline) (anchor rect)) (primitives - (gr_poly (pts + (gr_poly + (pts (xy -3.1656 0.4166) (xy -3.0132 0.4166) (xy -3.0132 -0.0406) (xy -0.2192 -0.0406) (xy -0.2192 -0.193) (xy -3.1656 -0.193) - ) (width 0.1) (fill yes)) + ) + (width 0.1) (fill yes)) ) (tstamp 32524cff-711f-4252-b868-dbe08915a525)) - (pad "2" thru_hole oval (at 4.064 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (tstamp ffd110d8-3669-49c3-9fc9-32a7868c2705)) + (pad "2" thru_hole oval (at 4.064 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp ffd110d8-3669-49c3-9fc9-32a7868c2705)) (pad "NC" smd rect (at 1 -0.95 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ba3a84a4-76f0-4b7f-a7e3-771a7ac6e6a5)) (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl" (offset (xyz -3.556 0 -1.4986)) diff --git a/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_pro b/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_pro index 1361015..8340300 100644 --- a/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_pro +++ b/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_pro @@ -399,7 +399,7 @@ "pin_to_pin": "error", "power_pin_not_driven": "error", "similar_labels": "warning", - "simulation_model_issue": "error", + "simulation_model_issue": "ignore", "unannotated": "error", "unit_value_mismatch": "error", "unresolved_variable": "error", diff --git a/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_sch b/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_sch index 116cac4..e256a8b 100644 --- a/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_sch +++ b/hardware/keyboard-franklin-ace-1000/franklin-ace-1000-keyboard.kicad_sch @@ -735,9 +735,6 @@ (junction (at 107.315 90.17) (diameter 0) (color 0 0 0 0) (uuid 0bbb7b5a-8517-40ab-81bf-9fdf7f95b5c6) ) - (junction (at 120.65 33.02) (diameter 0) (color 0 0 0 0) - (uuid 0cc2df7d-248b-4186-95c1-ab95d4d51706) - ) (junction (at 182.88 100.33) (diameter 0) (color 0 0 0 0) (uuid 0ddaea1e-f79b-4581-87dc-db7d896dcdec) ) @@ -747,12 +744,6 @@ (junction (at 171.45 86.36) (diameter 0) (color 0 0 0 0) (uuid 0ee3ee25-3194-4c20-88cc-4a7e79b129a0) ) - (junction (at 144.78 36.83) (diameter 0) (color 0 0 0 0) - (uuid 11c0ef0e-a66f-4b32-9a3d-8245b314f3be) - ) - (junction (at 171.45 33.02) (diameter 0) (color 0 0 0 0) - (uuid 12b35a50-a64f-418d-aaf5-f246bad9eb9f) - ) (junction (at 157.48 80.01) (diameter 0) (color 0 0 0 0) (uuid 1626bd9c-a4f7-48df-81ab-b7b7b125757f) ) @@ -774,12 +765,6 @@ (junction (at 58.42 90.17) (diameter 0) (color 0 0 0 0) (uuid 1bcc8842-e1db-4cd3-92ea-6f9830e50aaa) ) - (junction (at 182.88 59.69) (diameter 0) (color 0 0 0 0) - (uuid 1c11c39c-ba48-4a33-9dc6-e2cfbb840f03) - ) - (junction (at 47.625 36.83) (diameter 0) (color 0 0 0 0) - (uuid 1fd9daf1-c53a-4595-aa05-7351b72b6f33) - ) (junction (at 71.12 106.68) (diameter 0) (color 0 0 0 0) (uuid 231a6c07-86ad-4789-84c6-3ad017681208) ) @@ -789,6 +774,12 @@ (junction (at 144.78 76.2) (diameter 0) (color 0 0 0 0) (uuid 2717eb22-4059-47ff-a187-dc9bba5be7b7) ) + (junction (at 182.88 30.48) (diameter 0) (color 0 0 0 0) + (uuid 28f4dd4b-914d-4f67-b21a-aafbb6c2639c) + ) + (junction (at 234.95 30.48) (diameter 0) (color 0 0 0 0) + (uuid 2a7e1015-80c2-40d3-a9ba-e1d14addb26f) + ) (junction (at 83.185 50.8) (diameter 0) (color 0 0 0 0) (uuid 2aaea1ca-96b2-4b1c-85c9-bdac7d4423b9) ) @@ -813,6 +804,9 @@ (junction (at 132.715 50.8) (diameter 0) (color 0 0 0 0) (uuid 32b1f3d6-15bf-4404-8b88-ec106a406770) ) + (junction (at 207.645 30.48) (diameter 0) (color 0 0 0 0) + (uuid 345ef10b-461d-429b-ba6d-84f6a02e5cd6) + ) (junction (at 207.645 100.33) (diameter 0) (color 0 0 0 0) (uuid 35211b35-b0ef-48d7-ae06-67f366939314) ) @@ -855,6 +849,9 @@ (junction (at 182.88 90.17) (diameter 0) (color 0 0 0 0) (uuid 50c3dd44-4092-4aaa-aa12-57d22cfd46fe) ) + (junction (at 132.715 30.48) (diameter 0) (color 0 0 0 0) + (uuid 53a973bf-081b-4963-a3e8-0c31bc697475) + ) (junction (at 182.88 80.01) (diameter 0) (color 0 0 0 0) (uuid 551651e1-b1b0-47b9-bbca-c7b0c280affd) ) @@ -885,6 +882,9 @@ (junction (at 235.585 40.64) (diameter 0) (color 0 0 0 0) (uuid 6170afc6-9df1-4ca6-b7da-8c1c31d8842b) ) + (junction (at 183.515 59.69) (diameter 0) (color 0 0 0 0) + (uuid 62b33499-86c6-47c5-9950-e55d3a8a5dcd) + ) (junction (at 219.075 46.99) (diameter 0) (color 0 0 0 0) (uuid 6362adf2-173c-4a18-bc44-9d444d860f97) ) @@ -894,9 +894,6 @@ (junction (at 58.42 50.8) (diameter 0) (color 0 0 0 0) (uuid 68444f93-6e39-4954-9fba-8d91beb64e58) ) - (junction (at 95.885 33.02) (diameter 0) (color 0 0 0 0) - (uuid 6b66aa12-a3ab-490d-8799-10ef9cdf6182) - ) (junction (at 144.78 57.15) (diameter 0) (color 0 0 0 0) (uuid 6bd88684-0aae-4bd1-8aa9-b6e8e8b8db9c) ) @@ -915,9 +912,6 @@ (junction (at 235.585 100.33) (diameter 0) (color 0 0 0 0) (uuid 7c86243f-2dfe-4a1e-9965-9889b525e489) ) - (junction (at 194.945 36.83) (diameter 0) (color 0 0 0 0) - (uuid 7e98741a-4b79-4cdc-9b94-41f064282164) - ) (junction (at 47.625 57.15) (diameter 0) (color 0 0 0 0) (uuid 7ea4007d-12ae-4434-9f4b-a63a6a0074c6) ) @@ -936,18 +930,12 @@ (junction (at 265.43 65.405) (diameter 0) (color 0 0 0 0) (uuid 83d57a8b-2883-48b3-83d7-aec1801d0809) ) - (junction (at 71.12 36.83) (diameter 0) (color 0 0 0 0) - (uuid 84e5ead9-6e0c-4fd4-9174-793e6b8ea25e) - ) - (junction (at 95.885 36.83) (diameter 0) (color 0 0 0 0) - (uuid 8b99f05d-8dfe-4ce7-92b2-aa463824833b) + (junction (at 58.42 30.48) (diameter 0) (color 0 0 0 0) + (uuid 8c14e725-5005-4af7-ae56-a54d62f558ca) ) (junction (at 71.12 57.15) (diameter 0) (color 0 0 0 0) (uuid 8ed2ed92-0d37-4e60-a68d-d0f689f88550) ) - (junction (at 120.65 36.83) (diameter 0) (color 0 0 0 0) - (uuid 90842134-4bb6-46e7-96a6-489ce7c0fb43) - ) (junction (at 171.45 66.04) (diameter 0) (color 0 0 0 0) (uuid 94de52ae-c5ce-4eb9-83d6-c458a1e0bf7d) ) @@ -972,9 +960,6 @@ (junction (at 95.885 106.68) (diameter 0) (color 0 0 0 0) (uuid a1ef0279-7351-41e1-9d83-b30b1758a98a) ) - (junction (at 194.945 33.02) (diameter 0) (color 0 0 0 0) - (uuid a4ab855b-bad6-4cf5-b956-f41b7495fc5e) - ) (junction (at 95.885 86.36) (diameter 0) (color 0 0 0 0) (uuid a72131d9-a6e1-460c-9d52-b312228b1f38) ) @@ -999,18 +984,12 @@ (junction (at 157.48 69.85) (diameter 0) (color 0 0 0 0) (uuid ab25cf44-b01c-48c9-b420-169960f570bb) ) - (junction (at 171.45 36.83) (diameter 0) (color 0 0 0 0) - (uuid b09bc225-345e-423a-8d07-c6ba48bcc86f) - ) - (junction (at 144.78 33.02) (diameter 0) (color 0 0 0 0) - (uuid b24202f6-b572-45fc-9a71-ae3333210ec9) + (junction (at 107.315 30.48) (diameter 0) (color 0 0 0 0) + (uuid b44ea3b2-a709-4860-b3e3-35e8d915db6c) ) (junction (at 235.585 90.17) (diameter 0) (color 0 0 0 0) (uuid b48b2060-7c34-4712-9968-f18b7728ab99) ) - (junction (at 219.075 33.02) (diameter 0) (color 0 0 0 0) - (uuid b4dd17c3-05f1-4a6d-b049-beb9b641d34d) - ) (junction (at 194.945 106.68) (diameter 0) (color 0 0 0 0) (uuid b68da62b-6b8d-427a-8db6-687a2cbf81dd) ) @@ -1026,18 +1005,15 @@ (junction (at 47.625 86.36) (diameter 0) (color 0 0 0 0) (uuid bc5e0ad3-4ad0-40e3-bb61-678626e4b157) ) + (junction (at 89.535 30.48) (diameter 0) (color 0 0 0 0) + (uuid bc6f26cf-9626-4611-9751-8a5bbadbf215) + ) (junction (at 120.65 106.68) (diameter 0) (color 0 0 0 0) (uuid be42eb6f-60a7-401b-abdf-46a15dd99ba4) ) (junction (at 58.42 40.64) (diameter 0) (color 0 0 0 0) (uuid be673d5e-7077-4610-b57e-6a78d3af8368) ) - (junction (at 247.65 33.02) (diameter 0) (color 0 0 0 0) - (uuid bea5bff0-f58e-44c5-b0df-d387f80430a7) - ) - (junction (at 71.12 33.02) (diameter 0) (color 0 0 0 0) - (uuid c4d7f105-068f-415e-b576-f9b5a6778081) - ) (junction (at 207.645 59.69) (diameter 0) (color 0 0 0 0) (uuid c5917e1c-10db-4df5-9d35-cfc4fc0173f8) ) @@ -1047,9 +1023,6 @@ (junction (at 247.65 106.68) (diameter 0) (color 0 0 0 0) (uuid cd50ccab-89d9-4ce8-97d2-6230391662c2) ) - (junction (at 247.65 36.83) (diameter 0) (color 0 0 0 0) - (uuid ce2ae758-9944-40b3-87d2-de1d47374406) - ) (junction (at 194.945 46.99) (diameter 0) (color 0 0 0 0) (uuid d121c017-e17b-410e-b938-4de0684f89cd) ) @@ -1092,12 +1065,18 @@ (junction (at 107.315 100.33) (diameter 0) (color 0 0 0 0) (uuid e2dcdc89-1cd5-4cf2-b420-9a72a847fa65) ) + (junction (at 157.48 30.48) (diameter 0) (color 0 0 0 0) + (uuid e5b495b1-b5ff-47ee-ad30-d39f0bd3d09d) + ) (junction (at 157.48 100.33) (diameter 0) (color 0 0 0 0) (uuid e70557f5-eca5-4dc5-a00e-c04bd3bd641f) ) (junction (at 47.625 96.52) (diameter 0) (color 0 0 0 0) (uuid e7b74393-30b9-406f-b3ae-5f7970cce4a0) ) + (junction (at 83.185 30.48) (diameter 0) (color 0 0 0 0) + (uuid e9f2d0f1-2347-4f01-a621-5f5fdce76258) + ) (junction (at 182.88 50.8) (diameter 0) (color 0 0 0 0) (uuid ec88da45-0657-40c5-966d-d4ff739d478b) ) @@ -1119,9 +1098,6 @@ (junction (at 157.48 40.64) (diameter 0) (color 0 0 0 0) (uuid f663a6db-0966-4e66-9672-2a7ab8e8144a) ) - (junction (at 219.075 36.83) (diameter 0) (color 0 0 0 0) - (uuid f8d48e04-fed6-491c-b9b7-8d9f70764211) - ) (no_connect (at 125.476 157.226) (uuid 0737243c-64bf-46c3-86a5-85f4c3999a22)) (no_connect (at 125.476 152.146) (uuid 11b4aec0-d53f-425a-bec8-5f287ba1cfbb)) @@ -1265,7 +1241,7 @@ (stroke (width 0) (type default)) (uuid e76a5bea-45a6-47ea-9434-9f789ba2d93b) ) - (bus_entry (at 262.89 33.02) (size 2.54 2.54) + (bus_entry (at 262.89 30.48) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid ebd304b2-d8d3-4bc7-8a9c-8e509141307c) ) @@ -1273,6 +1249,10 @@ (stroke (width 0) (type default)) (uuid f758fd05-59c5-462b-a9cf-957d906aaa15) ) + (bus_entry (at 59.055 26.035) (size 2.54 -2.54) + (stroke (width 0) (type default)) + (uuid f82c6af6-cea4-4cba-ad8f-ae2d66d37d8b) + ) (bus_entry (at 219.075 113.03) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid fe412dda-adec-4ff2-86bc-26424954fba8) @@ -1282,6 +1262,10 @@ (uuid fefe61f7-ff5c-4720-a13c-d3ad27bade7e) ) + (wire (pts (xy 34.29 19.05) (xy 89.535 19.05)) + (stroke (width 0) (type default)) + (uuid 00a0d56e-9647-47cd-b6b3-df1c2f2bfc4a) + ) (wire (pts (xy 235.585 90.17) (xy 262.89 90.17)) (stroke (width 0) (type default)) (uuid 00bed22b-7725-4cbc-813f-a1bef7c21f27) @@ -1294,6 +1278,10 @@ (stroke (width 0) (type default)) (uuid 02b9ccd4-98aa-4c46-8e7f-4aa7074a3ebb) ) + (wire (pts (xy 157.48 30.48) (xy 182.88 30.48)) + (stroke (width 0) (type default)) + (uuid 047789a6-db54-445b-a923-50880932d02b) + ) (wire (pts (xy 58.42 80.01) (xy 83.185 80.01)) (stroke (width 0) (type default)) (uuid 049dde07-23aa-4d3e-99da-98b179b27a82) @@ -1351,6 +1339,10 @@ (stroke (width 0) (type default)) (uuid 0c42c956-4688-4bbf-8940-ad2a1febda20) ) + (wire (pts (xy 207.645 30.48) (xy 207.645 34.29)) + (stroke (width 0) (type default)) + (uuid 0e29064c-7b8d-47b9-824e-daaa561fc38b) + ) (wire (pts (xy 157.48 40.64) (xy 182.88 40.64)) (stroke (width 0) (type default)) (uuid 0e46b1d5-f051-4957-9631-5c91cbe78314) @@ -1380,14 +1372,14 @@ (uuid 12c852da-710d-4c09-a918-a606fd77bb21) ) - (wire (pts (xy 95.885 33.02) (xy 120.65 33.02)) - (stroke (width 0) (type default)) - (uuid 133edffe-a46e-48ec-8a94-7cf344ec6920) - ) (wire (pts (xy 217.17 66.04) (xy 219.075 66.04)) (stroke (width 0) (type default)) (uuid 13ed880e-1581-4e5b-9b6b-a710c99b92fa) ) + (wire (pts (xy 107.315 30.48) (xy 132.715 30.48)) + (stroke (width 0) (type default)) + (uuid 13f31709-0d86-4079-8627-de4e4963a051) + ) (bus (pts (xy 50.165 115.57) (xy 73.66 115.57)) (stroke (width 0) (type default)) (uuid 156e5949-d8c7-4ace-8f1f-155ba33359d7) @@ -1401,10 +1393,18 @@ (stroke (width 0) (type default)) (uuid 164fa2d4-9f00-4f7f-8a05-424d27d6199f) ) + (wire (pts (xy 83.185 30.48) (xy 89.535 30.48)) + (stroke (width 0) (type default)) + (uuid 166431cd-48f2-44e1-b78c-c6f8a1ed3a15) + ) (wire (pts (xy 207.645 90.17) (xy 235.585 90.17)) (stroke (width 0) (type default)) (uuid 166bff6f-0500-4ffe-94d7-3b22695b58f6) ) + (wire (pts (xy 157.48 59.69) (xy 183.515 59.69)) + (stroke (width 0) (type default)) + (uuid 1749c27c-78c7-4906-b9d9-2194f80b73df) + ) (bus (pts (xy 265.43 43.18) (xy 265.43 53.34)) (stroke (width 0) (type default)) (uuid 17de7760-9b53-4bb7-8c06-069099bc96e4) @@ -1418,6 +1418,10 @@ (stroke (width 0) (type default)) (uuid 193cb200-0e03-48ac-aeb9-3e83f0084e5d) ) + (wire (pts (xy 182.88 30.48) (xy 207.645 30.48)) + (stroke (width 0) (type default)) + (uuid 19bb7248-abc3-4367-b0b4-4f5b9e65c25b) + ) (wire (pts (xy 58.42 90.17) (xy 58.42 93.98)) (stroke (width 0) (type default)) (uuid 1aedfce7-1109-4960-a97b-13cde35ce561) @@ -1691,10 +1695,6 @@ (stroke (width 0) (type default)) (uuid 46d0bd52-d4d0-47d2-a4ec-d63732c56368) ) - (wire (pts (xy 171.45 33.02) (xy 194.945 33.02)) - (stroke (width 0) (type default)) - (uuid 470ce186-e8c7-4db9-8f0f-a0dad47f9cf3) - ) (wire (pts (xy 107.315 69.85) (xy 132.715 69.85)) (stroke (width 0) (type default)) (uuid 485d6ca6-ba51-4295-9080-349f3c787791) @@ -1711,10 +1711,18 @@ (stroke (width 0) (type default)) (uuid 4a33d39e-b613-4187-801c-072d39d5a233) ) + (wire (pts (xy 234.95 30.48) (xy 234.95 34.29)) + (stroke (width 0) (type default)) + (uuid 4b8459fa-2f68-4b25-b10f-dbf2713f0a3f) + ) (wire (pts (xy 132.715 59.69) (xy 157.48 59.69)) (stroke (width 0) (type default)) (uuid 4cb8c107-f294-4be7-b812-01c07cce614e) ) + (wire (pts (xy 132.715 30.48) (xy 132.715 34.29)) + (stroke (width 0) (type default)) + (uuid 4d16a961-24b4-4f2b-bfd5-cb54472fa97e) + ) (wire (pts (xy 182.88 90.17) (xy 207.645 90.17)) (stroke (width 0) (type default)) (uuid 4d517068-5aa2-4cae-b87a-33a74b6fa1df) @@ -1747,6 +1755,10 @@ (stroke (width 0) (type default)) (uuid 510cb41d-0002-4b1e-bf33-d7b7142ddad3) ) + (wire (pts (xy 89.535 19.05) (xy 89.535 30.48)) + (stroke (width 0) (type default)) + (uuid 5143ba46-e7cb-4d69-8c36-ea3474857aae) + ) (wire (pts (xy 142.875 46.99) (xy 144.78 46.99)) (stroke (width 0) (type default)) (uuid 51456b5d-b7e4-4264-a8d4-6760cf0afae8) @@ -1797,7 +1809,7 @@ (stroke (width 0) (type default)) (uuid 5464b277-c500-4670-97c2-e076d7c1defd) ) - (bus (pts (xy 265.43 35.56) (xy 265.43 43.18)) + (bus (pts (xy 265.43 33.02) (xy 265.43 43.18)) (stroke (width 0) (type default)) (uuid 54c97834-bdb9-4b75-94cf-9eee9fb4d157) ) @@ -1831,22 +1843,26 @@ (stroke (width 0) (type default)) (uuid 58772ef6-5fde-4a8f-95c2-684d02c9fb80) ) + (wire (pts (xy 183.515 59.69) (xy 207.645 59.69)) + (stroke (width 0) (type default)) + (uuid 58bb7c6d-b4e0-4306-9974-da848cc098ab) + ) (wire (pts (xy 132.715 40.64) (xy 132.715 44.45)) (stroke (width 0) (type default)) (uuid 59064a3d-6797-4c00-b31b-51e8388f4cba) ) - (wire (pts (xy 182.88 59.69) (xy 182.88 63.5)) + (wire (pts (xy 183.515 59.69) (xy 183.515 63.5)) (stroke (width 0) (type default)) (uuid 59706a26-9d58-4010-97e4-918a6fae923a) ) - (wire (pts (xy 95.885 33.02) (xy 95.885 36.83)) - (stroke (width 0) (type default)) - (uuid 5a0ec767-07d9-4141-9728-f7eefd027e90) - ) (wire (pts (xy 209.55 106.68) (xy 207.645 106.68)) (stroke (width 0) (type default)) (uuid 5ae36f35-52ac-4fc6-9a15-9912d654af5f) ) + (wire (pts (xy 207.645 30.48) (xy 234.95 30.48)) + (stroke (width 0) (type default)) + (uuid 5b9c528f-0039-4467-a754-f06d95f6ad3b) + ) (wire (pts (xy 120.65 36.83) (xy 120.65 46.99)) (stroke (width 0) (type default)) (uuid 5bd8816d-e3e5-4aa1-aaa8-2283f4a23587) @@ -1863,6 +1879,10 @@ (stroke (width 0) (type default)) (uuid 5e09644c-dce3-4016-8616-f9e6958191ab) ) + (wire (pts (xy 157.48 30.48) (xy 157.48 34.29)) + (stroke (width 0) (type default)) + (uuid 5e14bdd9-1513-4826-848f-4ca3ac252dcc) + ) (wire (pts (xy 185.42 106.68) (xy 182.88 106.68)) (stroke (width 0) (type default)) (uuid 5ea17b71-23a9-4359-b57b-c416c8da6067) @@ -1963,10 +1983,6 @@ (stroke (width 0) (type default)) (uuid 6b9d97f4-3177-45da-88d6-99f4e878dc69) ) - (wire (pts (xy 247.65 33.02) (xy 262.89 33.02)) - (stroke (width 0) (type default)) - (uuid 6d66b155-f0ec-4415-b3ca-e53056302cd9) - ) (wire (pts (xy 107.315 40.64) (xy 132.715 40.64)) (stroke (width 0) (type default)) (uuid 6f2acbe7-5e00-413a-ba9c-6a75e38b5bfc) @@ -1988,6 +2004,10 @@ (stroke (width 0) (type default)) (uuid 71dd6d1b-1db3-4d5e-897e-1753e4e76aff) ) + (wire (pts (xy 58.42 30.48) (xy 83.185 30.48)) + (stroke (width 0) (type default)) + (uuid 727f1405-2c02-4858-86ba-428a52db68b3) + ) (wire (pts (xy 157.48 90.17) (xy 182.88 90.17)) (stroke (width 0) (type default)) (uuid 7347b747-0acd-40a5-a484-022ff456f1f8) @@ -2004,10 +2024,6 @@ (stroke (width 0) (type default)) (uuid 771bb47c-7cb5-4d4d-8163-a0f054efcbbd) ) - (wire (pts (xy 219.075 33.02) (xy 219.075 36.83)) - (stroke (width 0) (type default)) - (uuid 771e0f3f-5b0b-4267-84f6-e2c72e02e82d) - ) (wire (pts (xy 68.58 57.15) (xy 71.12 57.15)) (stroke (width 0) (type default)) (uuid 77af2cda-8601-4bd3-bf5d-5360b9daa917) @@ -2028,10 +2044,6 @@ (stroke (width 0) (type default)) (uuid 78444e3f-9889-4482-aa03-58e98971e0bb) ) - (wire (pts (xy 144.78 33.02) (xy 171.45 33.02)) - (stroke (width 0) (type default)) - (uuid 7867f3b2-0600-4d56-8fb5-57124f3292fb) - ) (wire (pts (xy 107.696 147.066) (xy 112.776 147.066)) (stroke (width 0) (type default)) (uuid 7891e25f-d730-42f0-9650-eef32cc68b50) @@ -2174,6 +2186,10 @@ (stroke (width 0) (type default)) (uuid 8b7e246f-0007-45ae-8463-ecabe9415925) ) + (wire (pts (xy 59.055 26.035) (xy 44.45 26.035)) + (stroke (width 0) (type default)) + (uuid 8c080ec4-4b45-4b24-8f98-eaa95a7fbf11) + ) (bus (pts (xy 105.156 141.986) (xy 105.156 144.526)) (stroke (width 0) (type default)) (uuid 8c45397c-bf9b-4e5e-be5f-40184a91f2c2) @@ -2263,6 +2279,10 @@ (stroke (width 0) (type default)) (uuid 969ff1e2-b026-4dcc-9500-e10e3a8d3f19) ) + (wire (pts (xy 107.315 30.48) (xy 107.315 34.29)) + (stroke (width 0) (type default)) + (uuid 96a794eb-1b9d-468d-9120-84830ad54460) + ) (wire (pts (xy 219.075 46.99) (xy 219.075 36.83)) (stroke (width 0) (type default)) (uuid 96bb9ec5-0e28-48fa-a167-eab925f5de80) @@ -2275,6 +2295,10 @@ (stroke (width 0) (type default)) (uuid 97ef1120-fd0e-42cd-836e-2c3694cf852a) ) + (wire (pts (xy 234.95 30.48) (xy 262.89 30.48)) + (stroke (width 0) (type default)) + (uuid 9b2f3851-95c9-4d52-a47b-80830d2389d2) + ) (wire (pts (xy 132.715 50.8) (xy 132.715 54.61)) (stroke (width 0) (type default)) (uuid 9b5d81b5-c1ed-4d99-867b-7acc71645069) @@ -2288,10 +2312,6 @@ (uuid 9c0fc422-3a95-4bc7-8c6c-1a60cff074da) ) - (wire (pts (xy 50.8 44.45) (xy 50.8 45.72)) - (stroke (width 0) (type default)) - (uuid 9d959fb6-7db2-49fd-b99c-e8341a493b42) - ) (wire (pts (xy 45.085 66.04) (xy 47.625 66.04)) (stroke (width 0) (type default)) (uuid 9e0da4e3-f896-451f-a824-b5cef169a6fc) @@ -2304,6 +2324,10 @@ (stroke (width 0) (type default)) (uuid 9e4fbec2-3025-49ac-8068-54241d7b796c) ) + (wire (pts (xy 34.29 26.035) (xy 36.83 26.035)) + (stroke (width 0) (type default)) + (uuid 9f5678dc-3bf8-4d30-b850-c7b9828bfcfb) + ) (wire (pts (xy 95.885 57.15) (xy 95.885 46.99)) (stroke (width 0) (type default)) (uuid 9fa6a9a2-588b-4c40-aa69-72c2ce0496e5) @@ -2348,6 +2372,10 @@ (stroke (width 0) (type default)) (uuid a76248b4-6433-4069-9227-1f70dee36d8d) ) + (wire (pts (xy 34.925 34.29) (xy 34.925 30.48)) + (stroke (width 0) (type default)) + (uuid a772efa8-4367-4fd3-aefa-716c955f2ff7) + ) (wire (pts (xy 107.696 141.986) (xy 112.776 141.986)) (stroke (width 0) (type default)) (uuid a7ddc6ab-4094-425a-a9f1-f6603fd5f853) @@ -2416,9 +2444,9 @@ (stroke (width 0) (type default)) (uuid b1684d20-c98c-4b01-ab79-91c8888860b9) ) - (wire (pts (xy 219.075 33.02) (xy 247.65 33.02)) + (wire (pts (xy 58.42 30.48) (xy 58.42 34.29)) (stroke (width 0) (type default)) - (uuid b1701c17-35fd-4f87-ab1f-aadc6560c8eb) + (uuid b24dd188-d21c-42fe-98aa-c18ccaf1d196) ) (wire (pts (xy 83.185 100.33) (xy 107.315 100.33)) (stroke (width 0) (type default)) @@ -2440,10 +2468,6 @@ (stroke (width 0) (type default)) (uuid b6762f0a-e838-4e18-976e-7e3f5ce1d6ad) ) - (wire (pts (xy 71.12 33.02) (xy 95.885 33.02)) - (stroke (width 0) (type default)) - (uuid b70d01a6-6b6e-4746-9d5a-d1c2d2adec6b) - ) (wire (pts (xy 104.902 177.546) (xy 112.776 177.546)) (stroke (width 0) (type default)) (uuid b7469492-b597-4d71-bddd-23e51ea4a1d9) @@ -2473,10 +2497,6 @@ (stroke (width 0) (type default)) (uuid b808c899-171a-4aa4-b623-112cc6b085a9) ) - (wire (pts (xy 247.65 33.02) (xy 247.65 36.83)) - (stroke (width 0) (type default)) - (uuid b8dc5e1e-9f5b-4636-a17d-d6962e8bbdd9) - ) (wire (pts (xy 34.925 83.82) (xy 34.925 80.01)) (stroke (width 0) (type default)) (uuid b912709a-eb79-4636-bbd5-b842f2e83601) @@ -2521,10 +2541,6 @@ (stroke (width 0) (type default)) (uuid be684ec6-a5b8-404d-b7b5-78c0084fbaf3) ) - (wire (pts (xy 194.945 33.02) (xy 219.075 33.02)) - (stroke (width 0) (type default)) - (uuid bec5d30a-306b-41f6-8eeb-73c00dd95783) - ) (wire (pts (xy 171.45 106.68) (xy 171.45 113.03)) (stroke (width 0) (type default)) (uuid bee60f4f-2437-457c-bc1e-b0039948d0b9) @@ -2556,10 +2572,6 @@ (stroke (width 0) (type default)) (uuid c2c56b37-fa18-4073-b18c-74ff3038e40e) ) - (wire (pts (xy 171.45 33.02) (xy 171.45 36.83)) - (stroke (width 0) (type default)) - (uuid c2cea012-24c7-4134-8f4c-8ff6bc9702a4) - ) (wire (pts (xy 107.696 152.146) (xy 112.776 152.146)) (stroke (width 0) (type default)) (uuid c3467f41-deb5-4b12-851d-5433986f35c6) @@ -2592,22 +2604,10 @@ (stroke (width 0) (type default)) (uuid c736d211-d5f2-4688-9dad-fc956d1fa788) ) - (wire (pts (xy 144.78 33.02) (xy 144.78 36.83)) - (stroke (width 0) (type default)) - (uuid c7530af3-5f90-4ac9-b40e-ea595895069c) - ) - (wire (pts (xy 194.945 33.02) (xy 194.945 36.83)) - (stroke (width 0) (type default)) - (uuid c7a0b1ec-db57-4226-b3f1-f8eee2c83b2c) - ) (wire (pts (xy 142.875 86.36) (xy 144.78 86.36)) (stroke (width 0) (type default)) (uuid c9d5323a-fabe-4c83-88ad-fba21e143d90) ) - (wire (pts (xy 71.12 33.02) (xy 71.12 36.83)) - (stroke (width 0) (type default)) - (uuid ca5a051f-46b6-44ab-a240-b29b303eac96) - ) (bus (pts (xy 147.32 115.57) (xy 173.99 115.57)) (stroke (width 0) (type default)) (uuid cabe6c05-9b55-4158-b042-883c56004401) @@ -2617,6 +2617,11 @@ (stroke (width 0) (type default)) (uuid caf6a669-29e5-487a-b6f7-435349b67f64) ) + (bus (pts (xy 61.595 23.495) (xy 65.405 23.495)) + (stroke (width 0) (type default)) + (uuid cb36570a-020e-47f9-911b-da0ca27a3a6d) + ) + (wire (pts (xy 58.42 50.8) (xy 83.185 50.8)) (stroke (width 0) (type default)) (uuid cb427ff8-087f-44ad-8134-78525a16d9df) @@ -2729,14 +2734,6 @@ (stroke (width 0) (type default)) (uuid dccd3bc2-5d48-4151-84d4-c54c2b8ccce0) ) - (wire (pts (xy 120.65 33.02) (xy 120.65 36.83)) - (stroke (width 0) (type default)) - (uuid dd81c30a-9aa5-467b-a840-f90c8fd0c01d) - ) - (wire (pts (xy 47.625 36.83) (xy 47.625 33.02)) - (stroke (width 0) (type default)) - (uuid dda552bc-5d22-4323-a978-97475d60e160) - ) (bus (pts (xy 85.852 167.386) (xy 85.852 169.926)) (stroke (width 0) (type default)) (uuid de8acdf9-3aff-4717-b4a8-566d11bd92e3) @@ -2791,6 +2788,10 @@ (uuid e584160c-07c0-4e4f-b09f-1ff7384373f2) ) + (wire (pts (xy 83.185 30.48) (xy 83.185 34.29)) + (stroke (width 0) (type default)) + (uuid e586926d-bb39-4169-a0fa-d615127918cf) + ) (wire (pts (xy 217.17 57.15) (xy 219.075 57.15)) (stroke (width 0) (type default)) (uuid e666fe8b-df0d-4090-9750-1dac378d680d) @@ -2807,6 +2808,10 @@ (stroke (width 0) (type default)) (uuid e8977f4f-6dd9-405b-b3bf-c36fc1a26000) ) + (wire (pts (xy 34.29 23.495) (xy 34.29 19.05)) + (stroke (width 0) (type default)) + (uuid e8b69f69-683c-4ba9-92cf-e7650e48c322) + ) (wire (pts (xy 144.78 57.15) (xy 144.78 66.04)) (stroke (width 0) (type default)) (uuid e8ce81ad-a5c4-4034-a08f-b76a96cac25b) @@ -2823,14 +2828,14 @@ (stroke (width 0) (type default)) (uuid e9d88acd-8972-456e-b4ea-8161f0fcfc14) ) + (wire (pts (xy 132.715 30.48) (xy 157.48 30.48)) + (stroke (width 0) (type default)) + (uuid ea23eb44-3113-4832-bf8e-d602df630231) + ) (wire (pts (xy 118.11 46.99) (xy 120.65 46.99)) (stroke (width 0) (type default)) (uuid ea3fccd1-2174-42fe-9077-cbceddf90093) ) - (wire (pts (xy 157.48 59.69) (xy 182.88 59.69)) - (stroke (width 0) (type default)) - (uuid ead88ef3-8d72-4919-866c-36fe141bad55) - ) (wire (pts (xy 132.715 90.17) (xy 132.715 93.98)) (stroke (width 0) (type default)) (uuid eb2d82b8-b69a-46ab-8aca-6cb1331d151b) @@ -2908,7 +2913,7 @@ (uuid f38c3198-c2a9-4945-95da-ef619dd0515b) ) - (wire (pts (xy 120.65 33.02) (xy 144.78 33.02)) + (wire (pts (xy 34.925 30.48) (xy 58.42 30.48)) (stroke (width 0) (type default)) (uuid f443dfdd-8c44-46a6-9ccb-f991e9d2aa08) ) @@ -2933,6 +2938,10 @@ (uuid f68d1e06-b455-47ca-8f29-e4d6fe4cfb8b) ) + (wire (pts (xy 182.88 30.48) (xy 182.88 34.29)) + (stroke (width 0) (type default)) + (uuid f68f8eec-524c-47d6-ab38-1a3cd5dd5601) + ) (wire (pts (xy 83.185 90.17) (xy 107.315 90.17)) (stroke (width 0) (type default)) (uuid f6a89da0-6ee7-4d9c-84db-64693bd57b55) @@ -2941,10 +2950,6 @@ (stroke (width 0) (type default)) (uuid f7026e1b-39b0-41ef-b85c-995d8bac40f3) ) - (wire (pts (xy 47.625 33.02) (xy 71.12 33.02)) - (stroke (width 0) (type default)) - (uuid f7ab7215-4308-4194-b951-1d5ce0dfec33) - ) (bus (pts (xy 105.156 144.526) (xy 105.156 147.066)) (stroke (width 0) (type default)) (uuid f83b57f2-bedb-474e-8201-d3457c9f26fe) @@ -2966,10 +2971,6 @@ (stroke (width 0) (type default)) (uuid fb52f608-5705-46e3-af55-d1452ca4b81d) ) - (wire (pts (xy 182.88 59.69) (xy 207.645 59.69)) - (stroke (width 0) (type default)) - (uuid fb9c4120-ffaf-4ceb-98c5-f550ebafd161) - ) (wire (pts (xy 95.885 86.36) (xy 95.885 96.52)) (stroke (width 0) (type default)) (uuid fbbf12c6-edca-4e1e-a39f-958e3605f71e) @@ -2990,6 +2991,10 @@ (stroke (width 0) (type default)) (uuid fd895f77-b137-4da0-bf45-91993299288c) ) + (wire (pts (xy 89.535 30.48) (xy 107.315 30.48)) + (stroke (width 0) (type default)) + (uuid fdaf0d1a-d986-42d4-b4d8-46ebfefd02b7) + ) (wire (pts (xy 34.925 36.83) (xy 37.465 36.83)) (stroke (width 0) (type default)) (uuid fe3596e9-7dfb-4ddb-adac-ff13fdae14b1) @@ -3015,6 +3020,10 @@ (uuid ff753a8e-3d53-4254-92de-f10020575d41) ) + (label "Row10" (at 47.625 26.035 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 03f31a80-dd0e-4be4-b036-a254deae55e9) + ) (label "Col4" (at 111.506 147.066 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid 131fefd0-e4d1-4786-ae23-bcb13048765a) @@ -3067,7 +3076,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 65330bbc-4fce-4ebe-99de-c174b3433402) ) - (label "Col0" (at 253.365 33.02 0) (fields_autoplaced) + (label "Col0" (at 253.365 30.48 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 6f7d7520-49e9-425f-9506-8749f42d42e2) ) @@ -3111,6 +3120,10 @@ (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid c2c47359-38fd-4836-a473-fe9cb30108eb) ) + (label "Row9" (at 247.65 111.125 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid c86b3849-ad73-4426-a2b8-32a966860a4c) + ) (label "Col3" (at 253.365 59.69 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid d9327a20-4645-433f-ba2b-024bcdf91b7d) @@ -3143,7 +3156,7 @@ (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid f1f71edd-1b43-41a0-b0f0-1c82ba176b1c) ) - (label "Col1" (at 253.365 40.005 0) (fields_autoplaced) + (label "Col1" (at 253.365 40.64 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid fd8608d1-3718-4d17-abd0-73a2357076ff) ) @@ -3183,6 +3196,13 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) + (global_label "Row[0..15]" (shape input) (at 65.405 23.495 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid ed8056b4-3749-4794-adaf-521615b51a8e) + (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 78.0991 23.4156 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (symbol (lib_id "Connector:Conn_01x02_Pin") (at 127.635 73.66 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) @@ -3193,7 +3213,7 @@ (property "Value" "8 *" (at 126.111 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 73.66 0) @@ -3245,7 +3265,7 @@ (property "Value" "Y" (at 100.711 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 83.82 0) @@ -3297,7 +3317,7 @@ (property "Value" "0" (at 201.041 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 104.14 0) @@ -3323,7 +3343,7 @@ (property "Value" "4 $" (at 76.581 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 73.66 0) @@ -3375,7 +3395,7 @@ (property "Value" "D" (at 76.581 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 54.61 0) @@ -3401,7 +3421,7 @@ (property "Value" "R" (at 76.581 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 83.82 0) @@ -3427,7 +3447,7 @@ (property "Value" "M" (at 126.111 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 63.5 0) @@ -3453,7 +3473,7 @@ (property "Value" "9" (at 228.981 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 230.505 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 73.66 0) @@ -3777,7 +3797,7 @@ (property "Value" "SHIFT" (at 28.321 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_2.25u_Plate" (at 29.845 93.98 0) + (property "Footprint" "unikbd:Key_MX_2u" (at 29.845 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 93.98 0) @@ -3803,7 +3823,7 @@ (property "Value" "8" (at 201.041 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 73.66 0) @@ -3829,7 +3849,7 @@ (property "Value" "L" (at 150.876 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 54.61 0) @@ -3855,7 +3875,7 @@ (property "Value" ">" (at 176.276 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 104.14 0) @@ -3933,7 +3953,7 @@ (property "Value" "6 ^" (at 100.711 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 73.66 0) @@ -3976,6 +3996,32 @@ ) ) + (symbol (lib_id "unikbd:diode-combined") (at 40.64 26.035 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) + (uuid 4606b571-1af9-4737-a29c-897bbdf1d395) + (property "Reference" "D83" (at 40.894 23.241 0) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "diode-combined" (at 40.64 24.003 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Footprint" "unikbd:diode-combined" (at 20.32 48.895 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 33.02 46.355 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid e2c710e3-eee4-45cf-a08a-dd2302110da1)) + (pin "2" (uuid dd183bb0-8291-42a6-bc68-44109bc93001)) + (instances + (project "franklin-ace-1000-keyboard" + (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" + (reference "D83") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "Connector:Conn_01x02_Pin") (at 202.565 93.98 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 468ca2b0-1ee5-4b2c-b12e-83acf6899b6c) @@ -3985,7 +4031,7 @@ (property "Value" "2" (at 201.041 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 93.98 0) @@ -4011,7 +4057,7 @@ (property "Value" "." (at 228.981 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 230.505 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 104.14 0) @@ -4037,7 +4083,7 @@ (property "Value" "H" (at 100.711 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 93.98 0) @@ -4115,7 +4161,7 @@ (property "Value" "G" (at 100.711 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 54.61 0) @@ -4271,7 +4317,7 @@ (property "Value" "PAUSE" (at 28.321 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 29.845 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 29.845 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 54.61 0) @@ -4291,7 +4337,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 175.006 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 52a09b35-041d-4b3d-94f7-f655b8af1314) - (property "Reference" "D7" (at 98.552 173.99 0) + (property "Reference" "D81" (at 97.79 173.99 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 176.276 0) @@ -4308,7 +4354,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D7") (unit 1) + (reference "D81") (unit 1) ) ) ) @@ -4323,7 +4369,7 @@ (property "Value" "RIGHT" (at 150.876 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 73.66 0) @@ -4398,10 +4444,10 @@ (property "Reference" "K32" (at 27.305 101.6 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "SPACE" (at 28.321 104.648 0) + (property "Value" "SPACE_8U" (at 28.321 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_6.25u_PCB" (at 29.845 104.14 0) + (property "Footprint" "unikbd:Key_MX_Spacebar_5.25" (at 29.845 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 104.14 0) @@ -4427,14 +4473,14 @@ (property "Value" "BREAK" (at 28.321 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 29.845 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 29.845 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 44.45 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid 0acd2639-8d0c-4d9f-b3e7-93f035a8c76c)) - (pin "2" (uuid 77f22485-20d2-4e70-9ca1-eb937fa9e100)) + (pin "1" (uuid 451cf4de-f424-43ed-99e3-a4b419b6c948)) + (pin "2" (uuid 2127fc19-2729-48ec-b9ac-cfa2ff5ca401)) (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" @@ -4453,7 +4499,7 @@ (property "Value" "3 #" (at 76.581 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 34.29 0) @@ -4479,7 +4525,7 @@ (property "Value" "3" (at 228.981 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 230.505 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 93.98 0) @@ -4557,7 +4603,7 @@ (property "Value" "7" (at 176.276 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 73.66 0) @@ -4583,7 +4629,7 @@ (property "Value" ", <" (at 126.111 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 104.14 0) @@ -4635,7 +4681,7 @@ (property "Value" "LEFT" (at 228.981 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_Plate" (at 230.505 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 63.5 0) @@ -4661,7 +4707,7 @@ (property "Value" "U" (at 126.111 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 44.45 0) @@ -4687,7 +4733,7 @@ (property "Value" "V" (at 76.581 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 104.14 0) @@ -4765,7 +4811,7 @@ (property "Value" "+ / =" (at 228.346 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 229.87 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 229.87 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 229.87 34.29 0) @@ -4791,7 +4837,7 @@ (property "Value" "X" (at 51.816 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 104.14 0) @@ -4808,6 +4854,32 @@ ) ) + (symbol (lib_id "Connector:Conn_01x02_Pin") (at 29.21 23.495 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) + (uuid 715fb148-c26b-4f03-adec-ceb654ea20fe) + (property "Reference" "K73" (at 26.67 20.955 0) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "SPACE_1U" (at 27.686 24.003 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (property "Footprint" "unikbd:Key_MX" (at 29.21 23.495 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 29.21 23.495 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid aadaf3c6-3e12-4d82-846b-f5ed6d47f371)) + (pin "2" (uuid c6875d17-1d1f-433b-8b16-65b980d7ae61)) + (instances + (project "franklin-ace-1000-keyboard" + (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" + (reference "K73") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "Connector:Conn_01x02_Pin") (at 152.4 34.29 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 7375ca19-b87c-41d3-b6bc-069ef650f0ef) @@ -4817,7 +4889,7 @@ (property "Value" "9 (" (at 150.876 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 34.29 0) @@ -4869,7 +4941,7 @@ (property "Value" "SHIFT" (at 201.041 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_2.00u_Plate" (at 202.565 63.5 0) + (property "Footprint" "unikbd:Key_MX_2u" (at 202.565 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 63.5 0) @@ -4895,7 +4967,7 @@ (property "Value" "TAB" (at 28.575 74.422 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.50u_Plate" (at 29.845 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 29.845 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 73.66 0) @@ -4915,7 +4987,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 167.386 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 7d5bf163-fe76-4a55-9cf5-e2cf12bfcaaf) - (property "Reference" "D4" (at 98.552 166.37 0) + (property "Reference" "D78" (at 97.79 166.37 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 168.656 0) @@ -4932,7 +5004,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D4") (unit 1) + (reference "D78") (unit 1) ) ) ) @@ -4947,7 +5019,7 @@ (property "Value" "O" (at 150.876 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 44.45 0) @@ -4973,7 +5045,7 @@ (property "Value" "I" (at 126.111 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 83.82 0) @@ -4999,7 +5071,7 @@ (property "Value" "7 &" (at 126.111 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 34.29 0) @@ -5025,7 +5097,7 @@ (property "Value" "T" (at 100.711 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 44.45 0) @@ -5051,7 +5123,7 @@ (property "Value" "A" (at 51.816 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 54.61 0) @@ -5077,7 +5149,7 @@ (property "Value" "*" (at 150.876 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 104.14 0) @@ -5103,7 +5175,7 @@ (property "Value" "RETURN" (at 228.981 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.50u_Plate" (at 230.505 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 54.61 0) @@ -5129,7 +5201,7 @@ (property "Value" "; :" (at 176.276 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 54.61 0) @@ -5181,7 +5253,7 @@ (property "Value" "ESC" (at 28.321 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 29.845 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 29.845 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 34.29 0) @@ -5233,7 +5305,7 @@ (property "Value" "C" (at 76.581 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 63.5 0) @@ -5285,7 +5357,7 @@ (property "Value" "6" (at 228.981 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 230.505 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 83.82 0) @@ -5305,7 +5377,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 162.306 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 95040975-ea63-469a-8be6-6ed27aacbf11) - (property "Reference" "D2" (at 98.552 161.29 0) + (property "Reference" "D76" (at 97.79 161.29 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 163.576 0) @@ -5322,7 +5394,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D2") (unit 1) + (reference "D76") (unit 1) ) ) ) @@ -5363,7 +5435,7 @@ (property "Value" "[ {" (at 201.041 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 44.45 0) @@ -5467,7 +5539,7 @@ (property "Value" "F" (at 76.581 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 93.98 0) @@ -5487,7 +5559,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 169.926 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 9ccfb133-587e-4c99-92c7-6577ba7c6b27) - (property "Reference" "D5" (at 98.552 168.91 0) + (property "Reference" "D79" (at 97.79 168.91 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 171.196 0) @@ -5504,7 +5576,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D5") (unit 1) + (reference "D79") (unit 1) ) ) ) @@ -5571,7 +5643,7 @@ (property "Value" "W" (at 51.816 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 83.82 0) @@ -5591,7 +5663,7 @@ (symbol (lib_id "Diode:1N4148") (at 137.16 182.626 0) (mirror x) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid a4f95368-9cdf-4133-bc60-6a3be95d6d40) - (property "Reference" "D9" (at 137.16 180.086 0) + (property "Reference" "D74" (at 137.16 180.086 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 137.16 185.674 0) @@ -5608,7 +5680,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D9") (unit 1) + (reference "D74") (unit 1) ) ) ) @@ -5623,7 +5695,7 @@ (property "Value" "5" (at 201.041 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 83.82 0) @@ -5675,7 +5747,7 @@ (property "Value" "K" (at 126.111 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 93.98 0) @@ -5701,7 +5773,7 @@ (property "Value" "P" (at 176.276 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 44.45 0) @@ -5831,7 +5903,7 @@ (property "Value" "N" (at 100.711 104.648 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 104.14 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 104.14 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 104.14 0) @@ -5857,7 +5929,7 @@ (property "Value" "B" (at 100.711 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 63.5 0) @@ -6039,7 +6111,7 @@ (property "Value" "S" (at 51.816 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 93.98 0) @@ -6059,7 +6131,7 @@ (symbol (lib_id "Device:LED") (at 137.16 167.386 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid bada90ef-d0b9-4350-867b-418f3f5aa34e) - (property "Reference" "D10" (at 137.16 163.576 0) + (property "Reference" "D73" (at 137.16 163.576 0) (effects (font (size 1.27 1.27))) ) (property "Value" "LED" (at 137.16 169.926 0) @@ -6076,7 +6148,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D10") (unit 1) + (reference "D73") (unit 1) ) ) ) @@ -6143,14 +6215,14 @@ (property "Value" "Q" (at 51.816 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 44.45 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid e526e74b-2076-4458-82f7-3a8566637271)) - (pin "2" (uuid 069617bf-afe5-42aa-ac09-b459f824c465)) + (pin "1" (uuid eb170441-a51d-48ec-a249-e5cb88807f0c)) + (pin "2" (uuid 8eb8f1fc-39e8-409d-a1fa-58232a451202)) (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" @@ -6195,7 +6267,7 @@ (property "Value" "5 &" (at 100.711 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 102.235 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 102.235 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 102.235 34.29 0) @@ -6241,7 +6313,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 164.846 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid c0d286de-0700-4d4e-a0b3-35a92af1c0f3) - (property "Reference" "D3" (at 98.552 163.83 0) + (property "Reference" "D77" (at 97.79 163.83 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 166.116 0) @@ -6258,7 +6330,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D3") (unit 1) + (reference "D77") (unit 1) ) ) ) @@ -6351,7 +6423,7 @@ (property "Value" "; \"" (at 201.041 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 54.61 0) @@ -6397,7 +6469,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 177.546 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid caac283b-646e-4d43-95e0-f122ca928b04) - (property "Reference" "D8" (at 98.552 176.53 0) + (property "Reference" "D82" (at 97.79 176.53 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 178.816 0) @@ -6414,7 +6486,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D8") (unit 1) + (reference "D82") (unit 1) ) ) ) @@ -6481,7 +6553,7 @@ (property "Value" ". >" (at 150.876 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 63.5 0) @@ -6507,7 +6579,7 @@ (property "Value" "J" (at 126.111 55.118 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 127.635 54.61 0) + (property "Footprint" "unikbd:Key_MX" (at 127.635 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 127.635 54.61 0) @@ -6559,7 +6631,7 @@ (property "Value" "2 @" (at 51.816 74.168 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 73.66 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 73.66 0) @@ -6585,7 +6657,7 @@ (property "Value" "] }" (at 228.981 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 230.505 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 230.505 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 230.505 44.45 0) @@ -6637,7 +6709,7 @@ (property "Value" "1" (at 176.276 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 93.98 0) @@ -6663,7 +6735,7 @@ (property "Value" "1 !" (at 51.816 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 34.29 0) @@ -6689,7 +6761,7 @@ (property "Value" "0 )" (at 176.276 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 34.29 0) @@ -6735,7 +6807,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 159.766 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid db1db1d5-8b95-438b-b739-ec4ac5d7fb39) - (property "Reference" "D1" (at 98.552 158.75 0) + (property "Reference" "D75" (at 97.79 158.75 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 161.036 0) @@ -6752,7 +6824,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D1") (unit 1) + (reference "D75") (unit 1) ) ) ) @@ -6767,7 +6839,7 @@ (property "Value" "CTRL" (at 28.321 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 29.845 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 29.845 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 63.5 0) @@ -6793,7 +6865,7 @@ (property "Value" "E" (at 76.581 44.958 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 78.105 44.45 0) + (property "Footprint" "unikbd:Key_MX" (at 78.105 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 78.105 44.45 0) @@ -6845,7 +6917,7 @@ (property "Value" "-" (at 150.876 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 83.82 0) @@ -6923,7 +6995,7 @@ (property "Value" "Z" (at 51.816 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 53.34 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 53.34 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 53.34 63.5 0) @@ -6949,7 +7021,7 @@ (property "Value" "- / _" (at 201.041 34.798 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 202.565 34.29 0) + (property "Footprint" "unikbd:Key_MX" (at 202.565 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 202.565 34.29 0) @@ -7027,7 +7099,7 @@ (property "Value" "+" (at 150.876 94.488 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 152.4 93.98 0) + (property "Footprint" "unikbd:Key_MX" (at 152.4 93.98 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 152.4 93.98 0) @@ -7079,7 +7151,7 @@ (property "Value" "/ ?" (at 176.911 64.008 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 178.435 63.5 0) + (property "Footprint" "unikbd:Key_MX" (at 178.435 63.5 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 178.435 63.5 0) @@ -7131,7 +7203,7 @@ (property "Value" "4" (at 176.276 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 177.8 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 177.8 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 177.8 83.82 0) @@ -7151,7 +7223,7 @@ (symbol (lib_id "Diode:1N4148") (at 101.092 172.466 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid faffd13d-e09a-4271-bb1b-868d9dd2ab79) - (property "Reference" "D6" (at 98.552 171.45 0) + (property "Reference" "D80" (at 97.79 171.45 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148" (at 106.934 173.736 0) @@ -7168,7 +7240,7 @@ (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" - (reference "D6") (unit 1) + (reference "D80") (unit 1) ) ) ) @@ -7189,8 +7261,8 @@ (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 33.655 57.15 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid 9e6f7ba7-d3a9-4299-aacd-0c906558656d)) - (pin "2" (uuid 465ad603-7a44-4505-a594-e6c65e351a55)) + (pin "1" (uuid f4e90253-31d3-4471-9b05-31cbd0d5d6e6)) + (pin "2" (uuid 9a164e0e-589f-46c8-a9e3-ea06fdbf23f8)) (instances (project "franklin-ace-1000-keyboard" (path "/2fa425ff-1058-41a5-8fe7-3b33fbd26bdc" @@ -7261,7 +7333,7 @@ (property "Value" "LOCK" (at 28.321 84.328 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_Plate" (at 29.845 83.82 0) + (property "Footprint" "unikbd:Key_MX" (at 29.845 83.82 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 29.845 83.82 0)