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

Fix duplicate UUIDs in test cases.

This commit is contained in:
Jeff Young 2021-11-09 16:12:14 +00:00
parent 54e00569d8
commit 92e2f51f57
5 changed files with 2072 additions and 1900 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qa/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_pro
View File

@ -206,6 +206,7 @@
], ],
"rule_severities": { "rule_severities": {
"bus_definition_conflict": "error", "bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error", "bus_label_syntax": "error",
"bus_to_bus_conflict": "error", "bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error", "bus_to_net_conflict": "error",
@ -262,7 +263,7 @@
} }
], ],
"meta": { "meta": {
"version": 0 "version": 2
}, },
"net_colors": null "net_colors": null
}, },
@ -278,6 +279,7 @@
"page_layout_descr_file": "" "page_layout_descr_file": ""
}, },
"schematic": { "schematic": {
"annotate_start_num": 0,
"drawing": { "drawing": {
"default_bus_thickness": 12.0, "default_bus_thickness": 12.0,
"default_junction_size": 40.0, "default_junction_size": 40.0,
@ -291,20 +293,24 @@
"intersheets_ref_show": false, "intersheets_ref_show": false,
"intersheets_ref_suffix": "", "intersheets_ref_suffix": "",
"junction_size_choice": 3, "junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0, "pin_symbol_size": 25.0,
"text_offset_ratio": 0.3 "text_offset_ratio": 0.3
}, },
"legacy_lib_dir": "", "legacy_lib_dir": "",
"legacy_lib_list": [], "legacy_lib_list": [],
"meta": { "meta": {
"version": 0 "version": 1
}, },
"net_format_name": "", "net_format_name": "",
"ngspice": { "ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": { "meta": {
"version": 0 "version": 0
}, },
"model_mode": 0 "model_mode": 0,
"workbook_filename": ""
}, },
"page_layout_descr_file": "", "page_layout_descr_file": "",
"plot_directory": "", "plot_directory": "",
@ -315,12 +321,12 @@
}, },
"sheets": [ "sheets": [
[ [
"11e07690-3710-4c83-8138-6b14524bb7ee", "94b7d84d-5cf0-4151-be0c-b212c78b99c5",
"" "Filter FC=1000Hz1"
], ],
[ [
"c8464be4-ef62-4ac9-9520-fff745be87bf", "11e07690-3710-4c83-8138-6b14524bb7ee",
"Filter FC=1000Hz" ""
] ]
], ],
"text_variables": {} "text_variables": {}

1679
qa/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_sch
View File

File diff suppressed because it is too large Load Diff

