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

Fix netlist QA after API changes in 8a12aa4e

This commit is contained in:
Jon Evans 2021-02-21 20:27:38 -05:00
parent ba2d0cdd62
commit 67f16110af
10 changed files with 3343 additions and 3328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/netlist_reader/pcb_netlist.cpp
View File

@ -166,6 +166,9 @@ COMPONENT* NETLIST::GetComponentByReference( const wxString& aReference )
COMPONENT* NETLIST::GetComponentByPath( const KIID_PATH& aUuidPath )
{
if( aUuidPath.empty() )
return nullptr;
KIID comp_uuid = aUuidPath.back();
KIID_PATH base = aUuidPath;

34
qa/eeschema/data/netlists/bus_junctions/bus_junctions.net
View File

@ -1,8 +1,8 @@
(export (version "D")
(export (version "E")
(design
(source "/home/jon/work/kicad/qa/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_sch")
(date "Tue 27 Oct 2020 23:01:38 EDT")
(tool "Eeschema (5.99.0-6634-g49fd95f58-dirty)")
(source "bus_junctions.kicad_sch")
(date "Sun Feb 21 20:25:00 2021")
(tool "Eeschema (5.99.0-9272-g68b81c8271-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
@ -24,18 +24,18 @@
(value "R")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheet name") (value ""))
(property (name "Sheet file") (value "/home/jon/work/kicad/qa/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_sch"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "bus_junctions.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "4f87bd79-9cd8-49be-8f56-d3edf633bdbc"))
(tstamps "4f87bd79-9cd8-49be-8f56-d3edf633bdbc"))
(comp (ref "R2")
(value "R")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheet name") (value ""))
(property (name "Sheet file") (value "/home/jon/work/kicad/qa/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_sch"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "bus_junctions.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "1a4870a5-c247-437a-9d15-5fb81804ce85")))
(tstamps "1a4870a5-c247-437a-9d15-5fb81804ce85")))
(libparts
(libpart (lib "Device") (part "R")
(description "Resistor")
@ -49,14 +49,12 @@
(pins
(pin (num "1") (name "~") (type "passive"))
(pin (num "2") (name "~") (type "passive")))))
(libraries
(library (logical "Device")
(uri "/home/jon/kicad-library/kicad-symbols//Device.kicad_sym")))
(libraries)
(nets
(net (code "1") (name "/D0")
(node (ref "R1") (pin "1")))
(node (ref "R1") (pin "1") (pintype "passive")))
(net (code "2") (name "/D1")
(node (ref "R2") (pin "1")))
(net (code "3") (name "GND")
(node (ref "R1") (pin "2"))
(node (ref "R2") (pin "2")))))
(node (ref "R2") (pin "1") (pintype "passive")))
(net (code "4") (name "GND")
(node (ref "R1") (pin "2") (pintype "passive"))
(node (ref "R2") (pin "2") (pintype "passive")))))

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

File diff suppressed because it is too large Load Diff

54
qa/eeschema/data/netlists/noconnects/noconnects.net
View File

@ -1,8 +1,8 @@
(export (version "D")
(export (version "E")
(design
(source "/home/jon/work/kicad/qa/eeschema/data/netlists/noconnects/noconnects.kicad_sch")
(date "Thu 14 Jan 2021 20:58:07 EST")
(tool "Eeschema (5.99.0-8422-g02681fcf0e)")
(source "noconnects.kicad_sch")
(date "Sun Feb 21 20:25:57 2021")
(tool "Eeschema (5.99.0-9272-g68b81c8271-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
@ -25,10 +25,10 @@
(footprint "Package_DFN_QFN:Infineon_PQFN-22-15-4EP_6x5mm_P0.65mm")
(datasheet "https://www.infineon.com/dgdl/ir4301.pdf?fileId=5546d462533600a4015355d5fc691819")
(libsource (lib "Amplifier_Audio") (part "IR4301") (description "PowIRaudio Integrated Analog Input Class D Audio Amplifier, 160W/4ohm, 80V, PQFN-22"))
(property (name "Sheet name") (value ""))
(property (name "Sheet file") (value "/home/jon/work/kicad/qa/eeschema/data/netlists/noconnects/noconnects.kicad_sch"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "noconnects.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "af06e391-97a5-4828-9343-f3162acaa60a")))
(tstamps "af06e391-97a5-4828-9343-f3162acaa60a")))
(libparts
(libpart (lib "Amplifier_Audio") (part "IR4301")
(description "PowIRaudio Integrated Analog Input Class D Audio Amplifier, 160W/4ohm, 80V, PQFN-22")
@ -55,40 +55,38 @@
(pin (num "12") (name "VP") (type "power_in"))
(pin (num "13") (name "VB") (type "power_in"))
(pin (num "14") (name "CSH") (type "passive"))
(pin (num "15") (name "COM") (type "NotConnected"))
(pin (num "16") (name "PTNC") (type "NotConnected")))))
(libraries
(library (logical "Amplifier_Audio")
(uri "/home/jon/kicad-library/kicad-symbols//Amplifier_Audio.lib")))
(pin (num "15") (name "COM") (type "no_connect"))
(pin (num "16") (name "PTNC") (type "no_connect")))))
(libraries)
(nets
(net (code "1") (name "/VS")
(node (ref "U1") (pin "11") (pinfunction "VS")))
(node (ref "U1") (pin "11") (pinfunction "VS") (pintype "output+no_connect")))
(net (code "2") (name "Net-(U1-Pad7)")
(node (ref "U1") (pin "7") (pinfunction "VSS"))
(node (ref "U1") (pin "9") (pinfunction "COM")))
(node (ref "U1") (pin "7") (pinfunction "VSS") (pintype "power_in"))
(node (ref "U1") (pin "9") (pinfunction "COM") (pintype "power_in")))
(net (code "3") (name "unconnected-(U1-Pad1)")
(node (ref "U1") (pin "1") (pinfunction "VAA")))
(node (ref "U1") (pin "1") (pinfunction "VAA") (pintype "power_in")))
(net (code "4") (name "unconnected-(U1-Pad2)")
(node (ref "U1") (pin "2") (pinfunction "GND")))
(node (ref "U1") (pin "2") (pinfunction "GND") (pintype "power_in")))
(net (code "5") (name "unconnected-(U1-Pad3)")
(node (ref "U1") (pin "3") (pinfunction "IN+")))
(node (ref "U1") (pin "3") (pinfunction "IN+") (pintype "input")))
(net (code "6") (name "unconnected-(U1-Pad4)")
(node (ref "U1") (pin "4") (pinfunction "IN-")))
(node (ref "U1") (pin "4") (pinfunction "IN-") (pintype "input")))
(net (code "7") (name "unconnected-(U1-Pad5)")
(node (ref "U1") (pin "5") (pinfunction "COMP")))
(node (ref "U1") (pin "5") (pinfunction "COMP") (pintype "output")))
(net (code "8") (name "unconnected-(U1-Pad6)")
(node (ref "U1") (pin "6") (pinfunction "CSD")))
(node (ref "U1") (pin "6") (pinfunction "CSD") (pintype "passive+no_connect")))
(net (code "9") (name "unconnected-(U1-Pad8)")
(node (ref "U1") (pin "8") (pinfunction "VCC")))
(node (ref "U1") (pin "8") (pinfunction "VCC") (pintype "power_in")))
(net (code "10") (name "unconnected-(U1-Pad10)")
(node (ref "U1") (pin "10") (pinfunction "VN")))
(node (ref "U1") (pin "10") (pinfunction "VN") (pintype "power_in")))
(net (code "11") (name "unconnected-(U1-Pad12)")
(node (ref "U1") (pin "12") (pinfunction "VP")))
(node (ref "U1") (pin "12") (pinfunction "VP") (pintype "power_in")))
(net (code "12") (name "unconnected-(U1-Pad13)")
(node (ref "U1") (pin "13") (pinfunction "VB")))
(node (ref "U1") (pin "13") (pinfunction "VB") (pintype "power_in")))
(net (code "13") (name "unconnected-(U1-Pad14)")
(node (ref "U1") (pin "14") (pinfunction "CSH")))
(node (ref "U1") (pin "14") (pinfunction "CSH") (pintype "passive")))
(net (code "14") (name "unconnected-(U1-Pad15)")
(node (ref "U1") (pin "15") (pinfunction "COM")))
(node (ref "U1") (pin "15") (pinfunction "COM") (pintype "no_connect")))
(net (code "15") (name "unconnected-(U1-Pad16)")
(node (ref "U1") (pin "16") (pinfunction "PTNC")))))
(node (ref "U1") (pin "16") (pinfunction "PTNC") (pintype "no_connect")))))

