diff --git a/bom_replace_uaefi-a.csv b/bom_replace_uaefi-a.csv index ec50242..228d750 100644 --- a/bom_replace_uaefi-a.csv +++ b/bom_replace_uaefi-a.csv @@ -41,5 +41,8 @@ C133,"1u","C0603","C519559" #mux "U755,U756","WAS3157B-6","SOT-363","C213161" +#02x08 shortage +J10,"39301160","02x08_4.2mm","C5355564" + #include hellen-one/board_id/generated/board_id_uaefi-a.csv #include bom_pullups_uaefi-a.csv \ No newline at end of file diff --git a/egt.kicad_sch b/egt.kicad_sch index 43302e5..327f056 100644 --- a/egt.kicad_sch +++ b/egt.kicad_sch @@ -366,7 +366,7 @@ (junction (at 116.84 95.25) (diameter 0) (color 0 0 0 0) (uuid 14084d1d-6c47-44f7-84aa-9eeea80ed098) ) - (junction (at 135.255 95.25) (diameter 0) (color 0 0 0 0) + (junction (at 135.89 95.25) (diameter 0) (color 0 0 0 0) (uuid 1fcbdd1d-652b-4a2e-8960-f2467e88198e) ) (junction (at 121.92 87.63) (diameter 0) (color 0 0 0 0) @@ -381,7 +381,7 @@ (junction (at 189.23 68.58) (diameter 0) (color 0 0 0 0) (uuid a120ec1e-ecea-45aa-b947-330974c5b52f) ) - (junction (at 150.495 90.17) (diameter 0) (color 0 0 0 0) + (junction (at 151.13 90.17) (diameter 0) (color 0 0 0 0) (uuid cd7fbacf-34b1-4af1-80c1-f126bbef8b6f) ) @@ -393,7 +393,7 @@ (stroke (width 0) (type default)) (uuid 0d9ccfc6-c322-4897-b4b9-ad5644c04ddc) ) - (wire (pts (xy 142.24 87.63) (xy 150.495 87.63)) + (wire (pts (xy 142.24 87.63) (xy 151.13 87.63)) (stroke (width 0) (type default)) (uuid 1b99c202-dc26-4103-a1bd-de7d0a3299a2) ) @@ -409,7 +409,7 @@ (stroke (width 0) (type default)) (uuid 2c521480-16e6-4321-a4c3-aa249fdf11f1) ) - (wire (pts (xy 150.495 90.17) (xy 150.495 97.79)) + (wire (pts (xy 151.13 90.17) (xy 151.13 97.79)) (stroke (width 0) (type default)) (uuid 348249fb-9fb5-4beb-aeae-586168b3eeb9) ) @@ -417,7 +417,7 @@ (stroke (width 0) (type default)) (uuid 4d72b1ac-c0f7-4cb8-8233-3efaeb0fa4a5) ) - (wire (pts (xy 135.255 105.41) (xy 135.255 107.95)) + (wire (pts (xy 135.89 105.41) (xy 135.89 107.95)) (stroke (width 0) (type default)) (uuid 59dda02c-2052-4c29-a9d6-e7f8bf9972d1) ) @@ -429,7 +429,7 @@ (stroke (width 0) (type default)) (uuid 65b02fc8-4085-4add-8c63-8d405c98c2b5) ) - (wire (pts (xy 150.495 87.63) (xy 150.495 90.17)) + (wire (pts (xy 151.13 87.63) (xy 151.13 90.17)) (stroke (width 0) (type default)) (uuid 682b2407-6b9f-4b99-bc63-cdf2b59ba9ab) ) @@ -441,11 +441,11 @@ (stroke (width 0) (type default)) (uuid 73684da3-7d04-44c2-9cba-cdfe8b743351) ) - (wire (pts (xy 116.84 95.25) (xy 135.255 95.25)) + (wire (pts (xy 116.84 95.25) (xy 135.89 95.25)) (stroke (width 0) (type default)) (uuid 7d4b90d5-40ba-4976-8095-5728f7783d34) ) - (wire (pts (xy 150.495 90.17) (xy 156.21 90.17)) + (wire (pts (xy 151.13 90.17) (xy 156.21 90.17)) (stroke (width 0) (type default)) (uuid 853bf819-d5ab-4a20-b57d-08dbf0b2cb75) ) @@ -457,7 +457,7 @@ (stroke (width 0) (type default)) (uuid 9bd50f83-afb3-4df0-baa7-f9cf3929d47e) ) - (wire (pts (xy 150.495 105.41) (xy 150.495 107.95)) + (wire (pts (xy 151.13 105.41) (xy 151.13 107.95)) (stroke (width 0) (type default)) (uuid 9faad16b-7ecd-46b4-b009-a3b5688fdc1e) ) @@ -469,7 +469,7 @@ (stroke (width 0) (type default)) (uuid b0f75bfa-4b3d-4d0c-b141-baa241c6ff6e) ) - (wire (pts (xy 135.255 95.25) (xy 142.24 95.25)) + (wire (pts (xy 135.89 95.25) (xy 142.24 95.25)) (stroke (width 0) (type default)) (uuid b1549893-cd7d-4d72-bfe0-f466c8edd328) ) @@ -477,7 +477,7 @@ (stroke (width 0) (type default)) (uuid b35294db-dcf8-44a4-af2c-897d33880f02) ) - (wire (pts (xy 135.255 95.25) (xy 135.255 97.79)) + (wire (pts (xy 135.89 95.25) (xy 135.89 97.79)) (stroke (width 0) (type default)) (uuid b7061746-68f1-4fd8-b72f-1edc4b34ddea) ) @@ -523,25 +523,25 @@ (uuid f8d7a172-6be4-4856-a000-a19eea5f7323) ) - (symbol (lib_id "hellen-one-common:Cap") (at 135.255 101.6 90) (unit 1) + (symbol (lib_id "hellen-one-common:Cap") (at 135.89 101.6 90) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 0427b7f6-094d-4360-bfde-585777e5e23f) - (property "Reference" "C?" (at 137.795 99.695 90) + (property "Reference" "C?" (at 138.43 99.695 90) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "10n" (at 137.795 101.6 90) + (property "Value" "10n" (at 138.43 101.6 90) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "hellen-one-common:C0603" (at 139.065 104.14 0) + (property "Footprint" "hellen-one-common:C0603" (at 139.7 104.14 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 135.255 105.41 90) + (property "Datasheet" "" (at 135.89 105.41 90) (effects (font (size 1.27 1.27)) hide) ) - (property "LCSC" "" (at 135.255 101.6 0) + (property "LCSC" "" (at 135.89 101.6 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MyComment" "DNP" (at 139.7 103.505 90) + (property "MyComment" "DNP" (at 140.335 103.505 90) (effects (font (size 1.27 1.27))) ) (pin "1" (uuid 2c162339-044d-422a-a2a3-5ec3bb2a8966)) @@ -646,25 +646,25 @@ ) ) - (symbol (lib_id "hellen-one-common:Cap") (at 150.495 101.6 90) (unit 1) + (symbol (lib_id "hellen-one-common:Cap") (at 151.13 101.6 90) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 12218d10-0028-40b3-908d-826c75147794) - (property "Reference" "C?" (at 153.035 99.695 90) + (property "Reference" "C?" (at 153.67 99.695 90) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "10n" (at 153.035 101.6 90) + (property "Value" "10n" (at 153.67 101.6 90) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "hellen-one-common:C0603" (at 154.305 104.14 0) + (property "Footprint" "hellen-one-common:C0603" (at 154.94 104.14 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 150.495 105.41 90) + (property "Datasheet" "" (at 151.13 105.41 90) (effects (font (size 1.27 1.27)) hide) ) - (property "LCSC" "" (at 150.495 101.6 0) + (property "LCSC" "" (at 151.13 101.6 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MyComment" "DNP" (at 154.94 103.505 90) + (property "MyComment" "DNP" (at 155.575 103.505 90) (effects (font (size 1.27 1.27))) ) (pin "1" (uuid 90bf2bd0-f7db-42af-a21c-12ce77b70dd6)) @@ -847,19 +847,19 @@ ) ) - (symbol (lib_id "power:GND") (at 135.255 107.95 0) (unit 1) + (symbol (lib_id "power:GND") (at 135.89 107.95 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 95895ffd-4330-4c63-aa8a-80105ad94072) - (property "Reference" "#PWR0106" (at 135.255 114.3 0) + (property "Reference" "#PWR0106" (at 135.89 114.3 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 135.382 112.3442 0) + (property "Value" "GND" (at 136.017 112.3442 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Footprint" "" (at 135.255 107.95 0) + (property "Footprint" "" (at 135.89 107.95 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 135.255 107.95 0) + (property "Datasheet" "" (at 135.89 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid d3c25891-3308-4e1a-81a3-920c152e8483)) @@ -872,19 +872,19 @@ ) ) - (symbol (lib_id "power:GND") (at 150.495 107.95 0) (unit 1) + (symbol (lib_id "power:GND") (at 151.13 107.95 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 9698fc08-cdf1-4fc7-9d57-c3a6d32193ad) - (property "Reference" "#PWR0107" (at 150.495 114.3 0) + (property "Reference" "#PWR0107" (at 151.13 114.3 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 150.622 112.3442 0) + (property "Value" "GND" (at 151.257 112.3442 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Footprint" "" (at 150.495 107.95 0) + (property "Footprint" "" (at 151.13 107.95 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 150.495 107.95 0) + (property "Datasheet" "" (at 151.13 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 397fe221-b63c-4a51-aaef-a5ee5bab321d)) diff --git a/hellen-one b/hellen-one index a2fc551..3020eeb 160000 --- a/hellen-one +++ b/hellen-one @@ -1 +1 @@ -Subproject commit a2fc551d23b8aded27ae237195730a180d6b6276 +Subproject commit 3020eeb07783af88c57f25e6a97112e57398422c diff --git a/uaefi.kicad_pcb b/uaefi.kicad_pcb index e247781..34cb13e 100644 --- a/uaefi.kicad_pcb +++ b/uaefi.kicad_pcb @@ -5014,7 +5014,7 @@ (stroke (width 0.2) (type solid)) (layer "F.SilkS") (tstamp 82e2d4a5-cf84-4e1c-a182-f898c7838f71)) (fp_line (start 6.35 13.425) (end 6.35 12.495) (stroke (width 0.2) (type solid)) (layer "F.SilkS") (tstamp fdffa37e-9f9d-44b5-ba02-f5193a2ca28c)) - (fp_circle (center -8 -6.5) (end -7.9 -6.5) + (fp_circle (center -6.818274 -7.161298) (end -6.718274 -7.161298) (stroke (width 0.2) (type solid)) (fill none) (layer "F.SilkS") (tstamp a014e265-f3ac-40d8-9747-fd11779b2414)) (fp_poly (pts @@ -5050,7 +5050,7 @@ (stroke (width 0.127) (type solid)) (layer "F.Fab") (tstamp 10d3c120-05ca-45fe-993c-4a2d728e3c7e)) (fp_line (start 6.35 13.425) (end -6.35 13.425) (stroke (width 0.127) (type solid)) (layer "F.Fab") (tstamp 69db0604-54d3-4b81-9147-b2d7f9d7eb78)) - (fp_circle (center -8 -6.5) (end -7.9 -6.5) + (fp_circle (center -6.818274 -7.161298) (end -6.718274 -7.161298) (stroke (width 0.2) (type solid)) (fill none) (layer "F.Fab") (tstamp 325fba07-7d82-45cb-908d-b08b7e71965d)) (pad "1" smd rect (at -6.35 -6.325 180) (size 1.3 1) (layers "F.Cu" "F.Paste" "F.Mask") (net 160 "Net-(M6-UART2_RX_(PD6))") (pinfunction "TXD") (pintype "output") (tstamp 19b1db92-d6fc-4b30-96f5-03834aa53e8d)) @@ -7611,7 +7611,7 @@ (property "Sheetname" "MAP") (property "ki_description" "Capacitor") (path "/7f618b1f-fe11-49db-a473-d0b521b1fa4f/d1e99562-e6a6-4a55-97b6-342c86e3a62a") - (fp_text reference "C27" (at -1.3 -1.8 90 unlocked) (layer "B.SilkS") + (fp_text reference "C27" (at -3.95 -0.5 90 unlocked) (layer "B.SilkS") (effects (font (size 0.820001 0.820001) (thickness 0.17)) (justify left bottom mirror)) (tstamp db8338cd-ff80-425c-8f73-16dcdf986aa2) ) @@ -10442,6 +10442,8 @@ ) ) + (gr_rect (start 113.4 91.1) (end 129.35 105.1) + (stroke (width 0.15) (type solid)) (fill solid) (layer "B.SilkS") (tstamp b5355c91-bc9c-42f7-a086-759eed44c025)) (gr_line (start 96.5 106.2) (end 102.9 106.2) (stroke (width 0.15) (type default)) (layer "F.SilkS") (tstamp 0dbdfa62-b92e-4a62-b176-5644a426454a)) (gr_line (start 96.5 108.8) (end 102.9 108.8) @@ -10470,84 +10472,282 @@ (stroke (width 0.15) (type default)) (layer "F.SilkS") (tstamp f4b5f6e4-858e-453a-8c79-d332a58e45ef)) (gr_rect (start 50 60) (end 150 160) (stroke (width 0.1) (type default)) (fill none) (layer "Edge.Cuts") (tstamp ae29df1f-f0b3-4e10-91ec-4f194f8729c3)) + (gr_text "GND" (at 90.05 65.65 90) (layer "B.SilkS") (tstamp 12a33dc2-0e67-47cd-8350-8e4a20e7fdac) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "GND" (at 55.7 125.75) (layer "B.SilkS") (tstamp 179f8217-414a-4c1c-8cd9-a0437c9cdc25) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "18" (at 64.8 78.9) (layer "B.SilkS") (tstamp 1c8293e7-2fd5-4760-96cf-dcc8f58b4edd) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "HALL3" (at 85.95 64.95 90) (layer "B.SilkS") (tstamp 1cff951e-3d88-4c47-a49f-16b2f8583ed2) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "5" (at 67.4 134.2) (layer "B.SilkS") (tstamp 1d265a05-e397-47bc-b17d-0f4a62eba650) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "DC2+" (at 67.25 131.9) (layer "B.SilkS") (tstamp 1df6c5cc-917c-4c57-891e-ebd2c2b42405) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "INJ2" (at 61.65 99.9) (layer "B.SilkS") (tstamp 1fdec1be-c05c-4446-986d-a0fb573b3594) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "VR1+" (at 89.95 78.85 90) (layer "B.SilkS") (tstamp 21b2fadb-a0a7-4947-b85d-674ba89dcd6a) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "6" (at 132.5 89.1) (layer "B.SilkS") (tstamp 24c80649-d717-4a98-b880-49f22bb525b6) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "5V" (at 60.7 66.05 90) (layer "B.SilkS") (tstamp 25d8e42a-9aab-46c9-be79-e834d29235f1) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "10" (at 67.810761 115.044619) (layer "B.SilkS") (tstamp 311341c0-76d5-422b-bceb-d8f03fb62592) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "GND" (at 56.05 123.1) (layer "B.SilkS") (tstamp 31e56531-dccf-43d6-9ef9-be649ea58f40) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "LS4" (at 67.05 91.6 90) (layer "B.SilkS") (tstamp 34ee1223-cf9c-4c55-b1a3-16bb58a815d9) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "BTN1" (at 114.65 65.5 90) (layer "B.SilkS") (tstamp 3a93bc46-359a-4a7e-bcbd-a3edb7090ef1) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "9" (at 61.2 79.6) (layer "B.SilkS") (tstamp 3d90e5be-70c8-4ecf-b831-c835950867f8) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "VR2-" (at 85.95 78.9 90) (layer "B.SilkS") (tstamp 40795bf1-9745-49ef-a642-43a01a22d93a) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "11" (at 60.6 77.6) (layer "B.SilkS") (tstamp 447a6db0-64a1-43ca-b284-9741920153d3) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "HALL1" (at 77.55 65.05 90) (layer "B.SilkS") (tstamp 490c09c2-cb36-4f5f-98ff-702338ec0faa) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "4" (at 56.5 121.6) (layer "B.SilkS") (tstamp 493e02f4-5c3a-440b-8f0b-0b2e45b3a58c) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (gr_text "B" (at 51.499998 76) (layer "B.SilkS") (tstamp 49b5cbd6-a155-46ec-afb5-54b26cd5ece0) (effects (font (size 3 3) (thickness 0.45)) (justify mirror)) ) + (gr_text "Heater" (at 144.45 87.55) (layer "B.SilkS") (tstamp 4b202dcd-d9ba-4a5d-b5d1-cc4501068c68) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "3" (at 143.3 89.2) (layer "B.SilkS") (tstamp 4e53338f-41d6-4deb-87be-8e823a3d6b35) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "LS3" (at 67.15 87.1 90) (layer "B.SilkS") (tstamp 50139f64-6851-4b20-a28b-7607c90df780) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "5V" (at 123 66.2 90) (layer "B.SilkS") (tstamp 50dbd93a-cc4e-4bdd-95ad-8fc9cc71cbfb) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "Always looking for C/C++/PHP/Java developers\nhttps://rusefi.com/s/mission" (at 131.9 90.8 90) (layer "B.SilkS") (tstamp 53fbe840-293b-46d6-a91f-af4f8b20a875) (effects (font (size 1.5 1.5) (thickness 0.25)) (justify left mirror)) ) - (gr_text "8" (at 139.7 66.5) (layer "B.SilkS") (tstamp 590e9f42-18f9-4514-b774-b7c1924c61ca) + (gr_text "8" (at 142.05 69.3) (layer "B.SilkS") (tstamp 590e9f42-18f9-4514-b774-b7c1924c61ca) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (gr_text "A" (at 51.499998 139.5) (layer "B.SilkS") (tstamp 5942ba85-42ff-4d3d-8767-1abfa73dd195) (effects (font (size 3 3) (thickness 0.45)) (justify mirror)) ) + (gr_text "VR1-" (at 94.35 78.85 90) (layer "B.SilkS") (tstamp 5badc073-0ce0-47cf-9385-5f2e66cc8845) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "L CAN H" (at 137.95 66.35) (layer "B.SilkS") (tstamp 5d189c1c-40fe-4c26-96be-ef62f5d19497) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "GNDA" (at 66.95 77.15 90) (layer "B.SilkS") (tstamp 5e3c5d7c-10ff-42f2-925c-42d702d480d4) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "16" (at 139.7 77.4) (layer "B.SilkS") (tstamp 5e53dd5d-a5ea-4389-8aa3-a70aa0d9fa8e) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (gr_text "1" (at 110.3 66.5) (layer "B.SilkS") (tstamp 6378c9a5-81b4-477e-8196-280c54eac96f) + (gr_text "AUX1" (at 110.6 65.5 90) (layer "B.SilkS") (tstamp 636d42e1-12db-462d-b4f7-ce848f3364b0) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (gr_text "9" (at 110.3 77.6) (layer "B.SilkS") (tstamp 76b553b7-f825-412f-a25a-c8473323a1e9) + (gr_text "1" (at 108.05 67.5) (layer "B.SilkS") (tstamp 6378c9a5-81b4-477e-8196-280c54eac96f) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "VR2+" (at 81.75 78.9 90) (layer "B.SilkS") (tstamp 6648eaf9-f7d1-44e9-842f-f5ddb76e2b57) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "Rtrim" (at 144.8 83.95) (layer "B.SilkS") (tstamp 684e2dd3-a8fa-4cae-ac20-9a3951d13ad3) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "AUX2" (at 69.05 65.05 90) (layer "B.SilkS") (tstamp 689f1eeb-931f-4870-9e39-752685b8a516) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "DC1+" (at 64.3 136.5) (layer "B.SilkS") (tstamp 6ba5e301-920a-4651-9d23-e43e36c1d61c) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "TPS2" (at 75.25 77.2 90) (layer "B.SilkS") (tstamp 6d2cd692-0702-439d-ad4d-351881789194) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "IGN6" (at 67.55 116.9) (layer "B.SilkS") (tstamp 70093a8e-a391-4748-badd-65c276680b58) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "12V" (at 67.75 123.35) (layer "B.SilkS") (tstamp 73ad4ecc-261c-41f0-9c25-6ee0dd9a5178) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "9" (at 108.2 74.95) (layer "B.SilkS") (tstamp 76b553b7-f825-412f-a25a-c8473323a1e9) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (gr_text "20" (at 98.5 77.8) (layer "B.SilkS") (tstamp 773739e2-28eb-4e80-bab6-c7f8b9bc4823) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "Vm" (at 132.65 87.5) (layer "B.SilkS") (tstamp 7946d881-4c34-4ed0-9dfc-63be6ea3516d) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "GNDA" (at 118.9 78.75 90) (layer "B.SilkS") (tstamp 7cb7ed37-17ea-476c-a09c-0600da2c8686) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "DC2-" (at 55.85 131.9) (layer "B.SilkS") (tstamp 7e395692-2a56-42cf-ab4d-90acfea61dab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "1" (at 56.5 134.3) (layer "B.SilkS") (tstamp 7ec2367f-77d4-488f-a45e-e34e8420aca4) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "TPS1" (at 126.05 78.65 90) (layer "B.SilkS") (tstamp 7f222c27-4a6a-4a2a-9445-d4723ba3736a) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "BTN3" (at 94.3 65.05 90) (layer "B.SilkS") (tstamp 8028b521-f4d0-4b26-bc44-6a1affe25880) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "E" (at 148.499998 76) (layer "B.SilkS") (tstamp 83ebe686-ca34-48dc-8196-cf8f084b3ab1) (effects (font (size 3 3) (thickness 0.45)) (justify mirror)) ) + (gr_text "INJ1" (at 61.55 95.7) (layer "B.SilkS") (tstamp 8c00889a-5a09-4268-97ad-36f4d83eea1c) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "MAP" (at 110.9 78.55 90) (layer "B.SilkS") (tstamp 8ef49c2f-2a9a-422f-ad43-b8af1d7b950b) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "INJ5" (at 61.6 112.55) (layer "B.SilkS") (tstamp 8fbe2343-373a-4336-ab99-fe354a80a3ff) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "1" (at 143.3 80.8) (layer "B.SilkS") (tstamp 91248f83-19e4-41c1-8189-5dd6df9470d7) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "IGN3" (at 67.9 108) (layer "B.SilkS") (tstamp 95cc71c9-8191-46d3-a5b7-8f92292f45c3) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "Ip" (at 132.75 83.5) (layer "B.SilkS") (tstamp 9a97a95f-312c-4259-b541-d7cb6771f933) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "12V" (at 142.35 78.45) (layer "B.SilkS") (tstamp 9f162799-6a82-4c66-8faa-a774d0043291) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "IGN2" (at 67.95 99.7) (layer "B.SilkS") (tstamp a009d90b-f33b-42d5-9dda-30de1f34accb) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "5V" (at 64.9 65.95 90) (layer "B.SilkS") (tstamp a93fd6ae-06d7-40e7-8428-fe3a93c31aae) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "IAT" (at 137.05 77.5 90) (layer "B.SilkS") (tstamp aaf64711-b3ca-4a0c-9b96-0f7847130803) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "5V" (at 118.9 66.3 90) (layer "B.SilkS") (tstamp b72d72b0-3ace-45fe-bd61-cc376b248f17) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "LSW2" (at 61.45 87.45) (layer "B.SilkS") (tstamp b7988b89-10af-4399-9ec4-0dc7a6dd8299) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "8" (at 67.4 121.6) (layer "B.SilkS") (tstamp b8821bb3-93fa-4894-aa4e-52cf4ee0800d) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (gr_text "1" (at 60.6 66.6) (layer "B.SilkS") (tstamp c326ab49-4316-47ec-a2a6-ee64ceed1eab) + (gr_text "Un" (at 132.8 78.75) (layer "B.SilkS") (tstamp be72dc2a-db43-48bb-99de-8a0468e11c92) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "CLT" (at 142.2 74.8 90) (layer "B.SilkS") (tstamp c2aeff29-a97e-4aeb-9bc0-961f9c092dcc) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "INJ6" (at 55.45 115.4) (layer "B.SilkS") (tstamp c2e06ace-5a46-4244-864f-a7dccb812fc1) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "1" (at 58.4 67.55) (layer "B.SilkS") (tstamp c326ab49-4316-47ec-a2a6-ee64ceed1eab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "VIGN" (at 67.55 127.8) (layer "B.SilkS") (tstamp c3c3a10b-19f9-4284-9ba9-b30d7863f5f2) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "GNDA" (at 123.05 78.75 90) (layer "B.SilkS") (tstamp c3f03801-aba4-4797-9cc6-540a0f453725) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "KNOCK" (at 131.15 79.35 90) (layer "B.SilkS") (tstamp c54f053b-c526-4ecb-b598-9f9b5d75dd4a) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "IGN5" (at 67.7 104.15) (layer "B.SilkS") (tstamp ccdbcc81-26d6-44fd-b96e-08d9e43d1c19) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "PPS1" (at 131.45 65.35 90) (layer "B.SilkS") (tstamp cfa8d3a3-7d99-4d7d-8466-ad9dc50ea329) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "IGN1" (at 67.55 95.75) (layer "B.SilkS") (tstamp d139a2af-128d-46cb-8441-d6c7e3d6be4b) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "LS1" (at 61.3 91.65) (layer "B.SilkS") (tstamp d13ae767-b757-41d3-8e83-512a0026f454) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (gr_text "10" (at 98.4 66.3) (layer "B.SilkS") (tstamp d2baef38-d772-4690-ac22-30d2170e8af7) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (gr_text "1" (at 56.7 114.9) (layer "B.SilkS") (tstamp ebdfd80c-b4d2-4415-89b4-e1458856832a) + (gr_text "LSW3" (at 61.5 83.25) (layer "B.SilkS") (tstamp d3558e95-e0e6-49a6-bc0c-bf8692248073) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "LS2" (at 67.05 83.15 90) (layer "B.SilkS") (tstamp d641e940-204d-4c08-8f7d-a3cc7531f23e) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "+\nEGT\n-" (at 100.55 72.05) (layer "B.SilkS") (tstamp d71acb93-8e17-4ad6-857f-f89ba725c142) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "GNDA" (at 62.75 77.2 90) (layer "B.SilkS") (tstamp d73907bd-0dcd-48cd-922a-56b1aba3c85e) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "IGN4" (at 67.85 112.25) (layer "B.SilkS") (tstamp da26a9e2-c645-4920-ab93-039802225bbf) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "FLEX" (at 127.2 65.45 90) (layer "B.SilkS") (tstamp e200348e-2633-4892-a256-b459a62bbd08) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "AUX3" (at 79.2 77.85 90) (layer "B.SilkS") (tstamp e70c33e6-1dac-4194-a05a-3c2d4e1a41de) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "HALL2" (at 81.65 64.95 90) (layer "B.SilkS") (tstamp eb941645-463d-40e3-8c11-6cdf052ec599) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "1" (at 58.35 116.9) (layer "B.SilkS") (tstamp ebdfd80c-b4d2-4415-89b4-e1458856832a) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (gr_text "C" (at 55.499998 69) (layer "B.SilkS") (tstamp eeb3d13c-5f73-48dc-96d4-f2deff4f1646) (effects (font (size 3 3) (thickness 0.45)) (justify mirror)) ) + (gr_text "DC1-" (at 58.95 136.45) (layer "B.SilkS") (tstamp f0c81542-0dee-4afc-af5b-1458726fddf6) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "INJ3" (at 61.65 104.25) (layer "B.SilkS") (tstamp f0f1b798-ba39-4186-b915-1b32c0b8ea35) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "D" (at 105.499998 68.5) (layer "B.SilkS") (tstamp f211cdd8-3e4e-49c0-bf5d-a0d87ff28271) (effects (font (size 3 3) (thickness 0.45)) (justify mirror)) ) + (gr_text "INJ4" (at 61.6 108.35) (layer "B.SilkS") (tstamp f3760bef-b67c-4b9f-b953-c00913ea46f2) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "GNDA" (at 71.05 77.45 90) (layer "B.SilkS") (tstamp f54c87b0-e112-4dab-a948-008824b18fc4) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "4" (at 132.6 80.8) (layer "B.SilkS") (tstamp f5859bad-96b6-4b76-9082-e181d42a9004) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "BTN2" (at 114.65 78.8 90) (layer "B.SilkS") (tstamp f8ec4583-4317-4968-9c9c-8c7fe52040c8) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (gr_text "PPS2" (at 73.25 65.05 90) (layer "B.SilkS") (tstamp f9e224b0-598c-44f1-b808-b486842b3010) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "H" (at 86.8 103.3) (layer "F.SilkS") (tstamp 06978b02-6e56-417b-a611-27de8cbce096) (effects (font (size 1 1) (thickness 0.15))) ) @@ -12577,7 +12777,6 @@ (xy 150 60) (xy 150 160) (xy 50 160) - (xy 50 160) ) ) (filled_polygon diff --git a/uaefi.kicad_pro b/uaefi.kicad_pro index b59f677..55e38cf 100644 --- a/uaefi.kicad_pro +++ b/uaefi.kicad_pro @@ -56,7 +56,48 @@ "width": 0.0 } ], - "drc_exclusions": [], + "drc_exclusions": [ + "lib_footprint_mismatch|142650000|138875000|9581275e-c243-4ca9-b33c-876074d61c10|00000000-0000-0000-0000-000000000000", + "silk_edge_clearance|101210000|60000000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|7130a717-7f18-48d1-bc5a-5c50677ebd09", + "silk_edge_clearance|107490000|60000000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|778aeb34-a06a-4585-be67-caf3ef060a62", + "silk_edge_clearance|142510000|60000000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|21d01516-970b-4e37-9671-f7f352346017", + "silk_edge_clearance|150000000|77990000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|d479817b-3f28-4d74-939f-3f08a4688a7e", + "silk_edge_clearance|150000000|92010000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|12beffb3-20a1-44f5-a8a2-272b914ae733", + "silk_edge_clearance|50000000|117610000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|9dbe4624-1d9f-41f3-96a0-137362b3526a", + "silk_edge_clearance|50000000|118790000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|d9750c42-326c-4659-9759-638c5f14d22e", + "silk_edge_clearance|50000000|137010000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|73f2086e-da36-44db-a267-7fc6a5a6a4fd", + "silk_edge_clearance|50000000|78390000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|15e72c37-9fc1-4b8e-a7b2-18e27b2e63cd", + "silk_edge_clearance|57790000|60000000|ae29df1f-f0b3-4e10-91ec-4f194f8729c3|195ad43f-1cb3-4b4d-bc1b-f0fd21bcf599", + "silk_over_copper|136299773|152787479|82e2d4a5-cf84-4e1c-a182-f898c7838f71|00000000-0000-0000-0000-000000000000", + "silk_over_copper|136299773|152787479|c69ee75c-94d0-4c1b-8475-3a4e3979c5ec|00000000-0000-0000-0000-000000000000", + "silk_over_copper|142470576|138989942|6ce34660-a78c-474e-8cb3-12e8b18f398c|00000000-0000-0000-0000-000000000000", + "silk_over_copper|142470576|138989942|87a1662b-e6c7-4d63-b9cf-2597da7ca38a|00000000-0000-0000-0000-000000000000", + "silk_over_copper|142470576|138989942|f7ba2335-a287-4a0e-90f9-00657c0c3112|00000000-0000-0000-0000-000000000000", + "silk_over_copper|149000000|146020000|cf41a5a8-3f5c-467f-bde5-66c4f528a935|00000000-0000-0000-0000-000000000000", + "silk_over_copper|80809883|116540114|873892bd-85ce-4702-aee6-65e496e89c74|00000000-0000-0000-0000-000000000000", + "silk_over_copper|80990123|116540114|b534116f-5f31-46a5-bc98-c00d45944677|00000000-0000-0000-0000-000000000000", + "silk_overlap|127074999|87075000|eabebc43-6e84-40eb-a78a-0b978308633a|5393a8a2-3762-4135-ac99-6cd32ab56837", + "silk_overlap|69550000|100950000|83cd7c35-db1a-47d5-9755-b035c327271e|f2edb7e6-d0cc-47f3-9524-3e3a1fa23127", + "silk_overlap|69550000|107950000|33af95a5-9057-43ac-a9e0-d3daa22bf893|59fb5ea4-864e-47b1-b818-addf1207a832", + "silk_overlap|69550000|115050000|352621a0-08bb-4aad-83d3-e52235967db8|e083f8d4-8c01-485d-9d12-6f6d975646f2", + "silk_overlap|69550000|121950000|e73adb92-f480-4e1e-b5f4-743dc99ab7cd|1de84c0c-0b2a-45c3-a139-ce3e39e5cdc9", + "silk_overlap|69550000|129050000|0fdb12bf-a5c6-431d-8062-d522223bdf13|efc8a3a5-08be-4bcf-9ae1-654bca735163", + "silk_overlap|75970000|100950000|930eeb70-ecb3-4bd7-a584-0e154b605b83|0958945d-4b89-4fe6-a74c-794354273e18", + "silk_overlap|75970000|100950000|930eeb70-ecb3-4bd7-a584-0e154b605b83|f2edb7e6-d0cc-47f3-9524-3e3a1fa23127", + "silk_overlap|75970000|101050000|0958945d-4b89-4fe6-a74c-794354273e18|83cd7c35-db1a-47d5-9755-b035c327271e", + "silk_overlap|75970000|107950000|0b0a0f8e-0139-4969-bfa6-b2300ca79f89|442afd94-1dd6-4cb4-8a9f-8179e93f33ce", + "silk_overlap|75970000|107950000|0b0a0f8e-0139-4969-bfa6-b2300ca79f89|59fb5ea4-864e-47b1-b818-addf1207a832", + "silk_overlap|75970000|107950000|33af95a5-9057-43ac-a9e0-d3daa22bf893|442afd94-1dd6-4cb4-8a9f-8179e93f33ce", + "silk_overlap|75970000|115050000|352621a0-08bb-4aad-83d3-e52235967db8|e4e6df28-3eb5-484e-b728-f35bfc252bc3", + "silk_overlap|75970000|115050000|8d52f182-2fde-4473-8c30-9ef77d3796a5|e083f8d4-8c01-485d-9d12-6f6d975646f2", + "silk_overlap|75970000|115050000|8d52f182-2fde-4473-8c30-9ef77d3796a5|e4e6df28-3eb5-484e-b728-f35bfc252bc3", + "silk_overlap|75970000|121950000|57055baa-3c94-4b88-bcbd-ef45564fb89a|1de84c0c-0b2a-45c3-a139-ce3e39e5cdc9", + "silk_overlap|75970000|121950000|57055baa-3c94-4b88-bcbd-ef45564fb89a|4fa0cbf3-3933-48d6-ae99-2f9bfb8d7511", + "silk_overlap|75970000|121950000|e73adb92-f480-4e1e-b5f4-743dc99ab7cd|4fa0cbf3-3933-48d6-ae99-2f9bfb8d7511", + "silk_overlap|75970000|128950000|efc8a3a5-08be-4bcf-9ae1-654bca735163|01d14915-d1b9-4daa-80b6-5f0544cf31a8", + "silk_overlap|75970000|129050000|01d14915-d1b9-4daa-80b6-5f0544cf31a8|7dd8f65a-0873-42e0-9f88-006adcb569f3", + "silk_overlap|75970000|129050000|0fdb12bf-a5c6-431d-8062-d522223bdf13|7dd8f65a-0873-42e0-9f88-006adcb569f3" + ], "meta": { "version": 2 }, diff --git a/uaefi.kicad_sch b/uaefi.kicad_sch index fb1ebde..75692c2 100644 --- a/uaefi.kicad_sch +++ b/uaefi.kicad_sch @@ -2039,51 +2039,95 @@ (symbol "Module{colon}mega-mcu100/0.2_1_0" (polyline (pts - (xy 38.1 -144.78) - (xy 36.83 -144.78) - (xy 36.83 -149.86) - (xy 38.1 -149.86) + (xy 26.67 -97.79) + (xy 25.908 -96.52) + ) + (stroke (width 0) (type default)) + (fill (type none)) + ) + (polyline + (pts + (xy 26.67 -97.79) + (xy 27.432 -96.52) + ) + (stroke (width 0) (type default)) + (fill (type none)) + ) + (polyline + (pts + (xy 26.67 -97.79) + (xy 26.67 -34.29) + (xy 54.61 -34.29) + ) + (stroke (width 0) (type dash)) + (fill (type none)) + ) + (polyline + (pts + (xy 42.672 -147.32) + (xy 43.942 -147.32) + (xy 43.942 -147.32) + (xy 43.942 -147.32) ) (stroke (width 0) (type solid) (color 7 55 99 1)) (fill (type none)) ) (polyline (pts - (xy 52.07 -152.4) - (xy 50.8 -152.4) - (xy 50.8 -154.94) - (xy 52.07 -154.94) + (xy 43.942 -144.78) + (xy 42.672 -144.78) + (xy 42.672 -149.86) + (xy 43.942 -149.86) ) (stroke (width 0) (type solid) (color 7 55 99 1)) (fill (type none)) ) (polyline (pts - (xy 54.61 -139.7) - (xy 53.34 -139.7) - (xy 53.34 -142.24) - (xy 54.61 -142.24) + (xy 55.372 -152.4) + (xy 54.102 -152.4) + (xy 54.102 -154.94) + (xy 55.372 -154.94) ) (stroke (width 0) (type solid) (color 7 55 99 1)) (fill (type none)) ) - (rectangle (start 60.96 2.54) (end 7.62 -170.18) + (polyline + (pts + (xy 56.642 -139.7) + (xy 55.372 -139.7) + (xy 55.372 -142.24) + (xy 56.642 -142.24) + ) + (stroke (width 0) (type solid) (color 7 55 99 1)) + (fill (type none)) + ) + (rectangle (start 7.62 2.54) (end 60.96 -170.18) (stroke (width 0) (type solid)) (fill (type background)) ) - (text "Connected" (at 28.448 -147.32 0) + (text "Barometer\non this I2C bus" (at 31.75 -44.45 0) + (effects (font (size 1.016 1.016)) (justify left)) + ) + (text "Connected" (at 34.29 -147.32 0) (effects (font (size 1.016 1.016) italic) (justify left)) ) - (text "Connected" (at 42.418 -153.67 0) + (text "Connected" (at 45.72 -153.67 0) (effects (font (size 1.016 1.016) italic) (justify left)) ) - (text "Connected" (at 44.958 -140.97 0) + (text "Connected" (at 46.99 -140.97 0) (effects (font (size 1.016 1.016) italic) (justify left)) ) - (text "F40x does not" (at 48.26 -58.42 0) + (text "F40x does not\nhave UART8" (at 31.75 -54.61 0) (effects (font (size 1.016 1.016)) (justify left)) ) - (text "have UART8" (at 48.26 -60.96 0) + (text "Internal\nbuttons" (at 46.99 -102.87 0) + (effects (font (size 1.016 1.016)) (justify left)) + ) + (text "Internal TC2030\nconnector" (at 33.02 -91.44 0) + (effects (font (size 1.016 1.016)) (justify left)) + ) + (text "uSD card and accelerometer \non SPI1 bus" (at 20.32 -3.81 0) (effects (font (size 1.016 1.016)) (justify left)) ) (pin passive line (at 68.58 -144.78 180) (length 7.62) @@ -2572,6 +2616,9 @@ (stroke (width 0) (type default)) (fill (type background)) ) + (text "Internal TC2030\nconnector" (at 7.1222 -16.2666 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) (pin passive line (at 40.64 -17.78 180) (length 7.62) (name "LSU_Un" (effects (font (size 1.27 1.27)))) (number "E1" (effects (font (size 1.27 1.27)))) @@ -3368,12 +3415,12 @@ ) ) + (junction (at 57.15 196.85) (diameter 0) (color 0 0 0 0) + (uuid 0a9cf346-d6fc-4823-a2c4-7d5256346f48) + ) (junction (at 34.29 397.51) (diameter 0) (color 0 0 0 0) (uuid 144a27c3-ef08-4465-a938-f2fad6bbd86c) ) - (junction (at 53.34 194.31) (diameter 0) (color 0 0 0 0) - (uuid 1b87c6f2-5c39-48c2-9dec-d12216c9ec78) - ) (junction (at 167.64 256.54) (diameter 0) (color 0 0 0 0) (uuid 1fd31792-02f6-404a-bca1-815e8ac21de7) ) @@ -3428,6 +3475,9 @@ (junction (at 255.27 138.43) (diameter 0) (color 0 0 0 0) (uuid 84c448b3-43a5-40ca-a302-7219b62d90a8) ) + (junction (at 27.94 182.88) (diameter 0) (color 0 0 0 0) + (uuid 89fe15e4-3fa0-4bea-b69b-469299993a22) + ) (junction (at 67.31 238.76) (diameter 0) (color 0 0 0 0) (uuid a7ed4847-af60-4657-98f6-205dba39f7a2) ) @@ -3452,6 +3502,9 @@ (junction (at 241.3 330.2) (diameter 0) (color 0 0 0 0) (uuid bf1809a2-a5d9-41e7-bb97-84dff48c6a42) ) + (junction (at 55.88 194.31) (diameter 0) (color 0 0 0 0) + (uuid c1096a37-7eb9-431f-9b82-2c5e49e682fb) + ) (junction (at 48.26 397.51) (diameter 0) (color 0 0 0 0) (uuid c1bb4326-987b-431f-a940-5fc9c91bf80e) ) @@ -3536,11 +3589,11 @@ (stroke (width 0) (type default)) (uuid 0646bbee-5619-4b91-95cb-771bba88d30b) ) - (bus_entry (at 20.32 172.72) (size -2.54 2.54) + (bus_entry (at 19.05 172.72) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid 0944aada-b45a-4918-86bc-483f21d44c5e) ) - (bus_entry (at 50.8 182.88) (size 2.54 2.54) + (bus_entry (at 54.61 182.88) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid 0a5e31ee-3c0c-4977-b85a-4e5fd571ff13) ) @@ -3572,7 +3625,7 @@ (stroke (width 0) (type default)) (uuid 1b8a0287-4346-4738-8d28-a63a4ec0e428) ) - (bus_entry (at 20.32 175.26) (size -2.54 2.54) + (bus_entry (at 17.78 175.26) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid 202e3328-a4a4-4c3f-a536-36b5e4f94737) ) @@ -3636,7 +3689,7 @@ (stroke (width 0) (type default)) (uuid 45b6cd69-900f-457a-af19-14623bcf0c3b) ) - (bus_entry (at 20.32 185.42) (size -2.54 2.54) + (bus_entry (at 19.05 185.42) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid 47038e91-b749-42fa-b23c-03d3b57262fb) ) @@ -3700,7 +3753,7 @@ (stroke (width 0) (type default)) (uuid 66194687-6a73-4360-afc2-8bcd4eb5bbff) ) - (bus_entry (at 16.51 228.6) (size -2.54 2.54) + (bus_entry (at 19.05 228.6) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid 670c2ca4-903a-4f98-a20d-3d44ffd4bca9) ) @@ -3712,7 +3765,7 @@ (stroke (width 0) (type default)) (uuid 6a1c9aa1-6a11-4401-9d9e-2edd581ccef2) ) - (bus_entry (at 50.8 185.42) (size 2.54 2.54) + (bus_entry (at 53.34 185.42) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid 6b65be88-04ff-4e49-ae42-19660ef59b09) ) @@ -3732,7 +3785,7 @@ (stroke (width 0) (type default)) (uuid 6fa615fe-a2c1-44d1-9dbf-23e003dde80c) ) - (bus_entry (at 16.51 231.14) (size -2.54 2.54) + (bus_entry (at 19.05 231.14) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid 7103a678-a303-4313-99d1-be5cc3f5a27e) ) @@ -3756,7 +3809,7 @@ (stroke (width 0) (type default)) (uuid 76ca0fd0-b924-427e-a27a-eed565b87c98) ) - (bus_entry (at 50.8 175.26) (size 2.54 2.54) + (bus_entry (at 53.34 175.26) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid 7709f3d0-f28d-4094-8c08-c18b934c3ad4) ) @@ -3776,7 +3829,7 @@ (stroke (width 0) (type default)) (uuid 86ab1d77-6e5f-4555-b5c5-da6596048154) ) - (bus_entry (at 50.8 167.64) (size 2.54 2.54) + (bus_entry (at 53.34 167.64) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid 86d2ebc9-8ee7-4c12-8df0-41941036b43e) ) @@ -3784,6 +3837,10 @@ (stroke (width 0) (type default)) (uuid 88d4a32f-2bf4-4f75-b2e3-d95cfb7ad47a) ) + (bus_entry (at 53.34 228.6) (size 2.54 2.54) + (stroke (width 0) (type default)) + (uuid 896039fa-4b4a-4b19-8d31-910cd5ba59dc) + ) (bus_entry (at 52.07 142.24) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid 8a3ecca2-ae7a-48fc-99f7-4d56e8f0337c) @@ -3804,6 +3861,10 @@ (stroke (width 0) (type default)) (uuid 93ce3acc-dd47-4560-ad8f-061dfe15b993) ) + (bus_entry (at 16.51 215.9) (size -2.54 2.54) + (stroke (width 0) (type default)) + (uuid 9e1b28f5-8eaf-4df9-a29f-0868b767449e) + ) (bus_entry (at 281.94 114.3) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid 9e1db05e-dfd3-4485-aab7-93e19aeaf00d) @@ -3836,7 +3897,7 @@ (stroke (width 0) (type default)) (uuid b011967f-6db1-41df-8fbd-fa447e03506c) ) - (bus_entry (at 50.8 170.18) (size 2.54 2.54) + (bus_entry (at 53.34 170.18) (size 2.54 2.54) (stroke (width 0) (type default)) (uuid b1c8eebc-d216-4649-9031-cba7a4801841) ) @@ -3884,7 +3945,7 @@ (stroke (width 0) (type default)) (uuid c38ae205-a590-4749-a5de-145b8257d4b6) ) - (bus_entry (at 20.32 182.88) (size -2.54 2.54) + (bus_entry (at 17.78 182.88) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid c4c87759-3702-4b9a-8809-43e13a193610) ) @@ -3944,6 +4005,10 @@ (stroke (width 0) (type default)) (uuid e64f2aac-69e5-4ed9-a99b-23226793d731) ) + (bus_entry (at 53.34 226.06) (size 2.54 2.54) + (stroke (width 0) (type default)) + (uuid e682518c-3c15-4c39-a4b5-0fd480ef0498) + ) (bus_entry (at 118.11 90.17) (size -2.54 2.54) (stroke (width 0) (type default)) (uuid e8d517e3-6795-4799-9c96-4ac35a6118de) @@ -4001,7 +4066,7 @@ (stroke (width 0) (type default)) (uuid 021f8ebd-45d2-4d2f-92f9-06e82b463369) ) - (bus (pts (xy 53.34 185.42) (xy 53.34 187.96)) + (bus (pts (xy 55.88 177.8) (xy 55.88 187.96)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid 02408a46-4d8f-42a3-a7aa-aac890031bce) ) @@ -4022,7 +4087,7 @@ (stroke (width 0) (type default)) (uuid 033a4a42-bf4c-4e79-9ce2-4f5c326f91e9) ) - (bus (pts (xy 53.34 170.18) (xy 53.34 172.72)) + (bus (pts (xy 55.88 170.18) (xy 55.88 172.72)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid 03645c32-ab4a-46ac-a801-d80c95665e61) ) @@ -4031,10 +4096,6 @@ (uuid 04503e88-bc86-4c60-9a76-b91234436d40) ) - (wire (pts (xy 20.32 218.44) (xy 27.94 218.44)) - (stroke (width 0) (type default)) - (uuid 0503cda1-c72d-425a-a7e1-792467d80b29) - ) (wire (pts (xy 29.21 64.77) (xy 20.32 64.77)) (stroke (width 0) (type default)) (uuid 0513f4e6-5717-4024-98b8-79b9881d101c) @@ -4059,6 +4120,11 @@ (stroke (width 0) (type solid)) (uuid 077f8259-52af-49a7-9d0a-a2419e657d22) ) + (bus (pts (xy 15.24 185.42) (xy 15.24 196.85)) + (stroke (width 0) (type default) (color 194 194 0 1)) + (uuid 09323e40-6fa5-41fc-8ba9-44ce06789614) + ) + (wire (pts (xy 41.91 67.31) (xy 53.34 67.31)) (stroke (width 0) (type default)) (uuid 0a48489d-e721-46d1-8d7c-3dc9a03a8920) @@ -4072,10 +4138,6 @@ (uuid 0a837d20-eb1c-4fef-afdc-149d1ebdac42) ) - (wire (pts (xy 27.94 182.88) (xy 20.32 182.88)) - (stroke (width 0) (type default)) - (uuid 0ac2e514-3d97-4ae5-906c-1789e4671b22) - ) (wire (pts (xy 31.75 107.95) (xy 19.05 107.95)) (stroke (width 0) (type default)) (uuid 0bb2fd69-a44c-4f6c-979e-52ac0572fdda) @@ -4147,6 +4209,11 @@ (stroke (width 0) (type default)) (uuid 168e441d-3e31-429d-9ca3-136d6c3cdc15) ) + (bus (pts (xy 16.51 233.68) (xy 16.51 240.03)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid 171d5b1a-d76b-4dac-b7b4-2ff86fb58264) + ) + (wire (pts (xy 133.35 274.32) (xy 123.19 274.32)) (stroke (width 0) (type default)) (uuid 1731252d-0cdd-498d-8db9-2772b6d3dffd) @@ -4169,7 +4236,7 @@ (stroke (width 0) (type default)) (uuid 1a179bb5-254c-431e-88fd-35bf4acb6110) ) - (wire (pts (xy 40.64 185.42) (xy 50.8 185.42)) + (wire (pts (xy 40.64 185.42) (xy 53.34 185.42)) (stroke (width 0) (type default)) (uuid 1b026c55-b688-46c4-9465-b6e82b31c21e) ) @@ -4283,10 +4350,6 @@ (stroke (width 0) (type default)) (uuid 2c5a6a9a-96f5-4c3e-8689-b55f19f721e7) ) - (bus (pts (xy 17.78 175.26) (xy 17.78 177.8)) - (stroke (width 0) (type default) (color 255 0 255 1)) - (uuid 2c73712e-0f21-4eba-bc68-00ecdd2c22f1) - ) (bus (pts (xy 16.51 115.57) (xy 16.51 118.11)) (stroke (width 0) (type default) (color 255 153 0 1)) (uuid 2c7a1b6f-464e-4cda-82ed-247e73867abf) @@ -4330,6 +4393,10 @@ (stroke (width 0) (type default)) (uuid 2f4edacf-237d-4fcf-a162-6db4123219af) ) + (bus (pts (xy 15.24 177.8) (xy 15.24 185.42)) + (stroke (width 0) (type default) (color 194 194 0 1)) + (uuid 2ff46176-bb38-4457-8845-8b10aba6bbd4) + ) (bus (pts (xy 13.97 212.09) (xy 13.97 19.05)) (stroke (width 0) (type default)) (uuid 307feb9f-a5a5-4efd-abd9-849b4581204b) @@ -4356,7 +4423,7 @@ (stroke (width 0) (type default)) (uuid 33cdd9f3-659d-4e1f-b7fa-f5bdf8b2347d) ) - (wire (pts (xy 27.94 228.6) (xy 16.51 228.6)) + (wire (pts (xy 27.94 228.6) (xy 19.05 228.6)) (stroke (width 0) (type default)) (uuid 3687c7b7-467b-45d4-b68b-db6d4df09dde) ) @@ -4456,7 +4523,7 @@ (stroke (width 0) (type default)) (uuid 43242244-46e2-4c12-a0cb-bb475a7e6256) ) - (wire (pts (xy 40.64 170.18) (xy 50.8 170.18)) + (wire (pts (xy 40.64 170.18) (xy 53.34 170.18)) (stroke (width 0) (type default)) (uuid 4460aa91-8252-46c5-9257-c849d95f17cb) ) @@ -4593,6 +4660,10 @@ (stroke (width 0) (type default) (color 255 153 0 1)) (uuid 4d114f9f-f30f-4e58-8dee-78c57f6ecb94) ) + (bus (pts (xy 16.51 231.14) (xy 16.51 233.68)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid 4dd4466f-010f-4727-88a3-8e287d692dad) + ) (wire (pts (xy 248.92 160.02) (xy 254 160.02)) (stroke (width 0) (type default)) @@ -4729,10 +4800,6 @@ (stroke (width 0) (type default) (color 255 0 255 1)) (uuid 609f4a75-6d26-4ca2-a7fe-587960ad1265) ) - (bus (pts (xy 13.97 228.6) (xy 13.97 231.14)) - (stroke (width 0) (type default) (color 194 194 0 1)) - (uuid 60a9fac6-76b3-4540-894d-fbf0cc44cde7) - ) (bus (pts (xy 16.51 113.03) (xy 16.51 115.57)) (stroke (width 0) (type default) (color 255 153 0 1)) (uuid 60bf193b-47be-46ab-96f1-c252fd00bd42) @@ -4794,6 +4861,10 @@ (stroke (width 0) (type default)) (uuid 676d92d1-76c0-4675-a559-0b87d0599bf4) ) + (bus (pts (xy 55.88 240.03) (xy 16.51 240.03)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid 679205c3-10bf-409e-9158-15876dc81aa9) + ) (bus (pts (xy 166.37 196.85) (xy 166.37 228.6)) (stroke (width 0) (type default) (color 194 194 0 1)) (uuid 67d404f0-72ef-4bcf-9a0d-1274247af2eb) @@ -4839,7 +4910,7 @@ (stroke (width 0) (type default)) (uuid 6e099595-a889-4eaf-ba8e-8da163d26204) ) - (bus (pts (xy 17.78 187.96) (xy 17.78 194.31)) + (bus (pts (xy 16.51 187.96) (xy 16.51 194.31)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid 6e8418c9-1bd0-4924-bfc2-73e8340f279c) ) @@ -4848,7 +4919,7 @@ (uuid 700f6ef3-53bb-4947-abae-1d0f2b247b03) ) - (wire (pts (xy 27.94 215.9) (xy 19.05 215.9)) + (wire (pts (xy 27.94 215.9) (xy 16.51 215.9)) (stroke (width 0) (type default)) (uuid 702df376-ebf4-469b-8c29-22034047bf7a) ) @@ -4864,6 +4935,11 @@ (stroke (width 0) (type default)) (uuid 71ca4e95-708b-4a67-a7c6-d9f69f5044f8) ) + (bus (pts (xy 55.88 231.14) (xy 55.88 240.03)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid 721b2828-0895-44dc-be07-11c226f788cb) + ) + (wire (pts (xy 59.69 317.5) (xy 73.66 317.5)) (stroke (width 0) (type default)) (uuid 72c7bf91-d3d5-44ef-91c3-80f656236e04) @@ -4910,10 +4986,6 @@ (uuid 76eee346-d909-493d-aa45-fbff9d7a1720) ) - (wire (pts (xy 40.64 228.6) (xy 54.61 228.6)) - (stroke (width 0) (type default)) - (uuid 771ea1c6-9c06-4c66-b031-42f29a9361e8) - ) (wire (pts (xy 44.45 115.57) (xy 57.15 115.57)) (stroke (width 0) (type default)) (uuid 77614211-7ec0-43d0-9309-b8e4be5c575a) @@ -4931,7 +5003,7 @@ (stroke (width 0) (type default)) (uuid 79c97fc1-8f37-4032-b598-dab4bfa44a03) ) - (wire (pts (xy 50.8 173.99) (xy 59.69 173.99)) + (wire (pts (xy 53.34 173.99) (xy 59.69 173.99)) (stroke (width 0) (type default)) (uuid 7a3b68f8-587e-461e-bad0-f45f0a0af8aa) ) @@ -4985,7 +5057,7 @@ (uuid 7f8763fa-dcc8-4cf1-b6d6-0dd4e651d98a) ) - (wire (pts (xy 50.8 172.72) (xy 50.8 173.99)) + (wire (pts (xy 53.34 172.72) (xy 53.34 173.99)) (stroke (width 0) (type default)) (uuid 7fe7a569-0f05-407e-b634-39d15014c87b) ) @@ -4993,6 +5065,11 @@ (stroke (width 0) (type default) (color 255 153 0 1)) (uuid 807e474b-ba0c-43fe-ad8c-d4c296db1f7e) ) + + (wire (pts (xy 17.78 182.88) (xy 27.94 182.88)) + (stroke (width 0) (type default)) + (uuid 81d30c2d-38d6-4262-b1b6-ea43324ce74a) + ) (bus (pts (xy 220.98 285.75) (xy 220.98 299.72)) (stroke (width 0) (type default)) (uuid 8308cdc1-6a31-4e5e-a36c-aa8c6eaf60fb) @@ -5011,7 +5088,7 @@ (stroke (width 0) (type default)) (uuid 85ebdbc8-1b52-4e62-bad1-4cefce5e2522) ) - (wire (pts (xy 40.64 182.88) (xy 50.8 182.88)) + (wire (pts (xy 40.64 182.88) (xy 54.61 182.88)) (stroke (width 0) (type default)) (uuid 85f0bafc-90ec-4860-b4e3-fd03e178f05d) ) @@ -5023,20 +5100,32 @@ (stroke (width 0) (type default)) (uuid 886181d0-3905-4fd1-aa76-96eba8c0307b) ) + (bus (pts (xy 13.97 218.44) (xy 13.97 223.52)) + (stroke (width 0) (type default) (color 194 194 0 1)) + (uuid 89f082b3-e05b-4e8d-9713-0dd562b271e6) + ) (wire (pts (xy 34.29 391.16) (xy 38.1 391.16)) (stroke (width 0) (type default)) (uuid 8a34d746-84be-43b8-8174-8db457569f58) ) + (bus (pts (xy 55.88 194.31) (xy 93.98 194.31)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid 8a42ea4d-84fd-4a62-b60c-e8dc7de0247e) + ) (bus (pts (xy 284.48 40.64) (xy 284.48 116.84)) (stroke (width 0) (type default)) (uuid 8c7022cf-b13a-4110-9400-003859a22c73) ) - (wire (pts (xy 40.64 167.64) (xy 50.8 167.64)) + (wire (pts (xy 40.64 167.64) (xy 53.34 167.64)) (stroke (width 0) (type default)) (uuid 8c8473d6-770f-4f4c-b096-c8eb47fd4251) ) + (bus (pts (xy 55.88 194.31) (xy 55.88 228.6)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid 8d238104-9cee-4f49-8939-808f5f387e7d) + ) (bus (pts (xy 115.57 124.46) (xy 115.57 127)) (stroke (width 0) (type default) (color 255 153 0 1)) (uuid 8df8e4b6-ae75-4230-aa2a-87a794cf4edc) @@ -5158,7 +5247,7 @@ (stroke (width 0) (type default)) (uuid 9c125bcd-8735-4a57-aedc-981eda48e866) ) - (bus (pts (xy 17.78 194.31) (xy 53.34 194.31)) + (bus (pts (xy 16.51 194.31) (xy 55.88 194.31)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid 9c6edc16-4ebb-49ea-90cc-f73cb8cb9dd0) ) @@ -5167,16 +5256,11 @@ (stroke (width 0) (type default)) (uuid 9c9b28d7-9930-4a89-affc-df8bac70445a) ) - (bus (pts (xy 53.34 177.8) (xy 53.34 185.42)) - (stroke (width 0) (type default) (color 255 0 255 1)) - (uuid 9cbb55d1-167f-4e58-af3b-d8f5e98cc153) - ) - (wire (pts (xy 248.92 119.38) (xy 257.81 119.38)) (stroke (width 0) (type default)) (uuid 9d436093-f52f-4c58-944d-c6482a33c4ad) ) - (wire (pts (xy 40.64 172.72) (xy 50.8 172.72)) + (wire (pts (xy 40.64 172.72) (xy 53.34 172.72)) (stroke (width 0) (type default)) (uuid 9de26762-00f5-49be-b5be-0b1f87d57f4a) ) @@ -5271,12 +5355,8 @@ (stroke (width 0) (type default) (color 255 153 0 1)) (uuid a7797091-36e3-4064-bfda-fa6ea57f4c4b) ) - (bus (pts (xy 13.97 233.68) (xy 13.97 241.3)) - (stroke (width 0) (type default) (color 194 194 0 1)) - (uuid a7f1c744-bd12-4892-8eb0-15d54d5fe78c) - ) - (wire (pts (xy 27.94 185.42) (xy 20.32 185.42)) + (wire (pts (xy 27.94 185.42) (xy 19.05 185.42)) (stroke (width 0) (type default)) (uuid a80d0278-a95d-4e01-9148-4e8327d30bb0) ) @@ -5382,6 +5462,10 @@ (stroke (width 0) (type default)) (uuid b102f35c-6961-4170-9adb-dc6d62d737cb) ) + (wire (pts (xy 20.32 218.44) (xy 27.94 218.44)) + (stroke (width 0) (type default)) + (uuid b1845a2c-ae55-4ba9-9262-f94c0e9943d5) + ) (wire (pts (xy 153.67 82.55) (xy 180.34 82.55)) (stroke (width 0) (type default)) (uuid b1c9c56e-c462-4322-b3de-d680f1dae323) @@ -5399,6 +5483,10 @@ (stroke (width 0) (type default)) (uuid b20991f2-c969-4368-81ad-d81f7843b99e) ) + (wire (pts (xy 40.64 228.6) (xy 53.34 228.6)) + (stroke (width 0) (type default)) + (uuid b30aedec-2427-4980-8e3f-207ea1d31cca) + ) (wire (pts (xy 241.3 332.74) (xy 241.3 330.2)) (stroke (width 0) (type default)) (uuid b349adeb-550b-4927-b9dc-d1e1758fd9a2) @@ -5428,6 +5516,11 @@ (stroke (width 0) (type default)) (uuid ba2a96db-6864-4c41-84a4-c0fa96212229) ) + (bus (pts (xy 57.15 185.42) (xy 57.15 196.85)) + (stroke (width 0) (type default) (color 194 194 0 1)) + (uuid bbe7759d-fb55-4485-90db-b0be5dd2720b) + ) + (wire (pts (xy 44.45 107.95) (xy 57.15 107.95)) (stroke (width 0) (type default)) (uuid bc6dc5f1-dc87-4f56-bdb1-da85de995b01) @@ -5448,6 +5541,10 @@ (stroke (width 0) (type default)) (uuid bfc2a478-ce81-4ede-9388-292ece74b136) ) + (bus (pts (xy 55.88 228.6) (xy 55.88 231.14)) + (stroke (width 0) (type default) (color 255 0 255 1)) + (uuid bff48973-0163-4b67-85d8-0807c307ac72) + ) (wire (pts (xy 29.21 139.7) (xy 19.05 139.7)) (stroke (width 0) (type default)) @@ -5470,11 +5567,6 @@ (stroke (width 0) (type default)) (uuid c46f8371-7daf-41b3-9a0f-1eba7e6848dd) ) - (bus (pts (xy 17.78 185.42) (xy 17.78 187.96)) - (stroke (width 0) (type default) (color 255 0 255 1)) - (uuid c4c86491-1f3d-467d-8a22-4aa70e301c57) - ) - (wire (pts (xy 254 152.4) (xy 262.89 152.4)) (stroke (width 0) (type default)) (uuid c5b2bffa-c934-480e-93f0-67565fd7e472) @@ -5524,7 +5616,7 @@ (stroke (width 0) (type default)) (uuid c9573f40-3e19-42cd-956e-a2c9a95c5729) ) - (bus (pts (xy 53.34 172.72) (xy 53.34 177.8)) + (bus (pts (xy 55.88 172.72) (xy 55.88 177.8)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid c984c34b-cf2b-43a4-ad49-f65de58ed663) ) @@ -5555,7 +5647,7 @@ (uuid ccb0060a-e872-446d-8cee-7ae3851fcb76) ) - (wire (pts (xy 27.94 231.14) (xy 16.51 231.14)) + (wire (pts (xy 27.94 231.14) (xy 19.05 231.14)) (stroke (width 0) (type default)) (uuid cd705560-cc08-456e-8232-2be1cc16162f) ) @@ -5593,6 +5685,10 @@ (uuid d1435c53-eab6-43bc-bf25-6885595aa034) ) + (wire (pts (xy 40.64 226.06) (xy 53.34 226.06)) + (stroke (width 0) (type default)) + (uuid d268678c-9f43-4e96-94ba-de36e9c937fb) + ) (wire (pts (xy 118.11 129.54) (xy 135.89 129.54)) (stroke (width 0) (type default)) (uuid d28b324c-104f-4630-8680-10b6209ea8aa) @@ -5617,7 +5713,7 @@ (stroke (width 0) (type default)) (uuid d652010c-419b-4b30-9467-afd42331a56f) ) - (bus (pts (xy 17.78 177.8) (xy 17.78 185.42)) + (bus (pts (xy 16.51 175.26) (xy 16.51 187.96)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid d6b41d0a-a0cd-4f33-bfa6-dd34fc48dbbf) ) @@ -5755,11 +5851,7 @@ (stroke (width 0) (type default)) (uuid ebc049a2-9b15-44d4-8ee7-3274b703ce1f) ) - (bus (pts (xy 53.34 194.31) (xy 93.98 194.31)) - (stroke (width 0) (type default) (color 255 0 255 1)) - (uuid ebd9dcf0-8c35-4f6b-b68c-adce2fa092a0) - ) - (bus (pts (xy 53.34 187.96) (xy 53.34 194.31)) + (bus (pts (xy 55.88 187.96) (xy 55.88 194.31)) (stroke (width 0) (type default) (color 255 0 255 1)) (uuid ec04c994-123e-43d5-b606-8725d2f36fea) ) @@ -5793,6 +5885,10 @@ (stroke (width 0) (type default)) (uuid ef2d79ec-e9ff-4e32-bc8b-535d054b8064) ) + (wire (pts (xy 29.21 182.88) (xy 27.94 182.88)) + (stroke (width 0) (type default)) + (uuid ef7db72f-9ee1-45bc-a5e9-bdd36d241a16) + ) (wire (pts (xy 171.45 215.9) (xy 180.34 215.9)) (stroke (width 0) (type default)) (uuid f03bc2c2-b9cd-4875-8eb5-fabbd121bab9) @@ -5828,7 +5924,7 @@ (stroke (width 0) (type default)) (uuid f4f3acc1-126c-4ab8-93ea-7d92ad8b47a9) ) - (wire (pts (xy 20.32 175.26) (xy 27.94 175.26)) + (wire (pts (xy 17.78 175.26) (xy 27.94 175.26)) (stroke (width 0) (type default)) (uuid f4f7a37f-25ad-496a-8e71-986792b4475f) ) @@ -5872,7 +5968,7 @@ (uuid f91183b0-6172-40fd-bf8d-fe02eed8aaa3) ) - (wire (pts (xy 27.94 172.72) (xy 20.32 172.72)) + (wire (pts (xy 27.94 172.72) (xy 19.05 172.72)) (stroke (width 0) (type default)) (uuid fa0fc702-5fa0-47d7-8890-95d8ac2eb6f3) ) @@ -5884,7 +5980,7 @@ (stroke (width 0) (type default)) (uuid faef239e-e0ca-490b-adf7-4f0c04c97a79) ) - (wire (pts (xy 40.64 175.26) (xy 50.8 175.26)) + (wire (pts (xy 40.64 175.26) (xy 53.34 175.26)) (stroke (width 0) (type default)) (uuid fbaca316-f7d4-4690-a18d-4795ba74db57) ) @@ -5892,6 +5988,10 @@ (stroke (width 0) (type default)) (uuid fbe0ba6f-774a-42d7-8f58-8ee2daa5ff89) ) + (bus (pts (xy 15.24 196.85) (xy 57.15 196.85)) + (stroke (width 0) (type default) (color 194 194 0 1)) + (uuid fcb843c0-95e0-4d20-aedb-c894cebd8f4b) + ) (bus (pts (xy 60.96 218.44) (xy 60.96 220.98)) (stroke (width 0) (type default)) (uuid fd3f935a-6c12-4a21-9869-3ae766f0a9de) @@ -5905,7 +6005,7 @@ (stroke (width 0) (type default)) (uuid fe8ad3fd-d6e1-4fd4-aaad-63ce80c9ab82) ) - (bus (pts (xy 13.97 231.14) (xy 13.97 233.68)) + (bus (pts (xy 13.97 228.6) (xy 13.97 241.3)) (stroke (width 0) (type default) (color 194 194 0 1)) (uuid ff02b111-28bd-4ec2-997d-925f8f896710) ) @@ -5950,7 +6050,7 @@ (uuid 781088a2-e243-4df7-bdaf-55a77470df79) ) (text "Move the resistor from\nposition R143 to R145 to\nenable the CAN WAKEUP\nfunction. The AUX1 analog\ninput will be unavailable." - (at 201.93 191.77 0) + (at 203.2 207.01 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 8103bc7e-9bce-4e74-bf04-56b41703bebb) ) @@ -6268,7 +6368,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 61d7dc2b-e70b-4807-8979-16a252220e48) ) - (label "IN_BUTTON1" (at 27.94 182.88 180) (fields_autoplaced) + (label "IN_BUTTON1" (at 29.21 182.88 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid 62988571-3c7c-45a1-84fb-6d98b7a15123) ) @@ -7967,7 +8067,7 @@ (property "Reference" "#PWR028" (at 13.97 218.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 15.24 218.44 90) + (property "Value" "GND" (at 16.51 219.71 90) (effects (font (size 1.27 1.27))) ) (property "Footprint" "" (at 20.32 218.44 0)