458
qa/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/filter.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20210406) (generator eeschema) (kicad_sch (version 20210621) (generator eeschema)
(uuid 184783f4-f557-41ee-af88-7d281efe2230) (uuid 184783f4-f557-41ee-af88-7d281efe2230)
@ -24,21 +24,24 @@
(xy -0.762 1.27) (xy -0.762 1.27)
(xy 0 2.54) (xy 0 2.54)
) )
(stroke (width 0)) (fill (type none)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
) )
(polyline (polyline
(pts (pts
(xy 0 0) (xy 0 0)
(xy 0 2.54) (xy 0 2.54)
) )
(stroke (width 0)) (fill (type none)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
) )
(polyline (polyline
(pts (pts
(xy 0 2.54) (xy 0 2.54)
(xy 0.762 1.27) (xy 0.762 1.27)
) )
(stroke (width 0)) (fill (type none)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
) )
) )
(symbol "+12V_1_1" (symbol "+12V_1_1"
@ -74,7 +77,8 @@
(xy 0 1.27) (xy 0 1.27)
(xy 0 1.27) (xy 0 1.27)
) )
(stroke (width 0)) (fill (type none)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
) )
(polyline (polyline
(pts (pts
@ -86,7 +90,8 @@
(xy 0 2.032) (xy 0 2.032)
(xy 0 2.032) (xy 0 2.032)
) )
(stroke (width 0)) (fill (type outline)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type outline))
) )
) )
) )
@ -112,14 +117,16 @@
(xy -2.032 -0.762) (xy -2.032 -0.762)
(xy 2.032 -0.762) (xy 2.032 -0.762)
) )
(stroke (width 0.508)) (fill (type none)) (stroke (width 0.508) (type default) (color 0 0 0 0))
(fill (type none))
) )
(polyline (polyline
(pts (pts
(xy -2.032 0.762) (xy -2.032 0.762)
(xy 2.032 0.762) (xy 2.032 0.762)
) )
(stroke (width 0.508)) (fill (type none)) (stroke (width 0.508) (type default) (color 0 0 0 0))
(fill (type none))
) )
) )
(symbol "C_1_1" (symbol "C_1_1"
@ -156,7 +163,8 @@
(xy -1.27 -1.27) (xy -1.27 -1.27)
(xy 0 -1.27) (xy 0 -1.27)
) )
(stroke (width 0)) (fill (type none)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
) )
) )
(symbol "GND_1_1" (symbol "GND_1_1"
@ -187,7 +195,8 @@
(xy -5.08 -5.08) (xy -5.08 -5.08)
(xy -5.08 5.08) (xy -5.08 5.08)
) )
(stroke (width 0)) (fill (type background)) (stroke (width 0) (type default) (color 0 0 0 0))
(fill (type background))
) )
(pin power_in line (at -2.54 -10.16 90) (length 6.35) (pin power_in line (at -2.54 -10.16 90) (length 6.35)
(name "V-" (effects (font (size 1.016 1.016)))) (name "V-" (effects (font (size 1.016 1.016))))
@ -245,7 +254,8 @@
) )
(symbol "R_0_1" (symbol "R_0_1"
(rectangle (start -1.016 -2.54) (end 1.016 2.54) (rectangle (start -1.016 -2.54) (end 1.016 2.54)
(stroke (width 0.254)) (fill (type none)) (stroke (width 0.254) (type default) (color 0 0 0 0))
(fill (type none))
) )
) )
(symbol "R_1_1" (symbol "R_1_1"
@ -262,81 +272,85 @@
) )
(junction (at 144.145 72.39) (diameter 1.016) (color 0 0 0 0)) (junction (at 144.145 72.39) (diameter 1.016) (color 0 0 0 0))
(junction (at 163.195 72.39) (diameter 1.016) (color 0 0 0 0))
(junction (at 182.245 77.47) (diameter 1.016) (color 0 0 0 0)) (junction (at 182.245 77.47) (diameter 1.016) (color 0 0 0 0))
(junction (at 210.185 82.55) (diameter 1.016) (color 0 0 0 0)) (junction (at 210.185 82.55) (diameter 1.016) (color 0 0 0 0))
(junction (at 163.195 72.39) (diameter 1.016) (color 0 0 0 0))
(wire (pts (xy 127 72.39) (xy 130.175 72.39)) (wire (pts (xy 182.245 72.39) (xy 182.245 77.47))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 6c078d28-86e2-42bc-9c2d-d09ec3bbc5eb) (uuid 00606f42-9c1d-4055-8efc-2a5cf2cb8fff)
)
(wire (pts (xy 137.795 72.39) (xy 144.145 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 33988292-82be-4793-8db9-3e60f2ea89ab)
)
(wire (pts (xy 144.145 72.39) (xy 150.495 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 58ba9fca-0020-456c-812a-4df670c67cd5)
)
(wire (pts (xy 144.145 74.93) (xy 144.145 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 4c30e925-68cc-4a66-83f4-f295d90f0179)
)
(wire (pts (xy 144.145 83.82) (xy 144.145 82.55))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 797308fb-1ea7-40c5-b54e-17decb1bdd04)
)
(wire (pts (xy 158.115 72.39) (xy 163.195 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid fa4e47ca-5b1f-4d3b-b79c-d6a9cea1eaa3)
)
(wire (pts (xy 163.195 62.23) (xy 163.195 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 379b8d3a-2be1-46d1-93a9-4766c71fe647)
)
(wire (pts (xy 163.195 72.39) (xy 168.275 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid b629f20a-3de6-4c4c-9e0c-9ecdca952bcd)
)
(wire (pts (xy 173.355 77.47) (xy 173.355 82.55))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid d9c47886-f27a-4b71-946d-643261b27221)
)
(wire (pts (xy 173.355 91.44) (xy 173.355 90.17))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 3b6a8b94-27cf-4665-9ae4-d7aec558019a)
)
(wire (pts (xy 178.435 62.23) (xy 163.195 62.23))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid fc832956-b2d0-45da-bd8d-32419f35e307)
) )
(wire (pts (xy 182.245 72.39) (xy 175.895 72.39)) (wire (pts (xy 182.245 72.39) (xy 175.895 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 29daefe7-f32a-4e7c-9cd9-c3b65efc0666) (uuid 29daefe7-f32a-4e7c-9cd9-c3b65efc0666)
) )
(wire (pts (xy 182.245 72.39) (xy 182.245 77.47))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 00606f42-9c1d-4055-8efc-2a5cf2cb8fff)
)
(wire (pts (xy 182.245 77.47) (xy 173.355 77.47))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid be8d147c-b0c4-4291-a1d0-546cf0d45bcf)
)
(wire (pts (xy 182.245 77.47) (xy 182.245 80.01)) (wire (pts (xy 182.245 77.47) (xy 182.245 80.01))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 31aeffa3-7870-4a46-b879-c2a302fc45bf) (uuid 31aeffa3-7870-4a46-b879-c2a302fc45bf)
) )
(wire (pts (xy 182.245 85.09) (xy 182.245 97.79)) (wire (pts (xy 137.795 72.39) (xy 144.145 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 7a6237f0-26ea-4a29-9c94-cb0ca0401af4) (uuid 33988292-82be-4793-8db9-3e60f2ea89ab)
)
(wire (pts (xy 163.195 62.23) (xy 163.195 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 379b8d3a-2be1-46d1-93a9-4766c71fe647)
)
(wire (pts (xy 173.355 91.44) (xy 173.355 90.17))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 3b6a8b94-27cf-4665-9ae4-d7aec558019a)
)
(wire (pts (xy 144.145 74.93) (xy 144.145 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 4c30e925-68cc-4a66-83f4-f295d90f0179)
)
(wire (pts (xy 144.145 72.39) (xy 150.495 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 58ba9fca-0020-456c-812a-4df670c67cd5)
)
(wire (pts (xy 127 72.39) (xy 130.175 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 6c078d28-86e2-42bc-9c2d-d09ec3bbc5eb)
)
(wire (pts (xy 192.405 71.12) (xy 192.405 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 6ca88f24-3691-42d5-a9c9-1627a51bdd7a)
) )
(wire (pts (xy 182.245 97.79) (xy 210.185 97.79)) (wire (pts (xy 182.245 97.79) (xy 210.185 97.79))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 744f5095-b4a2-4551-bab7-f473fa256786) (uuid 744f5095-b4a2-4551-bab7-f473fa256786)
) )
(wire (pts (xy 192.405 71.12) (xy 192.405 72.39)) (wire (pts (xy 144.145 83.82) (xy 144.145 82.55))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 6ca88f24-3691-42d5-a9c9-1627a51bdd7a) (uuid 797308fb-1ea7-40c5-b54e-17decb1bdd04)
)
(wire (pts (xy 182.245 85.09) (xy 182.245 97.79))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 7a6237f0-26ea-4a29-9c94-cb0ca0401af4)
)
(wire (pts (xy 210.185 82.55) (xy 210.185 62.23))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 9c33cf1d-b36f-4485-aeee-20dcf8bea3d4)
)
(wire (pts (xy 210.185 97.79) (xy 210.185 82.55))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 9e471629-5e91-4879-87d1-fefd2702b7f0)
)
(wire (pts (xy 210.185 62.23) (xy 186.055 62.23))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid a3c941b0-84e6-48ca-a310-681b3195ce7c)
)
(wire (pts (xy 163.195 72.39) (xy 168.275 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid b629f20a-3de6-4c4c-9e0c-9ecdca952bcd)
)
(wire (pts (xy 182.245 77.47) (xy 173.355 77.47))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid be8d147c-b0c4-4291-a1d0-546cf0d45bcf)
)
(wire (pts (xy 173.355 77.47) (xy 173.355 82.55))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid d9c47886-f27a-4b71-946d-643261b27221)
) )
(wire (pts (xy 192.405 93.98) (xy 192.405 92.71)) (wire (pts (xy 192.405 93.98) (xy 192.405 92.71))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
@ -346,21 +360,17 @@
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid e5ba935c-da5c-46e3-b71c-bdcfb7347264) (uuid e5ba935c-da5c-46e3-b71c-bdcfb7347264)
) )
(wire (pts (xy 210.185 62.23) (xy 186.055 62.23))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid a3c941b0-84e6-48ca-a310-681b3195ce7c)
)
(wire (pts (xy 210.185 82.55) (xy 210.185 62.23))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 9c33cf1d-b36f-4485-aeee-20dcf8bea3d4)
)
(wire (pts (xy 210.185 82.55) (xy 241.3 82.55)) (wire (pts (xy 210.185 82.55) (xy 241.3 82.55))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid f6bbf450-8315-4d78-b1dd-3de9cad0b537) (uuid f6bbf450-8315-4d78-b1dd-3de9cad0b537)
) )
(wire (pts (xy 210.185 97.79) (xy 210.185 82.55)) (wire (pts (xy 158.115 72.39) (xy 163.195 72.39))
(stroke (width 0) (type solid) (color 0 0 0 0)) (stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 9e471629-5e91-4879-87d1-fefd2702b7f0) (uuid fa4e47ca-5b1f-4d3b-b79c-d6a9cea1eaa3)
)
(wire (pts (xy 178.435 62.23) (xy 163.195 62.23))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid fc832956-b2d0-45da-bd8d-32419f35e307)
) )
(text "Filter:\nFc =1000Hz" (at 137.795 96.52 0) (text "Filter:\nFc =1000Hz" (at 137.795 96.52 0)
@ -377,46 +387,25 @@
(uuid e253e497-3efd-48d2-a87d-3ca62c9017c4) (uuid e253e497-3efd-48d2-a87d-3ca62c9017c4)
) )
(symbol (lib_id "complex_hierarchy_schlib:-VAA") (at 192.405 93.98 180) (symbol (lib_id "complex_hierarchy_schlib:R") (at 133.985 72.39 270)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid b1d4f16d-b3db-43af-9510-15252f0e89d0) (uuid 081c3c72-72f1-4db7-a695-190810f5e0b2)
(property "Reference" "#PWR042" (id 0) (at 192.405 96.52 0) (property "Reference" "R?" (id 0) (at 133.985 69.85 90))
(effects (font (size 0.508 0.508)) hide) (property "Value" "1K" (id 1) (at 133.985 72.39 90))
(property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 133.985 68.58 90)
(effects (font (size 0.254 0.254)))
) )
(property "Value" "-VAA" (id 1) (at 192.405 96.52 0) (property "Datasheet" "" (id 3) (at 133.985 72.39 0)
(effects (font (size 1.016 1.016)))
)
(property "Footprint" "" (id 2) (at 192.405 93.98 0)
(effects (font (size 0.254 0.254)) hide)
)
(property "Datasheet" "" (id 3) (at 192.405 93.98 0)
(effects (font (size 1.524 1.524)) hide) (effects (font (size 1.524 1.524)) hide)
) )
(pin "1" (uuid 3b1b6f67-94e8-4932-ac4c-a23135371f57)) (pin "1" (uuid fe4c8544-cc61-4710-9ef7-bec88a099a7e))
) (pin "2" (uuid 5a9b17f7-d291-4988-a0d7-382235775c90))
(symbol (lib_id "complex_hierarchy_schlib:+12V") (at 192.405 71.12 0)
(in_bom yes) (on_board yes)
(uuid 51596b74-88f9-41c6-bf3e-4b161083e60a)
(property "Reference" "#U08" (id 0) (at 192.405 72.39 0)
(effects (font (size 0.508 0.508)) hide)
)
(property "Value" "+12V" (id 1) (at 192.405 68.58 0)
(effects (font (size 1.016 1.016)))
)
(property "Footprint" "" (id 2) (at 192.405 71.12 0)
(effects (font (size 0.254 0.254)) hide)
)
(property "Datasheet" "" (id 3) (at 192.405 71.12 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 311bba16-cb61-4668-9f82-b27d3bdef4a4))
) )
(symbol (lib_id "complex_hierarchy_schlib:GND") (at 144.145 83.82 0) (symbol (lib_id "complex_hierarchy_schlib:GND") (at 144.145 83.82 0)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid 13b885fb-5bd2-4588-97c4-2e9d439c6552) (uuid 13b885fb-5bd2-4588-97c4-2e9d439c6552)
(property "Reference" "#PWR040" (id 0) (at 144.145 83.82 0) (property "Reference" "#PWR?" (id 0) (at 144.145 83.82 0)
(effects (font (size 0.762 0.762)) hide) (effects (font (size 0.762 0.762)) hide)
) )
(property "Value" "GND" (id 1) (at 144.145 85.598 0) (property "Value" "GND" (id 1) (at 144.145 85.598 0)
@ -431,126 +420,10 @@
(pin "1" (uuid 6c4d4075-d2ad-4eed-bd58-f23cc053c68f)) (pin "1" (uuid 6c4d4075-d2ad-4eed-bd58-f23cc053c68f))
) )
(symbol (lib_id "complex_hierarchy_schlib:GND") (at 173.355 91.44 0)
(in_bom yes) (on_board yes)
(uuid e20910b1-873d-464d-a97b-5b9569b3bd71)
(property "Reference" "#PWR041" (id 0) (at 173.355 91.44 0)
(effects (font (size 0.762 0.762)) hide)
)
(property "Value" "GND" (id 1) (at 173.355 93.218 0)
(effects (font (size 0.762 0.762)) hide)
)
(property "Footprint" "" (id 2) (at 173.355 91.44 0)
(effects (font (size 0.254 0.254)) hide)
)
(property "Datasheet" "" (id 3) (at 173.355 91.44 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid c2c68297-1855-4362-950d-e1b0a6c48c44))
)
(symbol (lib_id "complex_hierarchy_schlib:R") (at 133.985 72.39 270)
(in_bom yes) (on_board yes)
(uuid 081c3c72-72f1-4db7-a695-190810f5e0b2)
(property "Reference" "R24" (id 0) (at 133.985 69.85 90))
(property "Value" "1K" (id 1) (at 133.985 72.39 90))
(property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 133.985 68.58 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 133.985 72.39 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid fe4c8544-cc61-4710-9ef7-bec88a099a7e))
(pin "2" (uuid 5a9b17f7-d291-4988-a0d7-382235775c90))
)
(symbol (lib_id "complex_hierarchy_schlib:R") (at 154.305 72.39 270)
(in_bom yes) (on_board yes)
(uuid eeb42d24-b703-45f5-b3d4-7bfebac0b2d3)
(property "Reference" "R25" (id 0) (at 154.305 69.85 90))
(property "Value" "22K" (id 1) (at 154.305 72.39 90))
(property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 155.575 74.93 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 154.305 72.39 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 6f70c799-2b6f-4cff-b0a6-dc9a24fde770))
(pin "2" (uuid 53f9e283-3c04-4f09-b773-401fc49cfc96))
)
(symbol (lib_id "complex_hierarchy_schlib:R") (at 172.085 72.39 270)
(in_bom yes) (on_board yes)
(uuid 2c209735-1dbf-4b3e-baa7-bc32ea5dab52)
(property "Reference" "R26" (id 0) (at 172.085 69.85 90))
(property "Value" "22K" (id 1) (at 172.085 72.39 90))
(property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 172.085 68.58 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 172.085 72.39 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 971d3036-730f-4fd7-ac0e-6007db585779))
(pin "2" (uuid 6a36b24a-b149-4ac5-93a5-d5d20061ed3a))
)
(symbol (lib_id "complex_hierarchy_schlib:C") (at 144.145 78.74 0)
(in_bom yes) (on_board yes)
(uuid bab733ae-c848-41b4-980d-e9b38b672102)
(property "Reference" "C12" (id 0) (at 147.955 77.47 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "150nF" (id 1) (at 147.955 80.01 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 151.765 81.28 0)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 144.145 78.74 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 1f57a83e-15c4-4a63-85e7-dbc6a677c91e))
(pin "2" (uuid e772a506-e676-4b71-8b43-960cb67a4011))
)
(symbol (lib_id "complex_hierarchy_schlib:C") (at 173.355 86.36 0)
(in_bom yes) (on_board yes)
(uuid 4455ef3a-e35b-4615-ad5f-26baccc4160f)
(property "Reference" "C13" (id 0) (at 175.895 83.82 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "4.7nF" (id 1) (at 175.895 88.9 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 177.165 90.17 0)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 173.355 86.36 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 9f8f3e41-d120-4b59-b294-c4377a4827a9))
(pin "2" (uuid a9d9bc0e-1521-438a-85b9-27fe3b8b8c8a))
)
(symbol (lib_id "complex_hierarchy_schlib:C") (at 182.245 62.23 270)
(in_bom yes) (on_board yes)
(uuid ae8cd78e-0822-4415-9231-a4c0e273dc45)
(property "Reference" "C11" (id 0) (at 182.245 58.42 90))
(property "Value" "15nF" (id 1) (at 182.245 66.04 90))
(property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 182.245 57.15 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 182.245 62.23 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid faa6f02b-e1c9-408c-abca-2fab27370f6f))
(pin "2" (uuid f829b572-7bf8-44b8-a37f-bea2104437fb))
)
(symbol (lib_id "complex_hierarchy_schlib:LM358N") (at 194.945 82.55 0) (symbol (lib_id "complex_hierarchy_schlib:LM358N") (at 194.945 82.55 0)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid 1ba44369-aca1-4e8e-b594-64d846d506c3) (uuid 1ba44369-aca1-4e8e-b594-64d846d506c3)
(property "Reference" "U4" (id 0) (at 196.215 77.47 0) (property "Reference" "U?" (id 0) (at 196.215 77.47 0)
(effects (font (size 1.524 1.524))) (effects (font (size 1.524 1.524)))
) )
(property "Value" "LM358N" (id 1) (at 198.755 87.63 0)) (property "Value" "LM358N" (id 1) (at 198.755 87.63 0))
@ -566,4 +439,141 @@
(pin "2" (uuid 000610d1-553f-4222-9e5f-1bf4fba437b5)) (pin "2" (uuid 000610d1-553f-4222-9e5f-1bf4fba437b5))
(pin "3" (uuid 9205d067-4474-467a-bc36-0c9afc0bea2c)) (pin "3" (uuid 9205d067-4474-467a-bc36-0c9afc0bea2c))
) )
(symbol (lib_id "complex_hierarchy_schlib:R") (at 172.085 72.39 270)
(in_bom yes) (on_board yes)
(uuid 2c209735-1dbf-4b3e-baa7-bc32ea5dab52)
(property "Reference" "R?" (id 0) (at 172.085 69.85 90))
(property "Value" "22K" (id 1) (at 172.085 72.39 90))
(property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 172.085 68.58 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 172.085 72.39 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 971d3036-730f-4fd7-ac0e-6007db585779))
(pin "2" (uuid 6a36b24a-b149-4ac5-93a5-d5d20061ed3a))
)
(symbol (lib_id "complex_hierarchy_schlib:C") (at 173.355 86.36 0)
(in_bom yes) (on_board yes)
(uuid 4455ef3a-e35b-4615-ad5f-26baccc4160f)
(property "Reference" "C?" (id 0) (at 175.895 83.82 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "4.7nF" (id 1) (at 175.895 88.9 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 177.165 90.17 0)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 173.355 86.36 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 9f8f3e41-d120-4b59-b294-c4377a4827a9))
(pin "2" (uuid a9d9bc0e-1521-438a-85b9-27fe3b8b8c8a))
)
(symbol (lib_id "complex_hierarchy_schlib:+12V") (at 192.405 71.12 0)
(in_bom yes) (on_board yes)
(uuid 51596b74-88f9-41c6-bf3e-4b161083e60a)
(property "Reference" "#U?" (id 0) (at 192.405 72.39 0)
(effects (font (size 0.508 0.508)) hide)
)
(property "Value" "+12V" (id 1) (at 192.405 68.58 0)
(effects (font (size 1.016 1.016)))
)
(property "Footprint" "" (id 2) (at 192.405 71.12 0)
(effects (font (size 0.254 0.254)) hide)
)
(property "Datasheet" "" (id 3) (at 192.405 71.12 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 311bba16-cb61-4668-9f82-b27d3bdef4a4))
)
(symbol (lib_id "complex_hierarchy_schlib:C") (at 182.245 62.23 270)
(in_bom yes) (on_board yes)
(uuid ae8cd78e-0822-4415-9231-a4c0e273dc45)
(property "Reference" "C?" (id 0) (at 182.245 58.42 90))
(property "Value" "15nF" (id 1) (at 182.245 66.04 90))
(property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 182.245 57.15 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 182.245 62.23 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid faa6f02b-e1c9-408c-abca-2fab27370f6f))
(pin "2" (uuid f829b572-7bf8-44b8-a37f-bea2104437fb))
)
(symbol (lib_id "complex_hierarchy_schlib:-VAA") (at 192.405 93.98 180)
(in_bom yes) (on_board yes)
(uuid b1d4f16d-b3db-43af-9510-15252f0e89d0)
(property "Reference" "#PWR?" (id 0) (at 192.405 96.52 0)
(effects (font (size 0.508 0.508)) hide)
)
(property "Value" "-VAA" (id 1) (at 192.405 96.52 0)
(effects (font (size 1.016 1.016)))
)
(property "Footprint" "" (id 2) (at 192.405 93.98 0)
(effects (font (size 0.254 0.254)) hide)
)
(property "Datasheet" "" (id 3) (at 192.405 93.98 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 3b1b6f67-94e8-4932-ac4c-a23135371f57))
)
(symbol (lib_id "complex_hierarchy_schlib:C") (at 144.145 78.74 0)
(in_bom yes) (on_board yes)
(uuid bab733ae-c848-41b4-980d-e9b38b672102)
(property "Reference" "C?" (id 0) (at 147.955 77.47 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "150nF" (id 1) (at 147.955 80.01 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 151.765 81.28 0)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 144.145 78.74 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 1f57a83e-15c4-4a63-85e7-dbc6a677c91e))
(pin "2" (uuid e772a506-e676-4b71-8b43-960cb67a4011))
)
(symbol (lib_id "complex_hierarchy_schlib:GND") (at 173.355 91.44 0)
(in_bom yes) (on_board yes)
(uuid e20910b1-873d-464d-a97b-5b9569b3bd71)
(property "Reference" "#PWR?" (id 0) (at 173.355 91.44 0)
(effects (font (size 0.762 0.762)) hide)
)
(property "Value" "GND" (id 1) (at 173.355 93.218 0)
(effects (font (size 0.762 0.762)) hide)
)
(property "Footprint" "" (id 2) (at 173.355 91.44 0)
(effects (font (size 0.254 0.254)) hide)
)
(property "Datasheet" "" (id 3) (at 173.355 91.44 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid c2c68297-1855-4362-950d-e1b0a6c48c44))
)
(symbol (lib_id "complex_hierarchy_schlib:R") (at 154.305 72.39 270)
(in_bom yes) (on_board yes)
(uuid eeb42d24-b703-45f5-b3d4-7bfebac0b2d3)
(property "Reference" "R?" (id 0) (at 154.305 69.85 90))
(property "Value" "22K" (id 1) (at 154.305 72.39 90))
(property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 155.575 74.93 90)
(effects (font (size 0.254 0.254)))
)
(property "Datasheet" "" (id 3) (at 154.305 72.39 0)
(effects (font (size 1.524 1.524)) hide)
)
(pin "1" (uuid 6f70c799-2b6f-4cff-b0a6-dc9a24fde770))
(pin "2" (uuid 53f9e283-3c04-4f09-b773-401fc49cfc96))
)
) )