28
qa/eeschema/data/netlists/test_global_promotion/test_global_promotion.net
View File

@ -1,15 +1,15 @@
(export (version "D")
(export (version "E")
(design
(source "test_global_promotion.sch")
(date "Sun 19 Apr 2020 16:13:42 EDT")
(tool "Eeschema (5.99.0-1347-g0d2b30b74-dirty)")
(source "test_global_promotion.kicad_sch")
(date "Sun Feb 21 20:17:19 2021")
(tool "Eeschema (5.99.0-9272-g68b81c8271-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
(company)
(rev)
(date)
(source "test_global_promotion.sch")
(source "test_global_promotion.kicad_sch")
(comment (number "1") (value ""))
(comment (number "2") (value ""))
(comment (number "3") (value ""))
@ -25,7 +25,7 @@
(company)
(rev)
(date)
(source "Sub.sch")
(source "Sub.kicad_sch")
(comment (number "1") (value ""))
(comment (number "2") (value ""))
(comment (number "3") (value ""))
@ -41,15 +41,19 @@
(footprint "Capacitor_THT:CP_Axial_L18.0mm_D8.0mm_P25.00mm_Horizontal")
(datasheet "~")
(libsource (lib "Device") (part "C") (description "Unpolarized capacitor"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "test_global_promotion.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00005e68c688"))
(tstamps "00000000-0000-0000-0000-00005e68c688"))
(comp (ref "R1")
(value "R")
(footprint "Resistor_THT:R_Axial_Power_L25.0mm_W6.4mm_P30.48mm")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "test_global_promotion.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00005e68b6bd")))
(tstamps "00000000-0000-0000-0000-00005e68b6bd")))
(libparts
(libpart (lib "Device") (part "C")
(description "Unpolarized capacitor")
@ -78,9 +82,9 @@
(libraries)
(nets
(net (code "1") (name "5V")
(node (ref "R1") (pin "1")))
(node (ref "R1") (pin "1") (pintype "passive")))
(net (code "2") (name "5Vanalog")
(node (ref "C1") (pin "1"))
(node (ref "R1") (pin "2")))
(node (ref "C1") (pin "1") (pintype "passive"))
(node (ref "R1") (pin "2") (pintype "passive")))
(net (code "3") (name "GND")
(node (ref "C1") (pin "2")))))
(node (ref "C1") (pin "2") (pintype "passive")))))

