diff --git a/src/osr_elec/ato.yaml b/src/osr_elec/ato.yaml index 1de40c8..7a87ccf 100644 --- a/src/osr_elec/ato.yaml +++ b/src/osr_elec/ato.yaml @@ -11,10 +11,6 @@ dependencies: version_spec: '@d41fc0044336bcf77a9387521e90547570c0bd52' link_broken: false path: .ato/modules/rpi-header - - name: xt-connectors - version_spec: '@3719ec970da96df05b6763671993ca2276df968b' - link_broken: false - path: .ato/modules/xt-connectors - name: ams1117-33 version_spec: '@29f49d7b6b6db24be0282f6c3524f49b71e71b48' link_broken: false diff --git a/src/osr_elec/elec/footprints/footprints.pretty/AMASS_XT30PW-M_1x02_P2.50mm_Horizontal.kicad_mod b/src/osr_elec/elec/footprints/footprints.pretty/AMASS_XT30PW-M_1x02_P2.50mm_Horizontal.kicad_mod deleted file mode 100644 index 915f74f..0000000 --- a/src/osr_elec/elec/footprints/footprints.pretty/AMASS_XT30PW-M_1x02_P2.50mm_Horizontal.kicad_mod +++ /dev/null @@ -1,427 +0,0 @@ -(footprint "AMASS_XT30PW-M_1x02_P2.50mm_Horizontal" - (version 20240108) - (generator "pcbnew") - (generator_version "8.0") - (layer "F.Cu") - (descr "Connector XT30 Horizontal PCB Male, https://www.tme.eu/en/Document/ce4077e36b79046da520ca73227e15de/XT30PW%20SPEC.pdf") - (tags "RC Connector XT30") - (property "Reference" "REF**" - (at -2.5 -14.5 0) - (layer "F.SilkS") - (uuid "8d648b15-289b-43c3-a8f6-9613ed1155d1") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (property "Value" "AMASS_XT30PW-M_1x02_P2.50mm_Horizontal" - (at -2.5 3.5 0) - (layer "F.Fab") - (uuid "728aaf3b-8d4e-46a4-ba92-d6d5f95ce1ba") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (property "Footprint" "" - (at 0 0 0) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "5905e091-a650-43ac-a77b-2da1dda95d58") - (effects - (font - (size 1.27 1.27) - ) - ) - ) - (property "Datasheet" "" - (at 0 0 0) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "c33415aa-cfab-4205-b51c-e486ecd9207c") - (effects - (font - (size 1.27 1.27) - ) - ) - ) - (property "Description" "" - (at 0 0 0) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "2e00bd49-947a-4807-8449-d3acd64de97c") - (effects - (font - (size 1.27 1.27) - ) - ) - ) - (attr through_hole) - (fp_line - (start -8.15 -11.11) - (end -7.56 -11.11) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "3f5a4423-214b-49a2-95a9-c5c3a340bbee") - ) - (fp_line - (start -8.15 -8.89) - (end -7.56 -8.89) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "d463ebe5-8f0e-4c95-8ce5-64cca3132d2d") - ) - (fp_line - (start -7.56 -13.21) - (end -7.56 -11.11) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "57927f47-f757-4e5d-ad0d-db0a6dcaaa4f") - ) - (fp_line - (start -7.56 -13.21) - (end 2.56 -13.21) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "bab651f6-ce7f-4bcf-952b-6b990dfa50e0") - ) - (fp_line - (start -7.56 -8.89) - (end -7.56 -3.99) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "1dd9f62a-acf9-40a6-8321-efa36420963b") - ) - (fp_line - (start -7.56 -3.99) - (end 2.56 -3.99) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "572f0ea8-ed43-4ec8-ba10-46c9f164bdb9") - ) - (fp_line - (start 2.56 -13.21) - (end 2.56 -11.11) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "363b78fe-7545-42a2-a8ed-41531f32a33f") - ) - (fp_line - (start 2.56 -11.11) - (end 3.15 -11.11) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "1c6f1850-7bb0-4e25-8a7c-6cc31f2ee2fa") - ) - (fp_line - (start 2.56 -8.89) - (end 2.56 -3.99) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "d102bffa-2e98-4e5b-bb4a-cc84fc907002") - ) - (fp_line - (start 2.56 -8.89) - (end 3.15 -8.89) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "addb8681-efdc-4b0d-a5f1-19c05d4e954d") - ) - (fp_arc - (start -8.15 -8.89) - (mid -9.26 -10) - (end -8.15 -11.11) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "e3f37dc0-9c22-44d2-8bdd-c33a362ecf00") - ) - (fp_arc - (start 3.15 -11.11) - (mid 4.26 -10) - (end 3.15 -8.89) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "e7a2660d-8a2e-434a-874d-54ff3499db57") - ) - (fp_line - (start -9.65 -13.6) - (end -9.65 2.25) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "944e67b5-5e42-4df5-8d91-a884f8ddc86a") - ) - (fp_line - (start -9.65 -13.6) - (end 4.65 -13.6) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "0e826d7e-090c-4b2b-851d-185dc4f4d710") - ) - (fp_line - (start -9.65 2.25) - (end 4.65 2.25) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "20d959cd-e663-40b4-80ad-50d232308a1a") - ) - (fp_line - (start 4.65 -13.6) - (end 4.65 2.25) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "18be257f-e643-42d9-bc7b-ed830599b358") - ) - (fp_line - (start -8.15 -11) - (end -7.45 -11) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "3962fe13-4094-4a0b-bcda-b14d75fb20b9") - ) - (fp_line - (start -8.15 -9) - (end -7.45 -9) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "6cac63d3-4c11-47d5-8750-60417532f76e") - ) - (fp_line - (start -7.45 -13.1) - (end -7.45 -11) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "927a936e-0e7e-49c2-bad3-81e5d4df74b9") - ) - (fp_line - (start -7.45 -13.1) - (end 2.45 -13.1) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "7172ee6b-ad19-488d-8f0c-030d16cf3ea0") - ) - (fp_line - (start -7.45 -9) - (end -7.45 -4.1) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "f00dbf24-8114-4d4b-93fe-cf66356322d7") - ) - (fp_line - (start -7.45 -4.1) - (end 2.45 -4.1) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "c62c661f-6f05-4116-92aa-40385b7847a9") - ) - (fp_line - (start 2.45 -13.1) - (end 2.45 -11) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "35e261bc-f65e-4812-a5f8-64e1208e4362") - ) - (fp_line - (start 2.45 -11) - (end 3.15 -11) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "e2d5dffb-ec5a-4c51-8936-1b7d38f96f5a") - ) - (fp_line - (start 2.45 -9) - (end 2.45 -4.1) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "abcf8cfd-64e1-4068-9d4e-c49b13af2791") - ) - (fp_line - (start 2.45 -9) - (end 3.15 -9) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "ef82b06b-ad4f-40bb-89fc-399b130eb189") - ) - (fp_arc - (start -8.15 -9) - (mid -9.15 -10) - (end -8.15 -11) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "fcf75836-4086-46af-8bab-42fa8bd8aad1") - ) - (fp_arc - (start 3.15 -11) - (mid 4.15 -10) - (end 3.15 -9) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "79a4e4d6-eaf1-4ec8-80ff-38cdb41d44d3") - ) - (fp_text user "-" - (at 3 0 0) - (layer "F.SilkS") - (uuid "00b15ffc-d08a-4eed-976c-91f58da3cefb") - (effects - (font - (size 1.5 1.5) - (thickness 0.15) - ) - ) - ) - (fp_text user "+" - (at -8 0 0) - (layer "F.SilkS") - (uuid "25727612-bb91-4e69-af37-c835de7b8a35") - (effects - (font - (size 1.5 1.5) - (thickness 0.15) - ) - ) - ) - (fp_text user "${REFERENCE}" - (at -2.5 -3 0) - (layer "F.Fab") - (uuid "f5f5dfab-bd2d-407e-a648-9f495294232f") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (pad "" thru_hole circle - (at -8 -10) - (size 1.4 1.4) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (uuid "9eecb55b-25ca-4206-a0d5-9c6d834865a4") - ) - (pad "" thru_hole circle - (at 3 -10) - (size 1.4 1.4) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (uuid "b8a68313-cd14-4a06-8213-437cc9450e9a") - ) - (pad "1" thru_hole rect - (at 0 0) - (size 3.5 3.5) - (drill 1.9) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (uuid "3c08777f-6352-4a31-ad4f-79ad6b02212f") - ) - (pad "2" thru_hole circle - (at -5 0) - (size 3.5 3.5) - (drill 1.9) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (uuid "dcf9b550-d66d-4aed-b629-a4aaa009b914") - ) - (model "${KIPRJMOD}/../../footprints/footprints.3dshapes/AMASS_XT30PW-M_1x02_P2.50mm_Horizontal.step" - (offset - (xyz 0 0 0) - ) - (scale - (xyz 1 1 1) - ) - (rotate - (xyz 0 0 0) - ) - ) -) diff --git a/src/osr_elec/elec/layout/rpi-hat/rpi-hat.kicad_pcb b/src/osr_elec/elec/layout/rpi-hat/rpi-hat.kicad_pcb index 492c8b2..90948ff 100644 --- a/src/osr_elec/elec/layout/rpi-hat/rpi-hat.kicad_pcb +++ b/src/osr_elec/elec/layout/rpi-hat/rpi-hat.kicad_pcb @@ -11753,7 +11753,7 @@ ) ) ) - (footprint "lib:AMASS_XT30PW-M_1x02_P2.50mm_Horizontal" + (footprint "Connector_AMASS:AMASS_XT30PW-M_1x02_P2.50mm_Horizontal" (layer "F.Cu") (uuid "a4e331e2-71cc-4a65-83dd-e01e1b5a2e52") (at 143.95 27.175) @@ -11762,7 +11762,7 @@ (property "Reference" "J1" (at -2.5 -14.5 0) (layer "F.SilkS") - (uuid "f536f699-4f8c-4d92-b1ef-f0166c9456a8") + (uuid "90724298-db35-494b-a522-b7de6a75869f") (effects (font (size 1 1) @@ -11773,7 +11773,7 @@ (property "Value" "" (at -2.5 3.5 0) (layer "F.Fab") - (uuid "03f4c15f-21c2-430f-bd4e-a7722806aba8") + (uuid "2842b567-fbbd-439c-b67c-3460dbc948a5") (effects (font (size 1 1) @@ -11786,7 +11786,7 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "cb0fd504-4e89-4cf5-b0b4-afe62e07a940") + (uuid "0298319b-4133-4d46-80b7-937d316025fa") (effects (font (size 1.27 1.27) @@ -11799,7 +11799,7 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "c9737e7f-d159-4920-9db2-845f2c2ca9ae") + (uuid "bcd73514-b147-4970-9a07-135e4dc3640a") (effects (font (size 1.27 1.27) @@ -11812,7 +11812,7 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "0c4dc54c-50a6-462a-a321-2c4a1934c104") + (uuid "5188ddee-3155-4c9a-9665-ed8b0591f4ab") (effects (font (size 1.27 1.27) @@ -11830,7 +11830,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "c9ef106d-c408-49d2-a48c-e9646b809e98") + (uuid "a9e7d93e-c52e-4fd3-be48-c5a575a1f1be") ) (fp_line (start -8.15 -8.89) @@ -11840,7 +11840,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "8df1df7d-3b82-4057-a0d3-a72ff12d5777") + (uuid "ec4d616e-8dc6-4fc5-b310-5f59ce8eb11f") ) (fp_line (start -7.56 -13.21) @@ -11850,7 +11850,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "b7c4db76-dce6-43e3-992e-0197ff0034b5") + (uuid "602c665e-b58b-4f1b-9c5c-e4a397f3d681") ) (fp_line (start -7.56 -13.21) @@ -11860,7 +11860,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "18eb59d0-711f-4b6f-ac83-37986988a571") + (uuid "79ce9d9f-8b7b-4ef1-b9fa-26ed7f0ca4e1") ) (fp_line (start -7.56 -8.89) @@ -11870,7 +11870,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "69d7afc7-ba6e-4e6c-a453-bb58acac4000") + (uuid "01ab2941-0836-4ed6-ba20-0a6177730f43") ) (fp_line (start -7.56 -3.99) @@ -11880,7 +11880,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "466ae501-958b-46b2-8c91-b55c2c2bb19b") + (uuid "0fac2940-3f29-41bd-b827-aa1054c3f519") ) (fp_line (start 2.56 -13.21) @@ -11890,7 +11890,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "e8a893d8-6b10-4e85-b41a-b9962e6a68ab") + (uuid "9593fb4d-2ea0-47a4-b55b-30ab2a5855c2") ) (fp_line (start 2.56 -11.11) @@ -11900,7 +11900,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "625c65be-1040-4205-a025-cefee8d3a22e") + (uuid "0d3b7011-3265-43f8-aec7-5566457dfbe3") ) (fp_line (start 2.56 -8.89) @@ -11910,7 +11910,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "11e8d8c8-6156-4812-9de9-62f3570e9b4f") + (uuid "4123ee97-f388-4522-8d4a-7b29a259e011") ) (fp_line (start 2.56 -8.89) @@ -11920,7 +11920,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "2892383f-4d04-44de-af33-4eae77fae1fb") + (uuid "1977bf35-6f85-4a6b-a6f3-f0e083b892e0") ) (fp_arc (start -8.15 -8.89) @@ -11931,7 +11931,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "59eca937-f495-4e0c-bfc0-a6ccc58799ee") + (uuid "03abf137-0023-4efd-9c2e-8b140837308a") ) (fp_arc (start 3.15 -11.11) @@ -11942,7 +11942,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "bf6284f2-966d-450b-9ef5-ea3f708758ba") + (uuid "723959e0-b9b1-44b9-8c31-b534e2604807") ) (fp_line (start -9.65 -13.6) @@ -11952,7 +11952,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "d7840e8c-4199-49cc-96a1-0f794eaa4d1d") + (uuid "e9cb058e-459c-402f-a664-c0d3ffc2d313") ) (fp_line (start -9.65 -13.6) @@ -11962,7 +11962,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "d3060334-43c0-4a0e-a346-340c4f2e6718") + (uuid "fa968592-901e-49f1-a4bf-10c0f706008c") ) (fp_line (start -9.65 2.25) @@ -11972,7 +11972,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "caf61a50-54e6-44e5-beb5-5172a057736e") + (uuid "74a0a2d7-9e99-4a60-b04c-333b0a11aecb") ) (fp_line (start 4.65 -13.6) @@ -11982,7 +11982,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "8bb25f14-3f83-4801-a8a3-5b83fe50ddbe") + (uuid "b50c77c7-2377-43ac-a663-ce226a025726") ) (fp_line (start -8.15 -11) @@ -11992,7 +11992,7 @@ (type solid) ) (layer "F.Fab") - (uuid "5d7f797c-bb47-48f1-8d08-9162305d356f") + (uuid "b18f6a60-0e98-4527-8ffb-fa6517ca5cd7") ) (fp_line (start -8.15 -9) @@ -12002,7 +12002,7 @@ (type solid) ) (layer "F.Fab") - (uuid "a4b01dc5-1b7f-43be-a9ff-158a1ad25269") + (uuid "29e953e9-ddc5-4b62-9b87-6ebe12447dd3") ) (fp_line (start -7.45 -13.1) @@ -12012,7 +12012,7 @@ (type solid) ) (layer "F.Fab") - (uuid "3807cef6-c7d6-4dd4-8e7c-1dc4ae5fdafe") + (uuid "20d70c43-5efd-4745-9b5a-a3b9a692a7a5") ) (fp_line (start -7.45 -13.1) @@ -12022,7 +12022,7 @@ (type solid) ) (layer "F.Fab") - (uuid "da8e2357-6449-45f0-bcc5-98cf64e8cb97") + (uuid "27163efa-33c3-4368-abee-3075f76e602b") ) (fp_line (start -7.45 -9) @@ -12032,7 +12032,7 @@ (type solid) ) (layer "F.Fab") - (uuid "4ca9fc59-295f-46f0-90fe-6bf6072e08ed") + (uuid "34a22de7-df88-4490-9a2f-5459dcde1a98") ) (fp_line (start -7.45 -4.1) @@ -12042,7 +12042,7 @@ (type solid) ) (layer "F.Fab") - (uuid "73107da8-3a9c-4586-8c11-3eff9c71f9b0") + (uuid "0f3db655-2782-4966-8c8a-313b88f3e214") ) (fp_line (start 2.45 -13.1) @@ -12052,7 +12052,7 @@ (type solid) ) (layer "F.Fab") - (uuid "cc19ac43-f4d0-47de-870c-1cd998982a9a") + (uuid "3a6c3927-ef13-457c-a2d9-b432168af004") ) (fp_line (start 2.45 -11) @@ -12062,7 +12062,7 @@ (type solid) ) (layer "F.Fab") - (uuid "b5039d5f-3ed7-4434-8349-db0fb8338bc7") + (uuid "769cfaee-275e-46ee-af91-7b151b9b6832") ) (fp_line (start 2.45 -9) @@ -12072,7 +12072,7 @@ (type solid) ) (layer "F.Fab") - (uuid "e0170c65-d3b3-4073-9be1-6c82c3f33baf") + (uuid "7e1a9552-8b8f-442b-bf95-9a3694e05012") ) (fp_line (start 2.45 -9) @@ -12082,7 +12082,7 @@ (type solid) ) (layer "F.Fab") - (uuid "ee3e66ba-d27b-46f2-aec4-2621780303fc") + (uuid "ef641ad4-9cd0-415f-8ddb-76fdeb83213a") ) (fp_arc (start -8.15 -9) @@ -12093,7 +12093,7 @@ (type solid) ) (layer "F.Fab") - (uuid "bcb8273b-0295-4d17-9548-48903aac6f15") + (uuid "4510dda1-603f-45ef-9c55-ad1f6e6439f9") ) (fp_arc (start 3.15 -11) @@ -12104,12 +12104,12 @@ (type solid) ) (layer "F.Fab") - (uuid "27a5ecb7-059b-4c50-82cf-9b33d6fdcb52") + (uuid "bf940c49-c69a-40bf-adeb-8c2b13f6897b") ) (fp_text user "-" (at 3 0 0) (layer "F.SilkS") - (uuid "584bed19-1379-41df-a927-6122afa0884e") + (uuid "2dab1cbf-5b3e-455b-a377-b0eca420b4d2") (effects (font (size 1.5 1.5) @@ -12120,7 +12120,7 @@ (fp_text user "+" (at -8 0 0) (layer "F.SilkS") - (uuid "8d9a3c85-7098-4c0d-8a47-80bce50da3eb") + (uuid "d39d3538-865e-4e02-b846-c7b3dfc1368b") (effects (font (size 1.5 1.5) @@ -12131,7 +12131,7 @@ (fp_text user "${REFERENCE}" (at -2.5 -3 0) (layer "F.Fab") - (uuid "ff83def5-6c54-4891-a9e9-d07d814ff563") + (uuid "0e1f5d4b-0d94-4b59-bd4b-30bed38c5809") (effects (font (size 1 1) @@ -12145,7 +12145,7 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "ba85ec21-6480-4905-8c24-4c601672cbd2") + (uuid "703c743c-edd7-4ac7-9a55-c295eadffda6") ) (pad "" thru_hole circle (at 3 -10) @@ -12153,7 +12153,7 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "aff488a9-b733-4c41-a1be-fe2dd7e482b3") + (uuid "6d88a2e6-ff42-4c2a-95f5-5df93b654637") ) (pad "1" thru_hole rect (at 0 0) @@ -12163,7 +12163,7 @@ (remove_unused_layers no) (net 1 "gnd") (pintype "stereo") - (uuid "8c4076ce-2320-4760-88ae-d10746440b00") + (uuid "cc50f418-01ab-40ed-96df-55d7b01689ef") ) (pad "2" thru_hole circle (at -5 0) @@ -12173,9 +12173,9 @@ (remove_unused_layers no) (net 64 "power_connector-vcc") (pintype "stereo") - (uuid "22faedb1-d424-4056-85c7-2a9b76557427") + (uuid "24c32002-9e2b-4e6c-8d7e-6948636b8d69") ) - (model "${KIPRJMOD}/../../footprints/footprints.3dshapes/AMASS_XT30PW-M_1x02_P2.50mm_Horizontal.step" + (model "${KICAD8_3DMODEL_DIR}/Connector_AMASS.3dshapes/AMASS_XT30PW-M_1x02_P2.50mm_Horizontal.wrl" (offset (xyz 0 0 0) ) diff --git a/src/osr_elec/elec/src/lib/connectors.ato b/src/osr_elec/elec/src/lib/connectors.ato index 74591b1..db21e9c 100644 --- a/src/osr_elec/elec/src/lib/connectors.ato +++ b/src/osr_elec/elec/src/lib/connectors.ato @@ -42,7 +42,6 @@ component PhoenixPt1x3P3mm5Horizontal from Connector: signal p3 ~ pin 3 - component JstGhHorizontalCan from Connector: """ UAVCAN/CAN Micro connector. @@ -73,3 +72,23 @@ component Rs485Connector from PhoenixPt1x3P3mm5Horizontal: rs485 = new RS485 rs485.a ~ pin 1 rs485.b ~ pin 2 + + +component Xt30MaleRightAngle from Connector: + """AMASS XT30PW-M Socket 15A 500V PCB mount. + + # Reference + + * [AMASS XT30PW-M XT30 Socket 15A 500V](https://www.tme.com/nz/en/details/xt30pw-m/dc-power-connectors/amass/) + * [AMASS XT30PW datasheet](https://www.tme.com/Document/6eb2005a51a52592b3f19e8a450c54c8/XT30PW-M.pdf) + """ + footprint = "Connector_AMASS:AMASS_XT30PW-M_1x02_P2.50mm_Horizontal" + lcsc_id = "C431092" + mpn = "C431092" # XT30PW-M + + signal gnd ~ pin 1 + signal vin ~ pin 2 + + power = new Power + power.vcc ~ vin + power.gnd ~ gnd diff --git a/src/osr_elec/elec/src/rpi-hat.ato b/src/osr_elec/elec/src/rpi-hat.ato index 1d0e0c0..d43c4b3 100644 --- a/src/osr_elec/elec/src/rpi-hat.ato +++ b/src/osr_elec/elec/src/rpi-hat.ato @@ -5,10 +5,9 @@ from "generics/interfaces.ato" import I2C, Power from "ams1117-33/elec/src/ams1117-33.ato" import AMS111733 from "koa-speer-rc-series/rc.ato" import RcwcteTestPoint from "rpi-header/elec/src/rpi.ato" import ConnectorRaspberryPi -from "xt-connectors/xt-connectors.ato" import XT30_Male_Right_Angle from "lib/can-controller-trx.ato" import CanControllerTrx -from "lib/connectors.ato" import Rs485Connector +from "lib/connectors.ato" import Rs485Connector, Xt30MaleRightAngle from "lib/headers.ato" import PinHeaderI2cTHT from "lib/headers.ato" import PinHeaderUartTHT from "lib/leds.ato" import LEDIndicatorPowerRail, LedIndicatorsUart @@ -44,8 +43,7 @@ module RpiHat: gnd ~ power_5v.gnd # 5V power input connector - power_connector = new XT30_Male_Right_Angle - power_connector.footprint = "AMASS_XT30PW-M_1x02_P2.50mm_Horizontal" + power_connector = new Xt30MaleRightAngle # back power protection ideal_diode = new IdealDiode