Update netlist testcases

This commit is contained in:
Jon Evans 2020-05-23 18:41:15 -04:00
parent f7578eb038
commit f730aa7834
7 changed files with 681 additions and 683 deletions

View File

@ -1,15 +1,15 @@
(export (version "D")
(design
(source "/home/jon/work/kicad-master/qa/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.sch")
(date "Sun 19 Apr 2020 16:13:41 EDT")
(tool "Eeschema (5.99.0-1347-g0d2b30b74-dirty)")
(source "complex_hierarchy.kicad_sch")
(date "Sat 23 May 2020 18:33:17 EDT")
(tool "Eeschema (5.99.0-1765-g8145dc3d5-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title "Complex hierarchy: demo")
(company)
(rev)
(date "2017-01-15")
(source "complex_hierarchy.sch")
(source "complex_hierarchy.kicad_sch")
(comment (number "1") (value ""))
(comment (number "2") (value ""))
(comment (number "3") (value ""))
@ -25,7 +25,7 @@
(company)
(rev "1")
(date "2017-01-15")
(source "ampli_ht.sch")
(source "ampli_ht.kicad_sch")
(comment (number "1") (value ""))
(comment (number "2") (value ""))
(comment (number "3") (value ""))
@ -41,7 +41,7 @@
(company)
(rev "1")
(date "2017-01-15")
(source "ampli_ht.sch")
(source "ampli_ht.kicad_sch")
(comment (number "1") (value ""))
(comment (number "2") (value ""))
(comment (number "3") (value ""))
@ -58,18 +58,6 @@
(libsource (lib "complex_hierarchy_schlib") (part "CP") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b03cec2"))
(comp (ref "C10")
(value "10uF")
(footprint "Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal")
(libsource (lib "complex_hierarchy_schlib") (part "CP") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b4b15e7"))
(comp (ref "C11")
(value "10uF")
(footprint "Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal")
(libsource (lib "complex_hierarchy_schlib") (part "CP") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b4b15d9"))
(comp (ref "C2")
(value "47uF/20V")
(footprint "Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal")
@ -82,6 +70,18 @@
(libsource (lib "complex_hierarchy_schlib") (part "CP") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b3a1558"))
(comp (ref "C10")
(value "10uF")
(footprint "Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal")
(libsource (lib "complex_hierarchy_schlib") (part "CP") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b4b15e7"))
(comp (ref "C11")
(value "10uF")
(footprint "Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal")
(libsource (lib "complex_hierarchy_schlib") (part "CP") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b4b15d9"))
(comp (ref "D1")
(value "1N4007")
(footprint "Diode_THT:D_DO-41_SOD81_P12.70mm_Horizontal")
@ -112,12 +112,6 @@
(libsource (lib "complex_hierarchy_schlib") (part "7805") (description ""))
(sheetpath (names "/") (tstamps "/"))
(tstamp "00000000-0000-0000-0000-00004b4b1532"))
(comp (ref "C12")
(value "150nF")
(footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
(libsource (lib "complex_hierarchy_schlib") (part "C") (description ""))
(sheetpath (names "/ampli_ht_vertical/") (tstamps "/00000000-0000-0000-0000-00004b3a1333/"))
(tstamp "00000000-0000-0000-0000-00004b4f3641"))
(comp (ref "C3")
(value "15nF")
(footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
@ -136,6 +130,12 @@
(libsource (lib "complex_hierarchy_schlib") (part "C") (description ""))
(sheetpath (names "/ampli_ht_vertical/") (tstamps "/00000000-0000-0000-0000-00004b3a1333/"))
(tstamp "00000000-0000-0000-0000-00004b3a1365"))
(comp (ref "C12")
(value "150nF")
(footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
(libsource (lib "complex_hierarchy_schlib") (part "C") (description ""))
(sheetpath (names "/ampli_ht_vertical/") (tstamps "/00000000-0000-0000-0000-00004b3a1333/"))
(tstamp "00000000-0000-0000-0000-00004b4f3641"))
(comp (ref "D2")
(value "1N4148")
(footprint "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal")
@ -283,15 +283,9 @@
(comp (ref "U3")
(value "LM358N")
(footprint "Package_DIP:DIP-8_W7.62mm_LongPads")
(libsource (lib "") (part "LM358N") (description ""))
(libsource (lib "complex_hierarchy_schlib") (part "LM358N") (description ""))
(sheetpath (names "/ampli_ht_vertical/") (tstamps "/00000000-0000-0000-0000-00004b3a1333/"))
(tstamp "00000000-0000-0000-0000-00004b3a1368"))
(comp (ref "C14")
(value "150nF")
(footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
(libsource (lib "complex_hierarchy_schlib") (part "C") (description ""))
(sheetpath (names "/ampli_ht_horizontal/") (tstamps "/00000000-0000-0000-0000-00004b3a13a4/"))
(tstamp "00000000-0000-0000-0000-00004b4f3641"))
(comp (ref "C6")
(value "15nF")
(footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
@ -310,6 +304,12 @@
(libsource (lib "complex_hierarchy_schlib") (part "C") (description ""))
(sheetpath (names "/ampli_ht_horizontal/") (tstamps "/00000000-0000-0000-0000-00004b3a13a4/"))
(tstamp "00000000-0000-0000-0000-00004b3a1365"))
(comp (ref "C14")
(value "150nF")
(footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
(libsource (lib "complex_hierarchy_schlib") (part "C") (description ""))
(sheetpath (names "/ampli_ht_horizontal/") (tstamps "/00000000-0000-0000-0000-00004b3a13a4/"))
(tstamp "00000000-0000-0000-0000-00004b4f3641"))
(comp (ref "D5")
(value "1N4148")
(footprint "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal")
@ -457,23 +457,10 @@
(comp (ref "U4")
(value "LM358N")
(footprint "Package_DIP:DIP-8_W7.62mm_LongPads")
(libsource (lib "") (part "LM358N") (description ""))
(libsource (lib "complex_hierarchy_schlib") (part "LM358N") (description ""))
(sheetpath (names "/ampli_ht_horizontal/") (tstamps "/00000000-0000-0000-0000-00004b3a13a4/"))
(tstamp "00000000-0000-0000-0000-00004b3a1368")))
(libparts
(libpart (lib "") (part "LM358N")
(fields
(field (name "Reference") "U")
(field (name "Value") "LM358N"))
(pins
(pin (num "1") (name "~") (type "output"))
(pin (num "2") (name "-") (type "input"))
(pin (num "3") (name "+") (type "input"))
(pin (num "4") (name "V-") (type "power_in"))
(pin (num "5") (name "+") (type "input"))
(pin (num "6") (name "-") (type "input"))
(pin (num "7") (name "~") (type "output"))
(pin (num "8") (name "V+") (type "power_in"))))
(libpart (lib "complex_hierarchy_schlib") (part "7805")
(fields
(field (name "Reference") "U")
@ -541,6 +528,19 @@
(pin (num "6") (name "LV") (type "input"))
(pin (num "7") (name "OSC") (type "input"))
(pin (num "8") (name "V+") (type "power_in"))))
(libpart (lib "complex_hierarchy_schlib") (part "LM358N")
(fields
(field (name "Reference") "U")
(field (name "Value") "LM358N"))
(pins
(pin (num "1") (name "~") (type "output"))
(pin (num "2") (name "-") (type "input"))
(pin (num "3") (name "+") (type "input"))
(pin (num "4") (name "V-") (type "power_in"))
(pin (num "5") (name "+") (type "input"))
(pin (num "6") (name "-") (type "input"))
(pin (num "7") (name "~") (type "output"))
(pin (num "8") (name "V+") (type "power_in"))))
(libpart (lib "complex_hierarchy_schlib") (part "MPSA42")
(footprints
(fp "TO92-CBE"))
@ -581,9 +581,7 @@
(pins
(pin (num "1") (name "~") (type "passive"))
(pin (num "2") (name "~") (type "passive")))))
(libraries
(library (logical "complex_hierarchy_schlib")
(uri "/home/jon/work/kicad-master/qa/eeschema/data/netlists/complex_hierarchy/complex_hierarchy_schlib.lib")))
(libraries)
(nets
(net (code "1") (name "+12C")
(node (ref "C2") (pin "1"))
@ -800,4 +798,4 @@
(net (code "52") (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")))))

View File

@ -1,6 +1,6 @@
(export (version "D")
(design
(source "/home/jon/work/kicad-master/qa/eeschema/data/netlists/test_global_promotion/test_global_promotion.sch")
(source "test_global_promotion.sch")
(date "Sun 19 Apr 2020 16:13:42 EDT")
(tool "Eeschema (5.99.0-1347-g0d2b30b74-dirty)")
(sheet (number "1") (name "/") (tstamps "/")
@ -75,9 +75,7 @@
(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.lib")))
(libraries)
(nets
(net (code "1") (name "5V")
(node (ref "R1") (pin "1")))
@ -85,4 +83,4 @@
(node (ref "C1") (pin "1"))
(node (ref "R1") (pin "2")))
(net (code "3") (name "GND")
(node (ref "C1") (pin "2")))))
(node (ref "C1") (pin "2")))))

View File

@ -1,6 +1,6 @@
(kicad_sch (version 20200512) (host eeschema "(5.99.0-1712-g5a9e69b14)")
(kicad_sch (version 20200512) (host eeschema "(5.99.0-1770-gd6a274607)")
(page 2 3)
(page 1 3)
(paper "A4")
@ -11,7 +11,7 @@
(property "Footprint" "" (id 2) (at -1.778 0 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(property "Datasheet" "" (id 3) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "R res resistor" (id 4) (at 0 0 0)

View File

@ -1,4 +1,4 @@
(kicad_sch (version 20200512) (host eeschema "(5.99.0-1712-g5a9e69b14)")
(kicad_sch (version 20200512) (host eeschema "(5.99.0-1770-gd6a274607)")
(page 1 3)
@ -11,7 +11,7 @@
(property "Footprint" "" (id 2) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(property "Datasheet" "" (id 3) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "connector" (id 4) (at 0 0 0)
@ -61,6 +61,10 @@
(wire (pts (xy 134.62 74.93) (xy 97.79 74.93)))
(wire (pts (xy 134.62 78.74) (xy 133.35 78.74)))
(label "LIVE_2" (at 107.95 77.47 180)
(effects (font (size 1.27 1.27)) (justify right bottom))
)
(global_label "LIVE" (shape input) (at 133.35 55.88 0)
(effects (font (size 1.27 1.27)) (justify left))
)
@ -90,7 +94,7 @@
)
(sheet (at 134.62 71.12) (size 27.94 17.78)
(stroke (color 174 129 255 1))
(stroke (width 0.1524) (color 174 129 255 1))
(fill (color 255 255 255 0.0000))
(uuid 00000000-0000-0000-0000-00005cc15ef9)
(property "Sheet name" "Sheet5CC15EF8" (id 0) (at 134.62 70.4845 0)
@ -111,7 +115,7 @@
)
(sheet (at 134.62 96.52) (size 27.94 17.78)
(stroke (color 174 129 255 1))
(stroke (width 0.1524) (color 174 129 255 1))
(fill (color 255 255 255 0.0000))
(uuid 00000000-0000-0000-0000-00005cc165f1)
(property "Sheet name" "sheet5CC165F1" (id 0) (at 134.62 95.8845 0)

View File

@ -1,8 +1,8 @@
(export (version "D")
(design
(source "test_global_promotion_2.kicad_sch")
(date "Sat 23 May 2020 16:07:49 EDT")
(tool "Eeschema (5.99.0-1765-g3487670f2-dirty)")
(date "Sat 23 May 2020 22:47:31 EDT")
(tool "Eeschema (5.99.0-1770-gd6a274607)")
(sheet (number "1") (name "/") (tstamps "/")
(title_block
(title)
@ -121,16 +121,16 @@
(libraries)
(nets
(net (code "1") (name "/LIVE")
(node (ref "J2") (pin "2") (pinfunction "Pin_2"))
(node (ref "R3") (pin "1"))
(node (ref "R4") (pin "1")))
(node (ref "J2") (pin "1") (pinfunction "Pin_1"))
(node (ref "R1") (pin "1"))
(node (ref "R2") (pin "1")))
(net (code "2") (name "/LIVE_1")
(node (ref "J1") (pin "2") (pinfunction "Pin_2"))
(node (ref "R4") (pin "2")))
(net (code "3") (name "/LIVE_2")
(node (ref "J2") (pin "1") (pinfunction "Pin_1"))
(node (ref "R1") (pin "1"))
(node (ref "R2") (pin "1")))
(node (ref "J2") (pin "2") (pinfunction "Pin_2"))
(node (ref "R3") (pin "1"))
(node (ref "R4") (pin "1")))
(net (code "4") (name "/NEUTRAL")
(node (ref "J2") (pin "3") (pinfunction "Pin_3"))
(node (ref "R1") (pin "2"))

View File

@ -54,6 +54,6 @@ ERC_CheckBusEntryConflicts=1
ERC_CheckBusToBusConflicts=1
ERC_CheckBusToNetConflicts=1
[sheetnames]
1=896f06f4-e8cf-41ef-8fbc-84e77d98a9ab:
1=68004dfc-62ae-4bb2-9ef3-d0131842bcaa:
2=00000000-0000-0000-0000-00005cc15ef9:Sheet5CC15EF8
3=00000000-0000-0000-0000-00005cc165f1:sheet5CC165F1

File diff suppressed because it is too large Load Diff