60
qa/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.net
View File

@ -1,8 +1,8 @@
(export (version "D")
(export (version "E")
(design
(source "test_global_promotion_2.kicad_sch")
(date "Sat 23 May 2020 22:47:31 EDT")
(tool "Eeschema (5.99.0-1770-gd6a274607)")
(date "Sun Feb 21 20:23:42 2021")
(tool "Eeschema (5.99.0-9272-g68b81c8271-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
@ -57,47 +57,58 @@
(footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical")
(datasheet "~")
(libsource (lib "Connector") (part "Conn_01x03_Male") (description "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "test_global_promotion_2.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00005ccf482d"))
(tstamps "00000000-0000-0000-0000-00005ccf482d"))
(comp (ref "J2")
(value "Conn_01x03_Male")
(footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical")
(datasheet "~")
(libsource (lib "Connector") (part "Conn_01x03_Male") (description "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)"))
(property (name "Sheetname") (value ""))
(property (name "Sheetfile") (value "test_global_promotion_2.kicad_sch"))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00005cc1686d"))
(tstamps "00000000-0000-0000-0000-00005cc1686d"))
(comp (ref "R1")
(value "R")
(footprint "Resistor_SMD:R_0603_1608Metric")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheetname") (value "Sheet5CC15EF8"))
(property (name "Sheetfile") (value "subsheet.kicad_sch"))
(sheetpath (names "/Sheet5CC15EF8/") (tstamps "/00000000-0000-0000-0000-00005cc15ef9/"))
(tstamp "00000000-0000-0000-0000-00005cc15f6f"))
(tstamps "00000000-0000-0000-0000-00005cc15f6f"))
(comp (ref "R2")
(value "R")
(footprint "Resistor_SMD:R_0603_1608Metric")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheetname") (value "Sheet5CC15EF8"))
(property (name "Sheetfile") (value "subsheet.kicad_sch"))
(sheetpath (names "/Sheet5CC15EF8/") (tstamps "/00000000-0000-0000-0000-00005cc15ef9/"))
(tstamp "00000000-0000-0000-0000-00005ce0545a"))
(tstamps "00000000-0000-0000-0000-00005ce0545a"))
(comp (ref "R3")
(value "R")
(footprint "Resistor_SMD:R_0603_1608Metric")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheetname") (value "sheet5CC165F1"))
(property (name "Sheetfile") (value "subsheet.kicad_sch"))
(sheetpath (names "/sheet5CC165F1/") (tstamps "/00000000-0000-0000-0000-00005cc165f1/"))
(tstamp "00000000-0000-0000-0000-00005cc15f6f"))
(tstamps "00000000-0000-0000-0000-00005cc15f6f"))
(comp (ref "R4")
(value "R")
(footprint "Resistor_SMD:R_0603_1608Metric")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheetname") (value "sheet5CC165F1"))
(property (name "Sheetfile") (value "subsheet.kicad_sch"))
(sheetpath (names "/sheet5CC165F1/") (tstamps "/00000000-0000-0000-0000-00005cc165f1/"))
(tstamp "00000000-0000-0000-0000-00005ce0545a")))
(tstamps "00000000-0000-0000-0000-00005ce0545a")))
(libparts
(libpart (lib "Connector") (part "Conn_01x03_Male")
(description "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)")
(docs "~")
(footprints
(fp "Connector*:*_1x??_*"))
(fields
@ -109,7 +120,6 @@
(pin (num "3") (name "Pin_3") (type "passive"))))
(libpart (lib "Device") (part "R")
(description "Resistor")
(docs "~")
(footprints
(fp "R_*"))
(fields
@ -121,22 +131,22 @@
(libraries)
(nets
(net (code "1") (name "/LIVE_2")
(node (ref "J2") (pin "2") (pinfunction "Pin_2"))
(node (ref "R3") (pin "1"))
(node (ref "R4") (pin "1")))
(node (ref "J2") (pin "2") (pinfunction "Pin_2") (pintype "passive"))
(node (ref "R3") (pin "1") (pintype "passive"))
(node (ref "R4") (pin "1") (pintype "passive")))
(net (code "2") (name "/Sheet5CC15EF8/LIVE")
(node (ref "J2") (pin "1") (pinfunction "Pin_1"))
(node (ref "R1") (pin "1"))
(node (ref "R2") (pin "1")))
(node (ref "J2") (pin "1") (pinfunction "Pin_1") (pintype "passive"))
(node (ref "R1") (pin "1") (pintype "passive"))
(node (ref "R2") (pin "1") (pintype "passive")))
(net (code "3") (name "/Sheet5CC15EF8/NEUTRAL")
(node (ref "J2") (pin "3") (pinfunction "Pin_3"))
(node (ref "R1") (pin "2"))
(node (ref "R3") (pin "2")))
(node (ref "J2") (pin "3") (pinfunction "Pin_3") (pintype "passive"))
(node (ref "R1") (pin "2") (pintype "passive"))
(node (ref "R3") (pin "2") (pintype "passive")))
(net (code "4") (name "/sheet5CC165F1/LIVE_1")
(node (ref "J1") (pin "2") (pinfunction "Pin_2"))
(node (ref "R4") (pin "2")))
(node (ref "J1") (pin "2") (pinfunction "Pin_2") (pintype "passive"))
(node (ref "R4") (pin "2") (pintype "passive")))
(net (code "5") (name "LIVE")
(node (ref "J1") (pin "1") (pinfunction "Pin_1"))
(node (ref "R2") (pin "2")))
(node (ref "J1") (pin "1") (pinfunction "Pin_1") (pintype "passive"))
(node (ref "R2") (pin "2") (pintype "passive")))
(net (code "6") (name "unconnected-(J1-Pad3)")
(node (ref "J1") (pin "3") (pinfunction "Pin_3")))))
(node (ref "J1") (pin "3") (pinfunction "Pin_3") (pintype "passive")))))