28
qa/eeschema/data/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_pro
View File

@ -243,6 +243,7 @@
], ],
"rule_severities": { "rule_severities": {
"bus_definition_conflict": "error", "bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error", "bus_label_syntax": "error",
"bus_to_bus_conflict": "error", "bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error", "bus_to_net_conflict": "error",
@ -299,7 +300,7 @@
} }
], ],
"meta": { "meta": {
"version": 0 "version": 2
}, },
"net_colors": null "net_colors": null
}, },
@ -316,6 +317,7 @@
"page_layout_descr_file": "" "page_layout_descr_file": ""
}, },
"schematic": { "schematic": {
"annotate_start_num": 0,
"drawing": { "drawing": {
"default_bus_thickness": 12.0, "default_bus_thickness": 12.0,
"default_junction_size": 40.0, "default_junction_size": 40.0,
@ -329,20 +331,24 @@
"intersheets_ref_show": false, "intersheets_ref_show": false,
"intersheets_ref_suffix": "", "intersheets_ref_suffix": "",
"junction_size_choice": 3, "junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0, "pin_symbol_size": 25.0,
"text_offset_ratio": 0.3 "text_offset_ratio": 0.3
}, },
"legacy_lib_dir": "", "legacy_lib_dir": "",
"legacy_lib_list": [], "legacy_lib_list": [],
"meta": { "meta": {
"version": 0 "version": 1
}, },
"net_format_name": "Pcbnew", "net_format_name": "Pcbnew",
"ngspice": { "ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": { "meta": {
"version": 0 "version": 0
}, },
"model_mode": 0 "model_mode": 0,
"workbook_filename": ""
}, },
"page_layout_descr_file": "", "page_layout_descr_file": "",
"plot_directory": "", "plot_directory": "",
@ -357,20 +363,20 @@
"" ""
], ],
[ [
"c8464be4-ef62-4ac9-9520-fff745be87bf", "03a904b7-35ae-4638-b544-f09fd9dd68be",
"ampli_ht_vertical" "ampli_ht_vertical1"
], ],
[ [
"c8464be4-ef62-4ac9-9520-fff745be87bf", "94b7d84d-5cf0-4151-be0c-b212c78b99c5",
"Filter FC=1000Hz" "Filter FC=1000Hz1"
], ],
[ [
"00000000-0000-0000-0000-00004b3a13a4", "949a2aff-c8ca-49f8-8dc4-2b01ede0661f",
"ampli_ht_horizontal" "ampli_ht_horizontal1"
], ],
[ [
"c8464be4-ef62-4ac9-9520-fff745be87bf", "94b7d84d-5cf0-4151-be0c-b212c78b99c5",
"Filter FC=1000Hz" "Filter FC=1000Hz1"
] ]
], ],
"text_variables": {} "text_variables": {}

1787
qa/eeschema/data/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_sch
View File

File diff suppressed because it is too large Load Diff