haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix off-by-one error in exporting netlist, and update testcases. 

The golden file update entails the change to no-connects as well as
the introduction of natural number ordering.
This commit is contained in:
Jeff Young 2020-12-04 19:36:10 +00:00
parent 4634802a58
commit 9ece90a541
3 changed files with 895 additions and 779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/netlist_exporters/netlist_exporter_xml.cpp
View File

@ -686,7 +686,7 @@ XNODE* NETLIST_EXPORTER_XML::makeListOfNets( unsigned aCtl )
if( !added )
{
netCodeTxt.Printf( "%d", i );
netCodeTxt.Printf( "%d", i + 1 );
if( net_record->first == "no_connect_" )
net_record->first += netCodeTxt;

79
qa/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.net
View File

@ -1,8 +1,8 @@
(export (version "D")
(design
(source "complex_hierarchy.kicad_sch")
(date "Monday 23 November 2020 at 22:04:49")
(tool "Eeschema (5.99.0-7150-g8a270a9ca-dirty)")
(source "/Users/jeff/kicad_dev/kicad/qa/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.kicad_sch")
(date "Friday 04 December 2020 at 19:37:09")
(tool "Eeschema (5.99.0-7350-g7b347d793b-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title "Complex hierarchy: demo")
@ -717,11 +717,10 @@
(pins
(pin (num "1") (name "~") (type "passive"))
(pin (num "2") (name "~") (type "passive")))))
(libraries)
(libraries
(library (logical "complex_hierarchy_schlib")
(uri "/Users/jeff/kicad_dev/kicad/qa/eeschema/data/netlists/complex_hierarchy/complex_hierarchy_schlib.lib")))
(nets
(net (code "0") (name "")
(node (ref "U1") (pin "6") (pinfunction "LV"))
(node (ref "U1") (pin "7") (pinfunction "OSC")))
(net (code "1") (name "+12C")
(node (ref "C2") (pin "1"))
(node (ref "D1") (pin "1") (pinfunction "K"))
@ -804,42 +803,42 @@
(node (ref "Q6") (pin "3") (pinfunction "C"))
(node (ref "R13") (pin "1"))
(node (ref "R3") (pin "1")))
(net (code "14") (name "Net-(C10-Pad1)")
(node (ref "C10") (pin "1"))
(node (ref "U1") (pin "2") (pinfunction "CAP+")))
(net (code "15") (name "Net-(C10-Pad2)")
(node (ref "C10") (pin "2"))
(node (ref "U1") (pin "4") (pinfunction "CAP-")))
(net (code "16") (name "Net-(C12-Pad1)")
(node (ref "C12") (pin "1"))
(node (ref "R23") (pin "1"))
(node (ref "R6") (pin "2")))
(net (code "17") (name "Net-(C14-Pad1)")
(node (ref "C14") (pin "1"))
(node (ref "R16") (pin "2"))
(node (ref "R24") (pin "1")))
(net (code "18") (name "Net-(C3-Pad2)")
(net (code "14") (name "Net-(C3-Pad2)")
(node (ref "C3") (pin "2"))
(node (ref "R6") (pin "1"))
(node (ref "R7") (pin "2")))
(net (code "19") (name "Net-(C4-Pad1)")
(net (code "15") (name "Net-(C4-Pad1)")
(node (ref "C4") (pin "1"))
(node (ref "R7") (pin "1"))
(node (ref "U3") (pin "5") (pinfunction "+")))
(net (code "20") (name "Net-(C5-Pad1)")
(net (code "16") (name "Net-(C5-Pad1)")
(node (ref "C5") (pin "1"))
(node (ref "R10") (pin "2")))
(net (code "21") (name "Net-(C6-Pad2)")
(net (code "17") (name "Net-(C6-Pad2)")
(node (ref "C6") (pin "2"))
(node (ref "R16") (pin "1"))
(node (ref "R17") (pin "2")))
(net (code "22") (name "Net-(C7-Pad1)")
(net (code "18") (name "Net-(C7-Pad1)")
(node (ref "C7") (pin "1"))
(node (ref "R17") (pin "1"))
(node (ref "U4") (pin "5") (pinfunction "+")))
(net (code "23") (name "Net-(C8-Pad1)")
(net (code "19") (name "Net-(C8-Pad1)")
(node (ref "C8") (pin "1"))
(node (ref "R20") (pin "2")))
(net (code "20") (name "Net-(C10-Pad1)")
(node (ref "C10") (pin "1"))
(node (ref "U1") (pin "2") (pinfunction "CAP+")))
(net (code "21") (name "Net-(C10-Pad2)")
(node (ref "C10") (pin "2"))
(node (ref "U1") (pin "4") (pinfunction "CAP-")))
(net (code "22") (name "Net-(C12-Pad1)")
(node (ref "C12") (pin "1"))
(node (ref "R23") (pin "1"))
(node (ref "R6") (pin "2")))
(net (code "23") (name "Net-(C14-Pad1)")
(node (ref "C14") (pin "1"))
(node (ref "R16") (pin "2"))
(node (ref "R24") (pin "1")))
(net (code "24") (name "Net-(D2-Pad1)")
(node (ref "D2") (pin "1") (pinfunction "K"))
(node (ref "D3") (pin "2") (pinfunction "A")))
@ -912,18 +911,18 @@
(net (code "43") (name "Net-(Q8-Pad2)")
(node (ref "Q8") (pin "2") (pinfunction "B"))
(node (ref "R18") (pin "1")))
(net (code "44") (name "Net-(R11-Pad1)")
(node (ref "R11") (pin "1"))
(node (ref "RV1") (pin "1") (pinfunction "1")))
(net (code "45") (name "Net-(R19-Pad2)")
(node (ref "R19") (pin "2"))
(node (ref "U4") (pin "1")))
(net (code "46") (name "Net-(R21-Pad1)")
(node (ref "R21") (pin "1"))
(node (ref "RV2") (pin "1") (pinfunction "1")))
(net (code "47") (name "Net-(R9-Pad2)")
(net (code "44") (name "Net-(R9-Pad2)")
(node (ref "R9") (pin "2"))
(node (ref "U3") (pin "1")))
(net (code "45") (name "Net-(R11-Pad1)")
(node (ref "R11") (pin "1"))
(node (ref "RV1") (pin "1") (pinfunction "1")))
(net (code "46") (name "Net-(R19-Pad2)")
(node (ref "R19") (pin "2"))
(node (ref "U4") (pin "1")))
(net (code "47") (name "Net-(R21-Pad1)")
(node (ref "R21") (pin "1"))
(node (ref "RV2") (pin "1") (pinfunction "1")))
(net (code "48") (name "Net-(RV1-Pad2)")
(node (ref "RV1") (pin "2") (pinfunction "2"))
(node (ref "U3") (pin "2") (pinfunction "-")))
@ -933,4 +932,8 @@
(net (code "50") (name "VCC")
(node (ref "C1") (pin "1"))
(node (ref "U1") (pin "8") (pinfunction "V+"))
(node (ref "U2") (pin "1") (pinfunction "VO")))))
(node (ref "U2") (pin "1") (pinfunction "VO")))
(net (code "51") (name "no_connect_51")
(node (ref "U1") (pin "6") (pinfunction "LV")))
(net (code "52") (name "no_connect_52")
(node (ref "U1") (pin "7") (pinfunction "OSC")))))

1593
qa/eeschema/data/netlists/video/video.net
View File

File diff suppressed because it is too large Load Diff