120
qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net
View File

@ -1,8 +1,8 @@
(export (version "D")
(export (version "E")
(design
(source "/home/jon/work/kicad/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch")
(date "Tue 29 Dec 2020 16:36:06 EST")
(tool "Eeschema (5.99.0-7925-g950ccad220-dirty)")
(source "test_hier_renaming.kicad_sch")
(date "Sun Feb 21 20:25:57 2021")
(tool "Eeschema (5.99.0-9272-g68b81c8271-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
@ -56,18 +56,18 @@
(value "788xHG")
(footprint "Display:788xHG")
(libsource (lib "Display_Graphic") (part "788xHG") (description "Bi-color red and green 8x8 LED matrix 20x20 mm"))
(property (name "Sheet name") (value "matrixes1"))
(property (name "Sheet file") (value "LED_matrix_x6.kicad_sch"))
(property (name "Sheetname") (value "matrixes1"))
(property (name "Sheetfile") (value "LED_matrix_x6.kicad_sch"))
(sheetpath (names "/matrixes1/") (tstamps "/0c777b0f-2f12-4510-99ee-a28b103b057a/"))
(tstamp "e63356eb-7345-434d-8464-3fa9dc47789a"))
(tstamps "e63356eb-7345-434d-8464-3fa9dc47789a"))
(comp (ref "DS2")
(value "788xHG")
(footprint "Display:788xHG")
(libsource (lib "Display_Graphic") (part "788xHG") (description "Bi-color red and green 8x8 LED matrix 20x20 mm"))
(property (name "Sheet name") (value "matrixes2"))
(property (name "Sheet file") (value "LED_matrix_x6.kicad_sch"))
(property (name "Sheetname") (value "matrixes2"))
(property (name "Sheetfile") (value "LED_matrix_x6.kicad_sch"))
(sheetpath (names "/matrixes2/") (tstamps "/8fe7e2b2-e224-440a-ae87-ac0912bb533a/"))
(tstamp "e63356eb-7345-434d-8464-3fa9dc47789a")))
(tstamps "e63356eb-7345-434d-8464-3fa9dc47789a")))
(libparts
(libpart (lib "Display_Graphic") (part "788xHG")
(description "Bi-color red and green 8x8 LED matrix 20x20 mm")
@ -100,95 +100,93 @@
(pin (num "22") (name "COL6R") (type "passive"))
(pin (num "23") (name "COL7R") (type "passive"))
(pin (num "24") (name "COL8R") (type "passive")))))
(libraries
(library (logical "Display_Graphic")
(uri "/home/jon/kicad-library/kicad-symbols//Display_Graphic.kicad_sym")))
(libraries)
(nets
(net (code "1") (name "/ROW0")
(node (ref "DS1") (pin "16") (pinfunction "ROW1"))
(node (ref "DS2") (pin "16") (pinfunction "ROW1")))
(node (ref "DS1") (pin "16") (pinfunction "ROW1") (pintype "passive"))
(node (ref "DS2") (pin "16") (pinfunction "ROW1") (pintype "passive")))
(net (code "2") (name "/ROW1")
(node (ref "DS1") (pin "15") (pinfunction "ROW2"))
(node (ref "DS2") (pin "15") (pinfunction "ROW2")))
(node (ref "DS1") (pin "15") (pinfunction "ROW2") (pintype "passive"))
(node (ref "DS2") (pin "15") (pinfunction "ROW2") (pintype "passive")))
(net (code "3") (name "/ROW2")
(node (ref "DS1") (pin "14") (pinfunction "ROW3"))
(node (ref "DS2") (pin "14") (pinfunction "ROW3")))
(node (ref "DS1") (pin "14") (pinfunction "ROW3") (pintype "passive"))
(node (ref "DS2") (pin "14") (pinfunction "ROW3") (pintype "passive")))
(net (code "4") (name "/ROW3")
(node (ref "DS1") (pin "13") (pinfunction "ROW4"))
(node (ref "DS2") (pin "13") (pinfunction "ROW4")))
(node (ref "DS1") (pin "13") (pinfunction "ROW4") (pintype "passive"))
(node (ref "DS2") (pin "13") (pinfunction "ROW4") (pintype "passive")))
(net (code "5") (name "/ROW4")
(node (ref "DS1") (pin "12") (pinfunction "ROW5"))
(node (ref "DS2") (pin "12") (pinfunction "ROW5")))
(node (ref "DS1") (pin "12") (pinfunction "ROW5") (pintype "passive"))
(node (ref "DS2") (pin "12") (pinfunction "ROW5") (pintype "passive")))
(net (code "6") (name "/ROW5")
(node (ref "DS1") (pin "11") (pinfunction "ROW6"))
(node (ref "DS2") (pin "11") (pinfunction "ROW6")))
(node (ref "DS1") (pin "11") (pinfunction "ROW6") (pintype "passive"))
(node (ref "DS2") (pin "11") (pinfunction "ROW6") (pintype "passive")))
(net (code "7") (name "/ROW6")
(node (ref "DS1") (pin "10") (pinfunction "ROW7"))
(node (ref "DS2") (pin "10") (pinfunction "ROW7")))
(node (ref "DS1") (pin "10") (pinfunction "ROW7") (pintype "passive"))
(node (ref "DS2") (pin "10") (pinfunction "ROW7") (pintype "passive")))
(net (code "8") (name "/ROW7")
(node (ref "DS1") (pin "9") (pinfunction "ROW8"))
(node (ref "DS2") (pin "9") (pinfunction "ROW8")))
(node (ref "DS1") (pin "9") (pinfunction "ROW8") (pintype "passive"))
(node (ref "DS2") (pin "9") (pinfunction "ROW8") (pintype "passive")))
(net (code "12") (name "unconnected-(DS1-Pad1)")
(node (ref "DS1") (pin "1") (pinfunction "COL1G")))
(node (ref "DS1") (pin "1") (pinfunction "COL1G") (pintype "passive")))
(net (code "13") (name "unconnected-(DS1-Pad2)")
(node (ref "DS1") (pin "2") (pinfunction "COL2G")))
(node (ref "DS1") (pin "2") (pinfunction "COL2G") (pintype "passive")))
(net (code "14") (name "unconnected-(DS1-Pad3)")
(node (ref "DS1") (pin "3") (pinfunction "COL3G")))
(node (ref "DS1") (pin "3") (pinfunction "COL3G") (pintype "passive")))
(net (code "15") (name "unconnected-(DS1-Pad4)")
(node (ref "DS1") (pin "4") (pinfunction "COL4G")))
(node (ref "DS1") (pin "4") (pinfunction "COL4G") (pintype "passive")))
(net (code "16") (name "unconnected-(DS1-Pad5)")
(node (ref "DS1") (pin "5") (pinfunction "COL5G")))
(node (ref "DS1") (pin "5") (pinfunction "COL5G") (pintype "passive")))
(net (code "17") (name "unconnected-(DS1-Pad6)")
(node (ref "DS1") (pin "6") (pinfunction "COL6G")))
(node (ref "DS1") (pin "6") (pinfunction "COL6G") (pintype "passive")))
(net (code "18") (name "unconnected-(DS1-Pad7)")
(node (ref "DS1") (pin "7") (pinfunction "COL7G")))
(node (ref "DS1") (pin "7") (pinfunction "COL7G") (pintype "passive")))
(net (code "19") (name "unconnected-(DS1-Pad8)")
(node (ref "DS1") (pin "8") (pinfunction "COL8G")))
(node (ref "DS1") (pin "8") (pinfunction "COL8G") (pintype "passive")))
(net (code "20") (name "unconnected-(DS1-Pad17)")
(node (ref "DS1") (pin "17") (pinfunction "COL1R")))
(node (ref "DS1") (pin "17") (pinfunction "COL1R") (pintype "passive")))
(net (code "21") (name "unconnected-(DS1-Pad18)")
(node (ref "DS1") (pin "18") (pinfunction "COL2R")))
(node (ref "DS1") (pin "18") (pinfunction "COL2R") (pintype "passive")))
(net (code "22") (name "unconnected-(DS1-Pad19)")
(node (ref "DS1") (pin "19") (pinfunction "COL3R")))
(node (ref "DS1") (pin "19") (pinfunction "COL3R") (pintype "passive")))
(net (code "23") (name "unconnected-(DS1-Pad20)")
(node (ref "DS1") (pin "20") (pinfunction "COL4R")))
(node (ref "DS1") (pin "20") (pinfunction "COL4R") (pintype "passive")))
(net (code "24") (name "unconnected-(DS1-Pad21)")
(node (ref "DS1") (pin "21") (pinfunction "COL5R")))
(node (ref "DS1") (pin "21") (pinfunction "COL5R") (pintype "passive")))
(net (code "25") (name "unconnected-(DS1-Pad22)")
(node (ref "DS1") (pin "22") (pinfunction "COL6R")))
(node (ref "DS1") (pin "22") (pinfunction "COL6R") (pintype "passive")))
(net (code "26") (name "unconnected-(DS1-Pad23)")
(node (ref "DS1") (pin "23") (pinfunction "COL7R")))
(node (ref "DS1") (pin "23") (pinfunction "COL7R") (pintype "passive")))
(net (code "27") (name "unconnected-(DS1-Pad24)")
(node (ref "DS1") (pin "24") (pinfunction "COL8R")))
(node (ref "DS1") (pin "24") (pinfunction "COL8R") (pintype "passive")))
(net (code "28") (name "unconnected-(DS2-Pad1)")
(node (ref "DS2") (pin "1") (pinfunction "COL1G")))
(node (ref "DS2") (pin "1") (pinfunction "COL1G") (pintype "passive")))
(net (code "29") (name "unconnected-(DS2-Pad2)")
(node (ref "DS2") (pin "2") (pinfunction "COL2G")))
(node (ref "DS2") (pin "2") (pinfunction "COL2G") (pintype "passive")))
(net (code "30") (name "unconnected-(DS2-Pad3)")
(node (ref "DS2") (pin "3") (pinfunction "COL3G")))
(node (ref "DS2") (pin "3") (pinfunction "COL3G") (pintype "passive")))
(net (code "31") (name "unconnected-(DS2-Pad4)")
(node (ref "DS2") (pin "4") (pinfunction "COL4G")))
(node (ref "DS2") (pin "4") (pinfunction "COL4G") (pintype "passive")))
(net (code "32") (name "unconnected-(DS2-Pad5)")
(node (ref "DS2") (pin "5") (pinfunction "COL5G")))
(node (ref "DS2") (pin "5") (pinfunction "COL5G") (pintype "passive")))
(net (code "33") (name "unconnected-(DS2-Pad6)")
(node (ref "DS2") (pin "6") (pinfunction "COL6G")))
(node (ref "DS2") (pin "6") (pinfunction "COL6G") (pintype "passive")))
(net (code "34") (name "unconnected-(DS2-Pad7)")
(node (ref "DS2") (pin "7") (pinfunction "COL7G")))
(node (ref "DS2") (pin "7") (pinfunction "COL7G") (pintype "passive")))
(net (code "35") (name "unconnected-(DS2-Pad8)")
(node (ref "DS2") (pin "8") (pinfunction "COL8G")))
(node (ref "DS2") (pin "8") (pinfunction "COL8G") (pintype "passive")))
(net (code "36") (name "unconnected-(DS2-Pad17)")
(node (ref "DS2") (pin "17") (pinfunction "COL1R")))
(node (ref "DS2") (pin "17") (pinfunction "COL1R") (pintype "passive")))
(net (code "37") (name "unconnected-(DS2-Pad18)")
(node (ref "DS2") (pin "18") (pinfunction "COL2R")))
(node (ref "DS2") (pin "18") (pinfunction "COL2R") (pintype "passive")))
(net (code "38") (name "unconnected-(DS2-Pad19)")
(node (ref "DS2") (pin "19") (pinfunction "COL3R")))
(node (ref "DS2") (pin "19") (pinfunction "COL3R") (pintype "passive")))
(net (code "39") (name "unconnected-(DS2-Pad20)")
(node (ref "DS2") (pin "20") (pinfunction "COL4R")))
(node (ref "DS2") (pin "20") (pinfunction "COL4R") (pintype "passive")))
(net (code "40") (name "unconnected-(DS2-Pad21)")
(node (ref "DS2") (pin "21") (pinfunction "COL5R")))
(node (ref "DS2") (pin "21") (pinfunction "COL5R") (pintype "passive")))
(net (code "41") (name "unconnected-(DS2-Pad22)")
(node (ref "DS2") (pin "22") (pinfunction "COL6R")))
(node (ref "DS2") (pin "22") (pinfunction "COL6R") (pintype "passive")))
(net (code "42") (name "unconnected-(DS2-Pad23)")
(node (ref "DS2") (pin "23") (pinfunction "COL7R")))
(node (ref "DS2") (pin "23") (pinfunction "COL7R") (pintype "passive")))
(net (code "43") (name "unconnected-(DS2-Pad24)")
(node (ref "DS2") (pin "24") (pinfunction "COL8R")))))
(node (ref "DS2") (pin "24") (pinfunction "COL8R") (pintype "passive")))))

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

