diff --git a/src/dsn/de.rs b/src/dsn/de.rs index cda0736..aa89ae2 100644 --- a/src/dsn/de.rs +++ b/src/dsn/de.rs @@ -613,8 +613,7 @@ impl<'de, 'a> SeqAccess<'de> for StructFields<'a, 'de> { if lookahead != self.fields[self.current_field] { if lookahead + "s" != self.fields[self.current_field] { self.de.next_option_empty_hint = true; - } - else { + } else { self.de.next_option_empty_hint = false; } } else { diff --git a/src/dsn/design.rs b/src/dsn/design.rs index 5282d57..b246dde 100644 --- a/src/dsn/design.rs +++ b/src/dsn/design.rs @@ -47,9 +47,13 @@ impl DsnDesign { let continent = layout.add_continent(*net_id as i64); // find the padstack referenced by this via placement - let padstack = &self.pcb.library.padstacks.iter().find(|padstack| { - padstack.name == via.name - }).unwrap(); + let padstack = &self + .pcb + .library + .padstacks + .iter() + .find(|padstack| padstack.name == via.name) + .unwrap(); // no layer support yet, pick the first one let circle = &padstack.shapes[0].0; diff --git a/tests/data/test.dsn b/tests/data/test.dsn index 94c6609..a3d299f 100644 --- a/tests/data/test.dsn +++ b/tests/data/test.dsn @@ -1,9 +1,9 @@ -(pcb test.dsn +(pcb /home/mikolaj/proj/topola/tests/data/test.dsn (parser (string_quote ") (space_in_quoted_tokens on) (host_cad "KiCad's Pcbnew") - (host_version "7.0.9") + (host_version "7.0.10") ) (resolution um 10) (unit um) @@ -21,8 +21,8 @@ ) ) (boundary - (path pcb 0 63906 -50400 9600 -50400 9600 -14600 63906 -14600 - 63906 -50400) + (path pcb 0 60400 -50400 8209.67 -50400 8209.67 -16128 60400 -16128 + 60400 -50400) ) (via "Via[0-1]_800:400_um") (rule @@ -34,7 +34,12 @@ ) (placement (component Connector_Pin:Pin_D1.0mm_L10.0mm - (place REF** 55400.000000 -25000.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) + (place REF11 53340.000000 -17653.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) + (place REF21 16510.000000 -46990.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) + (place REF31 12700.000000 -40640.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) + (place REF12 10668.000000 -32258.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) + (place REF22 45720.000000 -35560.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) + (place REF32 35560.000000 -24130.000000 front 0.000000 (PN Pin_D1.0mm_L10.0mm)) ) ) (library @@ -86,7 +91,16 @@ ) ) (network - (class kicad_default "" 1 2 3 5 + (net 1 + (pins REF11-1 REF12-1) + ) + (net 2 + (pins REF21-1 REF22-1) + ) + (net 3 + (pins REF31-1 REF32-1) + ) + (class kicad_default "" 1 2 3 (circuit (use_via Via[0-1]_800:400_um) ) @@ -97,25 +111,19 @@ ) ) (wiring - (wire (path F.Cu 300 20000 -50000 60000 -50000)(net 5)(type route)) - (wire (path F.Cu 300 60000 -20000 40000 -20000 40000 -40000)(net 5)(type route)) - (wire (path F.Cu 300 50000 -40000 50000 -30000)(net 5)(type route)) - (wire (path F.Cu 300 60000 -50000 60000 -20000)(net 5)(type route)) - (wire (path F.Cu 300 20000 -20000 20000 -50000)(net 5)(type route)) - (wire (path F.Cu 300 40000 -40000 50000 -40000)(net 5)(type route)) - (via "Via[0-1]_800:400_um" 50000 -15000 (net 1)(type route)) - (via "Via[0-1]_800:400_um" 10000 -40000 (net 1)(type route)) - (via "Via[0-1]_800:400_um" 47000 -35000 (net 2)(type route)) - (via "Via[0-1]_800:400_um" 10000 -50000 (net 2)(type route)) - (via "Via[0-1]_800:400_um" 13000 -47000 (net 3)(type route)) - (via "Via[0-1]_800:400_um" 35000 -20000 (net 3)(type route)) - (via "Via[0-1]_800:400_um" 20000 -50000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 20000 -20000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 40000 -20000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 60000 -50000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 50000 -30000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 40000 -40000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 60000 -20000 (net 5)(type route)) - (via "Via[0-1]_800:400_um" 50000 -40000 (net 5)(type route)) + (wire (path F.Cu 300 20000 -50000 60000 -50000)(net 3)(type route)) + (wire (path F.Cu 300 60000 -20000 40000 -20000 40000 -40000)(net 3)(type route)) + (wire (path F.Cu 300 50000 -40000 50000 -30000)(net 3)(type route)) + (wire (path F.Cu 300 60000 -50000 60000 -20000)(net 3)(type route)) + (wire (path F.Cu 300 20000 -20000 20000 -50000)(net 3)(type route)) + (wire (path F.Cu 300 40000 -40000 50000 -40000)(net 3)(type route)) + (via "Via[0-1]_800:400_um" 20000 -50000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 20000 -20000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 40000 -20000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 60000 -50000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 50000 -30000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 40000 -40000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 60000 -20000 (net 3)(type route)) + (via "Via[0-1]_800:400_um" 50000 -40000 (net 3)(type route)) ) ) diff --git a/tests/data/test.kicad_pcb b/tests/data/test.kicad_pcb index d14e8ed..54f7f97 100644 --- a/tests/data/test.kicad_pcb +++ b/tests/data/test.kicad_pcb @@ -79,15 +79,49 @@ (net 1 "1") (net 2 "2") (net 3 "3") - (net 4 "5") (footprint "Connector_Pin:Pin_D1.0mm_L10.0mm" (layer "F.Cu") - (tstamp 3dae47ed-6a35-44fc-8752-27d12f4ee2ea) - (at 55.4 25) + (tstamp 338e10a0-c969-4f1a-af50-0d6a1be803b1) + (at 16.51 46.99) (descr "solder Pin_ diameter 1.0mm, hole diameter 1.0mm (press fit), length 10.0mm") (tags "solder Pin_ press fit") (attr through_hole) - (fp_text reference "REF**" (at 0 2.25) (layer "F.SilkS") + (fp_text reference "REF21" (at 0 2.25) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 089a1344-75fb-432d-ada4-e042f427044c) + ) + (fp_text value "Pin_D1.0mm_L10.0mm" (at 0 -2.05) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp f492b96c-c9d5-452c-8c39-f5194c0a06d9) + ) + (fp_text user "${REFERENCE}" (at 0 2.25) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp f5d635eb-3ed7-4829-b95f-0206ded2fcba) + ) + (fp_circle (center 0 0) (end 1.25 0.05) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.SilkS") (tstamp ad21de56-1e5f-409f-a3ef-610d35edf933)) + (fp_circle (center 0 0) (end 1.5 0) + (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp f6f41d4c-01dd-46db-b4d8-146a759b0543)) + (fp_circle (center 0 0) (end 0.5 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp ab3960ad-afc7-4080-9295-9dc8b314f127)) + (fp_circle (center 0 0) (end 1 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp 589ea600-aa60-40ab-bd55-b5a1c805cdd8)) + (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") + (net 2 "2") (tstamp 420afb94-0563-4731-86d7-5a0c623b3121)) + (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D1.0mm_L10.0mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Connector_Pin:Pin_D1.0mm_L10.0mm" (layer "F.Cu") + (tstamp 3dae47ed-6a35-44fc-8752-27d12f4ee2ea) + (at 53.34 17.653) + (descr "solder Pin_ diameter 1.0mm, hole diameter 1.0mm (press fit), length 10.0mm") + (tags "solder Pin_ press fit") + (attr through_hole) + (fp_text reference "REF11" (at 0 2.25) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp 9a52d130-31f9-4c20-8f6f-1342bd0e3fed) ) @@ -107,7 +141,8 @@ (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp 86c251e8-a13b-419e-931c-c1c3f1a54cb4)) (fp_circle (center 0 0) (end 1 0) (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp 9406bb0b-3ce6-4bbe-98fe-ecbafcdbc24d)) - (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") (tstamp 7e4a0acd-6e55-481d-9aa6-ef0ef8bcea55)) + (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") + (net 1 "1") (tstamp 7e4a0acd-6e55-481d-9aa6-ef0ef8bcea55)) (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D1.0mm_L10.0mm.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -115,26 +150,160 @@ ) ) - (via (at 50 15) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 1) (tstamp 916e202d-f4ec-4359-be88-c8bbeca4190b)) - (via (at 10 40) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 1) (tstamp fc2367cb-4d03-4680-9782-8c98848a1d13)) - (via (at 47 35) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 2) (tstamp 9503360e-a8fa-49f0-8f06-22f318290209)) - (via (at 10 50) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 2) (tstamp e609ae72-beef-41ca-9c4d-ec2ffb6b2ad3)) - (via (at 13 47) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 3) (tstamp 020edbfe-ef1b-4ed1-b5f4-c4c088d573fc)) - (via (at 35 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 3) (tstamp 9849dce8-a1b5-40a6-9316-eecd9c00299d)) - (segment (start 20 50) (end 60 50) (width 0.3) (layer "F.Cu") (net 4) (tstamp 0ebf4505-fbe5-4689-8230-5b18411a780f)) - (segment (start 60 20) (end 40 20) (width 0.3) (layer "F.Cu") (net 4) (tstamp 1acc54cd-4010-407b-9267-7574fd5ef025)) - (segment (start 40 20) (end 40 40) (width 0.3) (layer "F.Cu") (net 4) (tstamp 243ca2e9-4862-4313-992d-72441d73aadb)) - (segment (start 50 40) (end 50 30) (width 0.3) (layer "F.Cu") (net 4) (tstamp 3668a09b-9dd0-4b89-ad8e-991f7165d388)) - (segment (start 60 50) (end 60 20) (width 0.3) (layer "F.Cu") (net 4) (tstamp 557b4f6e-55ef-43a2-8167-c914315f7e26)) - (segment (start 20 20) (end 20 50) (width 0.3) (layer "F.Cu") (net 4) (tstamp a8819bd7-39eb-457e-b3df-d5860b2794db)) - (segment (start 40 40) (end 50 40) (width 0.3) (layer "F.Cu") (net 4) (tstamp bf1178cd-7ea1-4ac1-8ce7-512c05c216fd)) - (via (at 20 50) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp 055279b7-dd22-4676-8246-bc0241a39b81)) - (via (at 20 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp 05d3a2a8-ebfa-4f2f-a2f3-11c8922f4329)) - (via (at 40 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp 8488877c-df84-41da-997e-2edc125af133)) - (via (at 60 50) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp a8559629-fe0c-4943-99a8-d8148f3a9225)) - (via (at 50 30) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp af6042bc-280f-4fac-9013-daefaa0e6a75)) - (via (at 40 40) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp b329b36a-7771-4249-b13c-25e843f6698f)) - (via (at 60 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp f4bad6be-680e-4aca-ae87-b23ff9d1bd37)) - (via (at 50 40) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 4) (tstamp fdbf13bd-af07-4e9c-9fc9-c016b7fdb265)) + (footprint "Connector_Pin:Pin_D1.0mm_L10.0mm" (layer "F.Cu") + (tstamp 3f7edb7c-0f42-47c6-b122-6d4012c50023) + (at 12.7 40.64) + (descr "solder Pin_ diameter 1.0mm, hole diameter 1.0mm (press fit), length 10.0mm") + (tags "solder Pin_ press fit") + (attr through_hole) + (fp_text reference "REF31" (at 0 2.25) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp d7709fab-8fca-4fd3-b815-2936f277c1df) + ) + (fp_text value "Pin_D1.0mm_L10.0mm" (at 0 -2.05) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 9993b7c0-7947-4d29-abd8-bb068baf8967) + ) + (fp_text user "${REFERENCE}" (at 0 2.25) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp b1fe8687-a302-4e6e-898b-bf5a64f121a0) + ) + (fp_circle (center 0 0) (end 1.25 0.05) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.SilkS") (tstamp ac52a10c-8d8e-4237-aa41-29a18c53dc28)) + (fp_circle (center 0 0) (end 1.5 0) + (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 018e652f-59c1-4bb4-87f5-ff0240d517c8)) + (fp_circle (center 0 0) (end 0.5 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp 5cc06347-e466-4263-8b8d-0b9100d64741)) + (fp_circle (center 0 0) (end 1 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp ca0d5d0c-c44a-4817-b8e7-b8ec0a7b2526)) + (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") + (net 3 "3") (tstamp ad878a44-f5d7-44fe-83f6-4b4282f55cef)) + (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D1.0mm_L10.0mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Connector_Pin:Pin_D1.0mm_L10.0mm" (layer "F.Cu") + (tstamp b3571e27-b276-44d2-8de0-dc93303f8dd7) + (at 45.72 35.56) + (descr "solder Pin_ diameter 1.0mm, hole diameter 1.0mm (press fit), length 10.0mm") + (tags "solder Pin_ press fit") + (attr through_hole) + (fp_text reference "REF22" (at 0 2.25) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 7384cced-c84a-4441-ad19-a4ad9a6aded8) + ) + (fp_text value "Pin_D1.0mm_L10.0mm" (at 0 -2.05) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 853d7485-9b13-409e-8a2c-83cfb543a492) + ) + (fp_text user "${REFERENCE}" (at 0 2.25) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 3f1009a7-482f-4d7c-a981-bdcecdb5d8d4) + ) + (fp_circle (center 0 0) (end 1.25 0.05) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.SilkS") (tstamp a3944480-e2c6-4e64-aa9f-fcaa686adff1)) + (fp_circle (center 0 0) (end 1.5 0) + (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 1eb0a16f-344e-46b8-b6bf-45701051af1b)) + (fp_circle (center 0 0) (end 0.5 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp a79af8fe-3cc0-4571-8f3c-abf73b8c65ac)) + (fp_circle (center 0 0) (end 1 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp 01c40247-26f2-40d1-a58a-dd9a7d417adc)) + (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") + (net 2 "2") (tstamp 608828ee-be0e-433b-bd48-64b4276a02a9)) + (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D1.0mm_L10.0mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Connector_Pin:Pin_D1.0mm_L10.0mm" (layer "F.Cu") + (tstamp d4501837-30d4-42ae-b07d-d0b6d6b54968) + (at 10.668 32.258) + (descr "solder Pin_ diameter 1.0mm, hole diameter 1.0mm (press fit), length 10.0mm") + (tags "solder Pin_ press fit") + (attr through_hole) + (fp_text reference "REF12" (at 0 2.25) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 994de907-9f8b-4773-846b-dd3144e6f57f) + ) + (fp_text value "Pin_D1.0mm_L10.0mm" (at 0 -2.05) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 73038cd3-3913-4030-9dc4-7ec5ac0cf560) + ) + (fp_text user "${REFERENCE}" (at 0 2.25) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp f5af2d49-926f-4728-ad71-23dc3cfe65a2) + ) + (fp_circle (center 0 0) (end 1.25 0.05) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.SilkS") (tstamp e7c3a8b7-5999-4bdb-b8f2-73fffdb9f15d)) + (fp_circle (center 0 0) (end 1.5 0) + (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 5910b07b-7d79-4e23-bd2a-8e6992b07bb5)) + (fp_circle (center 0 0) (end 0.5 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp aef3677f-7ef1-408b-9588-c867ab3a2798)) + (fp_circle (center 0 0) (end 1 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp 54f04ca0-29b5-45f3-a81b-6b835ee3662e)) + (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") + (net 1 "1") (tstamp d247e877-7868-452f-940b-67146ad2a676)) + (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D1.0mm_L10.0mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Connector_Pin:Pin_D1.0mm_L10.0mm" (layer "F.Cu") + (tstamp f53fb998-de6d-4508-8522-91bee4c8341b) + (at 35.56 24.13) + (descr "solder Pin_ diameter 1.0mm, hole diameter 1.0mm (press fit), length 10.0mm") + (tags "solder Pin_ press fit") + (attr through_hole) + (fp_text reference "REF32" (at 0 2.25) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 887e6792-1e32-4161-a688-83a2dfdfcab0) + ) + (fp_text value "Pin_D1.0mm_L10.0mm" (at 0 -2.05) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 2ce2c38a-2845-4546-a1b0-598a9497a9fc) + ) + (fp_text user "${REFERENCE}" (at 0 2.25) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp de53a162-ae3b-405d-bc1c-aeb58b728df7) + ) + (fp_circle (center 0 0) (end 1.25 0.05) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.SilkS") (tstamp 186d4ba4-33b8-4b18-b3de-0a88ee00f6b8)) + (fp_circle (center 0 0) (end 1.5 0) + (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 4735fff3-4211-460c-9f5d-62d5a6b6db26)) + (fp_circle (center 0 0) (end 0.5 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp df4a9458-2b96-49de-918d-ba283d7975e9)) + (fp_circle (center 0 0) (end 1 0) + (stroke (width 0.12) (type solid)) (fill none) (layer "F.Fab") (tstamp dcd532a8-72fc-4e63-a032-f1fa37aa55ed)) + (pad "1" thru_hole circle (at 0 0) (size 2 2) (drill 1) (layers "*.Cu" "*.Mask") + (net 3 "3") (tstamp 93919734-be0a-48e9-b909-d3d93a6b8268)) + (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D1.0mm_L10.0mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (segment (start 20 50) (end 60 50) (width 0.3) (layer "F.Cu") (net 3) (tstamp 0ebf4505-fbe5-4689-8230-5b18411a780f)) + (segment (start 60 20) (end 40 20) (width 0.3) (layer "F.Cu") (net 3) (tstamp 1acc54cd-4010-407b-9267-7574fd5ef025)) + (segment (start 40 20) (end 40 40) (width 0.3) (layer "F.Cu") (net 3) (tstamp 243ca2e9-4862-4313-992d-72441d73aadb)) + (segment (start 50 40) (end 50 30) (width 0.3) (layer "F.Cu") (net 3) (tstamp 3668a09b-9dd0-4b89-ad8e-991f7165d388)) + (segment (start 60 50) (end 60 20) (width 0.3) (layer "F.Cu") (net 3) (tstamp 557b4f6e-55ef-43a2-8167-c914315f7e26)) + (segment (start 20 20) (end 20 50) (width 0.3) (layer "F.Cu") (net 3) (tstamp a8819bd7-39eb-457e-b3df-d5860b2794db)) + (segment (start 40 40) (end 50 40) (width 0.3) (layer "F.Cu") (net 3) (tstamp bf1178cd-7ea1-4ac1-8ce7-512c05c216fd)) + (via (at 20 50) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp 055279b7-dd22-4676-8246-bc0241a39b81)) + (via (at 20 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp 05d3a2a8-ebfa-4f2f-a2f3-11c8922f4329)) + (via (at 40 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp 8488877c-df84-41da-997e-2edc125af133)) + (via (at 60 50) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp a8559629-fe0c-4943-99a8-d8148f3a9225)) + (via (at 50 30) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp af6042bc-280f-4fac-9013-daefaa0e6a75)) + (via (at 40 40) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp b329b36a-7771-4249-b13c-25e843f6698f)) + (via (at 60 20) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp f4bad6be-680e-4aca-ae87-b23ff9d1bd37)) + (via (at 50 40) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 3) (tstamp fdbf13bd-af07-4e9c-9fc9-c016b7fdb265)) ) diff --git a/tests/data/test.kicad_pro b/tests/data/test.kicad_pro index ec5869e..eff27f0 100644 --- a/tests/data/test.kicad_pro +++ b/tests/data/test.kicad_pro @@ -34,9 +34,9 @@ "other_text_thickness": 0.15, "other_text_upright": false, "pads": { - "drill": 0.762, - "height": 1.524, - "width": 1.524 + "drill": 1.0, + "height": 2.0, + "width": 2.0 }, "silk_line_width": 0.09999999999999999, "silk_text_italic": false,