File diff suppressed because it is too large Load Diff

54
qa/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.net
View File

@ -1,15 +1,15 @@
(export (version "D")
(export (version "E")
(design
(source "/home/jon/Downloads/kicad_bugs/5925/5925.kicad_sch")
(date "Thu 08 Oct 2020 22:18:41 EDT")
(tool "Eeschema (5.99.0-3905-gefcf7a6f1-dirty)")
(source "weak_vector_bus_disambiguation.kicad_sch")
(date "Sun Feb 21 20:25:00 2021")
(tool "Eeschema (5.99.0-9272-g68b81c8271-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
(company)
(rev)
(date)
(source "5925.kicad_sch")
(source "weak_vector_bus_disambiguation.kicad_sch")
(comment (number "1") (value ""))
(comment (number "2") (value ""))
(comment (number "3") (value ""))
@ -72,34 +72,34 @@
(value "R")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheet name") (value "Sub1"))
(property (name "Sheet file") (value "sub1.kicad_sch"))
(property (name "Sheetname") (value "Sub1"))
(property (name "Sheetfile") (value "sub1.kicad_sch"))
(sheetpath (names "/Sub1/") (tstamps "/911370ed-9eca-4408-af70-75f46ccb0cea/"))
(tstamp "549fed29-2fe3-4199-8781-d64e3d55522a"))
(tstamps "549fed29-2fe3-4199-8781-d64e3d55522a"))
(comp (ref "R2")
(value "R")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheet name") (value "Sub2"))
(property (name "Sheet file") (value "sub2.kicad_sch"))
(property (name "Sheetname") (value "Sub2"))
(property (name "Sheetfile") (value "sub2.kicad_sch"))
(sheetpath (names "/Sub2/") (tstamps "/48e15bb3-68ef-4111-84c2-95e07dc0e8bf/"))
(tstamp "2099c994-a92c-409d-a12d-82f6c93cabc6"))
(tstamps "2099c994-a92c-409d-a12d-82f6c93cabc6"))
(comp (ref "R3")
(value "R")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheet name") (value "Merge"))
(property (name "Sheet file") (value "merge.kicad_sch"))
(property (name "Sheetname") (value "Merge"))
(property (name "Sheetfile") (value "merge.kicad_sch"))
(sheetpath (names "/Merge/") (tstamps "/b4665eb8-ef65-4980-bc76-c5100cd8fd0b/"))
(tstamp "a8053649-8fd9-4481-b56e-122d712ddeb5"))
(tstamps "a8053649-8fd9-4481-b56e-122d712ddeb5"))
(comp (ref "R4")
(value "R")
(datasheet "~")
(libsource (lib "Device") (part "R") (description "Resistor"))
(property (name "Sheet name") (value "Merge"))
(property (name "Sheet file") (value "merge.kicad_sch"))
(property (name "Sheetname") (value "Merge"))
(property (name "Sheetfile") (value "merge.kicad_sch"))
(sheetpath (names "/Merge/") (tstamps "/b4665eb8-ef65-4980-bc76-c5100cd8fd0b/"))
(tstamp "2eeee84e-974a-4768-b3a0-fdfaed463e15")))
(tstamps "2eeee84e-974a-4768-b3a0-fdfaed463e15")))
(libparts
(libpart (lib "Device") (part "R")
(description "Resistor")
@ -113,19 +113,17 @@
(pins
(pin (num "1") (name "~") (type "passive"))
(pin (num "2") (name "~") (type "passive")))))
(libraries
(library (logical "Device")
(uri "/home/jon/kicad-library/kicad-symbols//Device.kicad_sym")))
(libraries)
(nets
(net (code "1") (name "/Merge/A1")
(node (ref "R1") (pin "1"))
(node (ref "R3") (pin "1")))
(node (ref "R1") (pin "1") (pintype "passive"))
(node (ref "R3") (pin "1") (pintype "passive")))
(net (code "2") (name "/Merge/A2")
(node (ref "R1") (pin "2"))
(node (ref "R3") (pin "2")))
(node (ref "R1") (pin "2") (pintype "passive"))
(node (ref "R3") (pin "2") (pintype "passive")))
(net (code "4") (name "/Merge/D1")
(node (ref "R2") (pin "1"))
(node (ref "R4") (pin "1")))
(node (ref "R2") (pin "1") (pintype "passive"))
(node (ref "R4") (pin "1") (pintype "passive")))
(net (code "5") (name "/Merge/D2")
(node (ref "R2") (pin "2"))
(node (ref "R4") (pin "2")))))
(node (ref "R2") (pin "2") (pintype "passive"))
(node (ref "R4") (pin "2") (pintype "passive")))))

8
qa/eeschema/test_netlists.cpp
View File

@ -177,7 +177,13 @@ void TEST_NETLISTS_FIXTURE::compareNetlists()
BOOST_REQUIRE_NE( refComp, nullptr );
// Retrieval by KIID
COMPONENT* pathComp = test.GetComponentByPath( goldenComp->GetPath() );
KIID_PATH path = goldenComp->GetPath();
BOOST_REQUIRE( !goldenComp->GetKIIDs().empty() );
path.push_back( goldenComp->GetKIIDs().front() );
COMPONENT* pathComp = test.GetComponentByPath( path );
BOOST_REQUIRE_NE( pathComp, nullptr );
// We should have found the same component