From 4fe9f01eb08f0e960585b95716a0db45f8618643 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 1 Nov 2021 18:36:53 +0100 Subject: [PATCH] Update a few demos --- demos/interf_u/interf_u.kicad_pro | 12 +- .../laser_driver/laser_driver.kicad_pro | 49 +- .../laser_driver/laser_driver.kicad_sch | 323 ++++-- demos/simulation/pspice/pspice.kicad_pro | 49 +- demos/simulation/pspice/pspice.kicad_sch | 505 ++++++---- .../simulation/rectifier/rectifier.kicad_pro | 49 +- .../simulation/rectifier/rectifier.kicad_sch | 92 +- .../sallen_key/sallen_key.kicad_pro | 14 +- .../sallen_key/sallen_key.kicad_sch | 234 +++-- .../v_i_sources/v_i_sources.kicad_pro | 49 +- .../v_i_sources/v_i_sources.kicad_sch | 935 ++++++++++++------ pcb_calculator/transline/units.h | 4 +- 12 files changed, 1627 insertions(+), 688 deletions(-) diff --git a/demos/interf_u/interf_u.kicad_pro b/demos/interf_u/interf_u.kicad_pro index 33bbdf59d3..d50645f3fb 100644 --- a/demos/interf_u/interf_u.kicad_pro +++ b/demos/interf_u/interf_u.kicad_pro @@ -316,6 +316,7 @@ ], "rule_severities": { "bus_definition_conflict": "error", + "bus_entry_needed": "error", "bus_label_syntax": "error", "bus_to_bus_conflict": "error", "bus_to_net_conflict": "error", @@ -398,7 +399,7 @@ } ], "meta": { - "version": 1 + "version": 2 }, "net_colors": null }, @@ -415,6 +416,7 @@ "page_layout_descr_file": "pagelayout_logo.kicad_wks" }, "schematic": { + "annotate_start_num": 0, "drawing": { "default_bus_thickness": 12.0, "default_junction_size": 32.0, @@ -428,20 +430,24 @@ "intersheets_ref_show": false, "intersheets_ref_suffix": "", "junction_size_choice": 3, + "label_size_ratio": 0.1, "pin_symbol_size": 25.0, "text_offset_ratio": 0.1 }, "legacy_lib_dir": "", "legacy_lib_list": [], "meta": { - "version": 0 + "version": 1 }, "net_format_name": "", "ngspice": { + "fix_include_paths": true, + "fix_passive_vals": false, "meta": { "version": 0 }, - "model_mode": 0 + "model_mode": 0, + "workbook_filename": "" }, "page_layout_descr_file": "", "plot_directory": "", diff --git a/demos/simulation/laser_driver/laser_driver.kicad_pro b/demos/simulation/laser_driver/laser_driver.kicad_pro index 3d0fec8e2c..0f4b99792b 100644 --- a/demos/simulation/laser_driver/laser_driver.kicad_pro +++ b/demos/simulation/laser_driver/laser_driver.kicad_pro @@ -29,6 +29,7 @@ "equivalence_files": [] }, "erc": { + "erc_exclusions": [], "meta": { "version": 0 }, @@ -39,6 +40,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -52,6 +54,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -65,6 +68,7 @@ 0, 0, 0, + 0, 1, 0, 1, @@ -78,6 +82,7 @@ 0, 0, 0, + 0, 1, 1, 2, @@ -91,6 +96,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -98,12 +104,27 @@ 0, 2 ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], [ 1, 1, 1, 1, 1, + 0, 1, 1, 1, @@ -117,6 +138,7 @@ 0, 1, 0, + 0, 1, 0, 0, @@ -130,6 +152,7 @@ 1, 2, 0, + 0, 1, 0, 2, @@ -143,6 +166,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -156,6 +180,7 @@ 1, 1, 0, + 0, 1, 0, 2, @@ -174,17 +199,21 @@ 2, 2, 2, + 2, 2 ] ], "rule_severities": { "bus_definition_conflict": "error", + "bus_entry_needed": "error", "bus_label_syntax": "error", "bus_to_bus_conflict": "error", "bus_to_net_conflict": "error", "different_unit_footprint": "error", "different_unit_net": "error", + "duplicate_reference": "error", "duplicate_sheet_names": "error", + "extra_units": "error", "global_label_dangling": "warning", "hier_label_mismatch": "error", "label_dangling": "error", @@ -198,6 +227,8 @@ "pin_to_pin": "warning", "power_pin_not_driven": "error", "similar_labels": "warning", + "unannotated": "error", + "unit_value_mismatch": "error", "unresolved_variable": "error", "wire_dangling": "error" } @@ -231,7 +262,7 @@ } ], "meta": { - "version": 0 + "version": 2 }, "net_colors": null }, @@ -247,6 +278,7 @@ "page_layout_descr_file": "" }, "schematic": { + "annotate_start_num": 0, "drawing": { "default_bus_thickness": 12.0, "default_junction_size": 40.0, @@ -254,20 +286,31 @@ "default_text_size": 50.0, "default_wire_thickness": 6.0, "field_names": [], + "intersheets_ref_own_page": false, "intersheets_ref_prefix": "", "intersheets_ref_short": false, "intersheets_ref_show": false, "intersheets_ref_suffix": "", "junction_size_choice": 3, + "label_size_ratio": 0.3, "pin_symbol_size": 25.0, "text_offset_ratio": 0.3 }, "legacy_lib_dir": "", "legacy_lib_list": [], "meta": { - "version": 0 + "version": 1 }, "net_format_name": "", + "ngspice": { + "fix_include_paths": true, + "fix_passive_vals": false, + "meta": { + "version": 0 + }, + "model_mode": 0, + "workbook_filename": "" + }, "page_layout_descr_file": "", "plot_directory": "", "spice_adjust_passive_values": false, @@ -277,7 +320,7 @@ }, "sheets": [ [ - "8abf6269-0a25-40f2-a0d9-47149e05857b", + "345f09c0-9aae-452d-8e25-bb6665c6b8ac", "" ] ], diff --git a/demos/simulation/laser_driver/laser_driver.kicad_sch b/demos/simulation/laser_driver/laser_driver.kicad_sch index 0cbac48607..47f83e864a 100644 --- a/demos/simulation/laser_driver/laser_driver.kicad_sch +++ b/demos/simulation/laser_driver/laser_driver.kicad_sch @@ -1,6 +1,6 @@ -(kicad_sch (version 20201015) (generator eeschema) +(kicad_sch (version 20210621) (generator eeschema) - (page 1 1) + (uuid 345f09c0-9aae-452d-8e25-bb6665c6b8ac) (paper "A4") @@ -27,14 +27,16 @@ (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 (pts (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" @@ -71,7 +73,8 @@ (xy -1.27 -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" @@ -102,7 +105,8 @@ (xy -5.08 -5.08) (xy -5.08 5.08) ) - (stroke (width 0.254)) (fill (type background)) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "Generic_Opamp_1_1" @@ -150,7 +154,8 @@ (xy -1.27 1.27) (xy -1.27 -1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -158,7 +163,8 @@ (xy -3.175 -1.651) (xy -3.048 -1.016) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -166,7 +172,8 @@ (xy -2.794 -2.032) (xy -2.667 -1.397) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -174,7 +181,8 @@ (xy -1.27 0) (xy 1.27 -1.27) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) ) ) (symbol "LED_1_1" @@ -202,13 +210,13 @@ (effects (font (size 1.524 1.524))) ) (symbol "Q_NPN_CBE_0_1" - (circle (center 1.27 0) (radius 2.8194) (stroke (width 0.254)) (fill (type none))) (polyline (pts (xy 0.635 0.635) (xy 2.54 2.54) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -216,7 +224,8 @@ (xy 2.54 -2.54) (xy 2.54 -2.54) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -224,7 +233,8 @@ (xy 0.635 -1.905) (xy 0.635 -1.905) ) - (stroke (width 0.508)) (fill (type none)) + (stroke (width 0.508) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -234,7 +244,11 @@ (xy 1.27 -1.778) (xy 1.27 -1.778) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (circle (center 1.27 0) (radius 2.8194) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "Q_NPN_CBE_1_1" @@ -270,7 +284,8 @@ ) (symbol "R_0_1" (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" @@ -298,13 +313,16 @@ (effects (font (size 1.524 1.524))) ) (symbol "VDD_0_1" - (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 0) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VDD_1_1" @@ -337,13 +355,13 @@ (effects (font (size 1.524 1.524)) hide) ) (symbol "VSOURCE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 -1.905) (xy 0 1.905) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -352,7 +370,11 @@ (xy 0.635 0.635) (xy 0 1.905) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VSOURCE_1_1" @@ -380,13 +402,16 @@ (effects (font (size 1.524 1.524))) ) (symbol "VSS_0_1" - (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 0) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VSS_1_1" @@ -415,6 +440,12 @@ (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) + (symbol "PWR_FLAG_0_0" + (pin power_out line (at 0 0 90) (length 0) + (name "pwr" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + ) (symbol "PWR_FLAG_0_1" (polyline (pts @@ -425,13 +456,8 @@ (xy 1.016 1.905) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) - ) - ) - (symbol "PWR_FLAG_0_0" - (pin power_out line (at 0 0 90) (length 0) - (name "pwr" (effects (font (size 1.27 1.27)))) - (number "1" (effects (font (size 1.27 1.27)))) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) ) @@ -451,145 +477,250 @@ (wire (pts (xy 67.31 73.66) (xy 67.31 85.09)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 322dbe27-b38a-43c8-b2e4-0b601ddf0a40) ) (wire (pts (xy 67.31 106.68) (xy 67.31 95.25)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2f62686c-c711-4546-b23c-4b6a4d29062a) ) (wire (pts (xy 106.68 73.66) (xy 67.31 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b7e6771d-ff0f-4053-b551-25e26aefdaa6) ) (wire (pts (xy 109.22 91.44) (xy 114.3 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c7f27d3c-e087-4244-b96b-ce2cbb2940a9) ) (wire (pts (xy 114.3 73.66) (xy 118.11 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ec8ae3c7-b7c7-47bc-a29d-e531ccbf6f7c) ) (wire (pts (xy 114.3 91.44) (xy 120.65 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 45af3ada-6154-4556-8c0c-5e4cee5a8aab) ) (wire (pts (xy 114.3 105.41) (xy 114.3 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 09cce4a9-c373-4333-8a42-4ef53bf78c37) ) (wire (pts (xy 114.3 105.41) (xy 129.54 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 3fe25085-bf12-44f8-8b28-775467576a48) ) (wire (pts (xy 118.11 73.66) (xy 152.4 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 472394d8-1b60-45f4-a851-7d55d0d0a80c) ) (wire (pts (xy 118.11 86.36) (xy 118.11 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ebe12a6f-6caf-45ab-a7b3-99e813d6b5df) ) (wire (pts (xy 120.65 86.36) (xy 118.11 86.36)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8f20ba04-4e49-4bb2-9e9a-254d5856f67a) ) (wire (pts (xy 129.54 105.41) (xy 129.54 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b1048214-5e97-404d-a5e3-98e2567acc0d) ) (wire (pts (xy 129.54 105.41) (xy 133.35 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 31121e75-3f90-48dd-9bcc-fe82a7c15bd6) ) (wire (pts (xy 129.54 111.76) (xy 133.35 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 687dd94f-159c-4b41-a9a6-803da892de1a) ) (wire (pts (xy 135.89 88.9) (xy 154.94 88.9)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b5c2d9ea-893a-47dc-a632-0160f6aa7bbb) ) (wire (pts (xy 140.97 105.41) (xy 146.05 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6b9265c1-5bf0-46c3-88c6-c28149d12696) ) (wire (pts (xy 140.97 111.76) (xy 146.05 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 54b16121-76e0-4ca1-835c-5db29d33b07c) ) (wire (pts (xy 146.05 105.41) (xy 149.86 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 64eb337e-6d35-409f-afb6-ace9e7d4da1c) ) (wire (pts (xy 146.05 111.76) (xy 146.05 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0f6f1664-b680-42f1-b77c-eff57dfe0984) ) (wire (pts (xy 149.86 95.25) (xy 162.56 95.25)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 889710ec-1cc1-4a7d-9428-7425c964b8cb) ) (wire (pts (xy 149.86 105.41) (xy 149.86 95.25)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 258382be-4c95-41cb-9b29-e8783be56662) ) (wire (pts (xy 160.02 73.66) (xy 177.8 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 30d5788e-8d65-4809-8ac7-6ec3545dabe9) ) (wire (pts (xy 162.56 93.98) (xy 162.56 95.25)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6ea9f4a3-8276-410c-bd06-33a62131b7c7) ) (wire (pts (xy 162.56 95.25) (xy 162.56 97.79)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d86d9276-e06d-4599-80e8-5d6386f77a0c) ) (wire (pts (xy 162.56 95.25) (xy 172.72 95.25)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid dc089e65-ec1d-4f49-9103-ee8e3dafbf77) ) (wire (pts (xy 162.56 105.41) (xy 162.56 110.49)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d49d4c92-90e7-4e6d-9043-3d791cc32935) ) (wire (pts (xy 162.56 110.49) (xy 162.56 119.38)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0635f3ba-592b-477b-b88b-85297d3f621f) ) (wire (pts (xy 162.56 110.49) (xy 172.72 110.49)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 50f630aa-9af4-478e-a635-d47f53a975e0) ) (wire (pts (xy 172.72 95.25) (xy 172.72 97.79)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid db0bcd5a-e04f-4dd1-8af3-ebbac2f9904a) ) (wire (pts (xy 172.72 110.49) (xy 172.72 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8cfebc97-c8af-4a2f-bb8b-7066b20e4a81) ) (wire (pts (xy 172.72 110.49) (xy 177.8 110.49)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 68adbf0e-0949-43a9-941a-5f772f7e784d) ) (wire (pts (xy 177.8 73.66) (xy 177.8 110.49)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8da935d3-7684-4d23-ac73-c3d5260ebaf0) ) (wire (pts (xy 233.68 53.34) (xy 233.68 54.61)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 40ca5757-c2b4-4804-8836-548fab88b80a) ) (wire (pts (xy 233.68 53.34) (xy 238.76 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c0c7aa26-e750-49a6-975c-9dd4cb9e4b90) ) (wire (pts (xy 234.95 66.04) (xy 245.11 66.04)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 9ac32d1d-d0c7-408f-88e3-94a454ab86b9) ) (wire (pts (xy 237.49 40.64) (xy 245.11 40.64)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 7b3f87c9-f95a-4241-a517-23c734734fdb) ) (wire (pts (xy 238.76 53.34) (xy 238.76 54.61)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 83764fd0-95ca-4a7e-a3fd-1c010a2651ac) ) (wire (pts (xy 238.76 53.34) (xy 245.11 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 94d2a6c4-d3ac-4d5d-8010-fb21530d1e99) ) (wire (pts (xy 245.11 40.64) (xy 245.11 41.91)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5291a971-be67-4846-87da-c226707249fb) ) (wire (pts (xy 245.11 52.07) (xy 245.11 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6c6f452d-9afe-427f-b280-d0cb1d4662f9) ) (wire (pts (xy 245.11 53.34) (xy 245.11 54.61)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4ded3f87-dbb9-401e-8ced-54e2736ad9d6) ) (wire (pts (xy 245.11 66.04) (xy 245.11 64.77)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid af0e6782-b6fa-4cd2-b70d-af94d8d31170) ) (text ".tran 10p 150n" (at 80.01 137.16 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid d2ede8b8-d346-47de-905f-e906f9cac1bf) ) (label "in" (at 92.71 73.66 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid f31eebf6-0a5f-4b16-ad86-c4c03e7a5ba8) ) (label "out" (at 166.37 110.49 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid f9f32c4c-d94f-45c3-bd48-0c84f87c4ae6) + ) + + (symbol (lib_id "laser_driver_schlib:VDD") (at 125.73 81.28 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000057890425) + (property "Reference" "#PWR03" (id 0) (at 125.73 85.09 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VDD" (id 1) (at 126.1618 76.8858 0)) + (property "Footprint" "" (id 2) (at 125.73 81.28 0)) + (property "Datasheet" "" (id 3) (at 125.73 81.28 0)) + (pin "1" (uuid f277988a-24c7-4136-ad01-294432da805b)) + ) + + (symbol (lib_id "laser_driver_schlib:VSS") (at 125.73 96.52 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000057890453) + (property "Reference" "#PWR04" (id 0) (at 125.73 92.71 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VSS" (id 1) (at 125.2728 100.9142 0)) + (property "Footprint" "" (id 2) (at 125.73 96.52 0)) + (property "Datasheet" "" (id 3) (at 125.73 96.52 0)) + (pin "1" (uuid 2d5126a4-7370-47a6-81c3-34bb24d58da1)) + ) + + (symbol (lib_id "laser_driver_schlib:VDD") (at 162.56 83.82 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-00005a0b5a9d) + (property "Reference" "#PWR0101" (id 0) (at 162.56 87.63 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VDD" (id 1) (at 162.9918 79.4258 0)) + (property "Footprint" "" (id 2) (at 162.56 83.82 0)) + (property "Datasheet" "" (id 3) (at 162.56 83.82 0)) + (pin "1" (uuid d19d6ae3-746e-4b6a-b3e0-4dd381515c17)) + ) + + (symbol (lib_id "laser_driver_schlib:VDD") (at 245.11 40.64 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-0000578903c0) + (property "Reference" "#PWR08" (id 0) (at 245.11 44.45 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VDD" (id 1) (at 245.5418 36.2458 0)) + (property "Footprint" "" (id 2) (at 245.11 40.64 0)) + (property "Datasheet" "" (id 3) (at 245.11 40.64 0)) + (pin "1" (uuid 722ebe56-d0d7-47af-9bbc-ca40fbb8a7ee)) + ) + + (symbol (lib_id "laser_driver_schlib:VSS") (at 245.11 66.04 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-0000578903e2) + (property "Reference" "#PWR09" (id 0) (at 245.11 62.23 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VSS" (id 1) (at 244.6528 70.4342 0)) + (property "Footprint" "" (id 2) (at 245.11 66.04 0)) + (property "Datasheet" "" (id 3) (at 245.11 66.04 0)) + (pin "1" (uuid 7a8a6c3e-f769-4f48-8ff0-f26b07ff95a9)) ) (symbol (lib_id "power:PWR_FLAG") (at 233.68 54.61 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "63fc4c18-7f39-4806-9185-c37efcf99579") + (uuid 63fc4c18-7f39-4806-9185-c37efcf99579) (property "Reference" "#FLG0103" (id 0) (at 233.68 56.515 0) (effects (font (size 1.27 1.27)) hide) ) @@ -600,11 +731,12 @@ (property "Datasheet" "~" (id 3) (at 233.68 54.61 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid dbae8912-cf5e-49bd-99e6-85fb634a3299)) ) (symbol (lib_id "power:PWR_FLAG") (at 234.95 66.04 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "a8f4cb9f-5c44-4d92-b170-52e37c1ffbb3") + (uuid a8f4cb9f-5c44-4d92-b170-52e37c1ffbb3) (property "Reference" "#FLG0102" (id 0) (at 234.95 67.945 0) (effects (font (size 1.27 1.27)) hide) ) @@ -615,11 +747,12 @@ (property "Datasheet" "~" (id 3) (at 234.95 66.04 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 5c70cd01-9984-486c-b999-f68f6bd9bdcc)) ) (symbol (lib_id "power:PWR_FLAG") (at 237.49 40.64 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "30468655-fd8b-4bef-8c43-09d939fcbff5") + (uuid 30468655-fd8b-4bef-8c43-09d939fcbff5) (property "Reference" "#FLG0101" (id 0) (at 237.49 38.735 0) (effects (font (size 1.27 1.27)) hide) ) @@ -630,146 +763,104 @@ (property "Datasheet" "~" (id 3) (at 237.49 40.64 0) (effects (font (size 1.27 1.27)) hide) ) - ) - - (symbol (lib_id "laser_driver_schlib:VDD") (at 125.73 81.28 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890425") - (property "Reference" "#PWR03" (id 0) (at 125.73 85.09 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VDD" (id 1) (at 126.1618 76.8858 0)) - (property "Footprint" "" (id 2) (at 125.73 81.28 0)) - (property "Datasheet" "" (id 3) (at 125.73 81.28 0)) - ) - - (symbol (lib_id "laser_driver_schlib:VSS") (at 125.73 96.52 180) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890453") - (property "Reference" "#PWR04" (id 0) (at 125.73 92.71 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VSS" (id 1) (at 125.2728 100.9142 0)) - (property "Footprint" "" (id 2) (at 125.73 96.52 0)) - (property "Datasheet" "" (id 3) (at 125.73 96.52 0)) - ) - - (symbol (lib_id "laser_driver_schlib:VDD") (at 162.56 83.82 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005a0b5a9d") - (property "Reference" "#PWR0101" (id 0) (at 162.56 87.63 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VDD" (id 1) (at 162.9918 79.4258 0)) - (property "Footprint" "" (id 2) (at 162.56 83.82 0)) - (property "Datasheet" "" (id 3) (at 162.56 83.82 0)) - ) - - (symbol (lib_id "laser_driver_schlib:VDD") (at 245.11 40.64 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578903c0") - (property "Reference" "#PWR08" (id 0) (at 245.11 44.45 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VDD" (id 1) (at 245.5418 36.2458 0)) - (property "Footprint" "" (id 2) (at 245.11 40.64 0)) - (property "Datasheet" "" (id 3) (at 245.11 40.64 0)) - ) - - (symbol (lib_id "laser_driver_schlib:VSS") (at 245.11 66.04 180) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578903e2") - (property "Reference" "#PWR09" (id 0) (at 245.11 62.23 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VSS" (id 1) (at 244.6528 70.4342 0)) - (property "Footprint" "" (id 2) (at 245.11 66.04 0)) - (property "Datasheet" "" (id 3) (at 245.11 66.04 0)) + (pin "1" (uuid 45f1295a-cc7e-4b52-84df-1c723b876b60)) ) (symbol (lib_id "laser_driver_schlib:GND") (at 67.31 106.68 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578ec19d") + (uuid 00000000-0000-0000-0000-0000578ec19d) (property "Reference" "#PWR01" (id 0) (at 67.31 113.03 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 67.437 111.0742 0)) (property "Footprint" "" (id 2) (at 67.31 106.68 0)) (property "Datasheet" "" (id 3) (at 67.31 106.68 0)) + (pin "1" (uuid 9f3f68c6-8b3d-4e7b-8e81-a1a2634203b2)) ) (symbol (lib_id "laser_driver_schlib:GND") (at 101.6 91.44 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578ebbe4") + (uuid 00000000-0000-0000-0000-0000578ebbe4) (property "Reference" "#PWR02" (id 0) (at 95.25 91.44 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 97.2058 91.567 0)) (property "Footprint" "" (id 2) (at 101.6 91.44 0)) (property "Datasheet" "" (id 3) (at 101.6 91.44 0)) + (pin "1" (uuid 4acc58ba-17e5-439c-9da3-f728baadbd7b)) ) (symbol (lib_id "laser_driver_schlib:GND") (at 162.56 129.54 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578eb42d") + (uuid 00000000-0000-0000-0000-0000578eb42d) (property "Reference" "#PWR06" (id 0) (at 162.56 135.89 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 162.687 133.9342 0)) (property "Footprint" "" (id 2) (at 162.56 129.54 0)) (property "Datasheet" "" (id 3) (at 162.56 129.54 0)) + (pin "1" (uuid 5e38ebe9-08ac-4584-94b8-eb9b4b4e0fd2)) ) (symbol (lib_id "laser_driver_schlib:GND") (at 238.76 54.61 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578902d2") + (uuid 00000000-0000-0000-0000-0000578902d2) (property "Reference" "#PWR07" (id 0) (at 238.76 60.96 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 238.887 59.0042 0)) (property "Footprint" "" (id 2) (at 238.76 54.61 0)) (property "Datasheet" "" (id 3) (at 238.76 54.61 0)) + (pin "1" (uuid 973adce4-432c-45dc-aefd-9e51b9ae1060)) ) (symbol (lib_id "laser_driver_schlib:R") (at 105.41 91.44 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578ea7ee") + (uuid 00000000-0000-0000-0000-0000578ea7ee) (property "Reference" "R1" (id 0) (at 105.41 86.1822 90)) (property "Value" "220" (id 1) (at 105.41 88.4936 90)) (property "Footprint" "" (id 2) (at 105.41 89.662 90)) (property "Datasheet" "" (id 3) (at 105.41 91.44 0)) + (pin "1" (uuid 9803fd69-1b2e-4769-95c8-844a47371d01)) + (pin "2" (uuid bb369ca0-70cb-4230-a5d0-282d5ee0cc56)) ) (symbol (lib_id "laser_driver_schlib:R") (at 110.49 73.66 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578ebb39") + (uuid 00000000-0000-0000-0000-0000578ebb39) (property "Reference" "R2" (id 0) (at 110.49 68.4022 90)) (property "Value" "160" (id 1) (at 110.49 70.7136 90)) (property "Footprint" "" (id 2) (at 110.49 71.882 90)) (property "Datasheet" "" (id 3) (at 110.49 73.66 0)) + (pin "1" (uuid dec7857d-5997-49b3-9c15-455795db6f2e)) + (pin "2" (uuid b185344b-cb8e-4343-8bd6-e1bf9b957880)) ) (symbol (lib_id "laser_driver_schlib:R") (at 137.16 105.41 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578ea8b4") + (uuid 00000000-0000-0000-0000-0000578ea8b4) (property "Reference" "R3" (id 0) (at 137.16 100.1522 90)) (property "Value" "220" (id 1) (at 137.16 102.4636 90)) (property "Footprint" "" (id 2) (at 137.16 103.632 90)) (property "Datasheet" "" (id 3) (at 137.16 105.41 0)) + (pin "1" (uuid 20bf1e7d-be19-4cd0-abb3-6ddda1a83b13)) + (pin "2" (uuid bceef02f-04ad-4959-a415-a1ed1485af31)) ) (symbol (lib_id "laser_driver_schlib:R") (at 156.21 73.66 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578eba35") + (uuid 00000000-0000-0000-0000-0000578eba35) (property "Reference" "R4" (id 0) (at 156.21 68.4022 90)) (property "Value" "220" (id 1) (at 156.21 70.7136 90)) (property "Footprint" "" (id 2) (at 156.21 71.882 90)) (property "Datasheet" "" (id 3) (at 156.21 73.66 0)) + (pin "1" (uuid b4a2ee67-e3f7-404f-9831-890c4347e933)) + (pin "2" (uuid eecd5373-3205-4d3a-903b-dc8800137c83)) ) (symbol (lib_id "laser_driver_schlib:R") (at 162.56 101.6 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578ea6d8") + (uuid 00000000-0000-0000-0000-0000578ea6d8) (property "Reference" "R5" (id 0) (at 160.8074 100.4316 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -778,11 +869,13 @@ ) (property "Footprint" "" (id 2) (at 164.338 101.6 90)) (property "Datasheet" "" (id 3) (at 162.56 101.6 0)) + (pin "1" (uuid 8180e012-9cef-4346-a906-5fe990559a19)) + (pin "2" (uuid 994f5fec-dfd3-4181-9a21-f981c98b3c7d)) ) (symbol (lib_id "laser_driver_schlib:LED") (at 162.56 124.46 90) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578eb1e8") + (uuid 00000000-0000-0000-0000-0000578eb1e8) (property "Reference" "D1" (id 0) (at 165.3032 123.2916 90) (effects (font (size 1.27 1.27)) (justify right)) ) @@ -809,20 +902,24 @@ (property "Spice_Node_Sequence" "2 1" (id 9) (at 162.56 124.46 90) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 017e0989-e00f-46cc-9694-ef1aa45bf136)) + (pin "2" (uuid 79f4aea1-0515-47a1-80f0-6296a3387ec7)) ) (symbol (lib_id "laser_driver_schlib:C") (at 137.16 111.76 90) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578eb076") + (uuid 00000000-0000-0000-0000-0000578eb076) (property "Reference" "C1" (id 0) (at 137.16 115.824 90)) (property "Value" "1p" (id 1) (at 137.16 118.1354 90)) (property "Footprint" "" (id 2) (at 140.97 110.7948 0)) (property "Datasheet" "" (id 3) (at 137.16 111.76 0)) + (pin "1" (uuid 80bede86-f568-4a91-a8e5-05a2abc4a536)) + (pin "2" (uuid 09ca4b01-5705-46df-af32-4af5eac89e2c)) ) (symbol (lib_id "laser_driver_schlib:C") (at 172.72 101.6 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005789085b") + (uuid 00000000-0000-0000-0000-00005789085b) (property "Reference" "C2" (id 0) (at 169.799 100.4316 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -831,11 +928,13 @@ ) (property "Footprint" "" (id 2) (at 171.7548 97.79 0)) (property "Datasheet" "" (id 3) (at 172.72 101.6 0)) + (pin "1" (uuid 39dd3d6a-df9a-4d64-90ce-c63969bbe542)) + (pin "2" (uuid dd7f4245-8efb-4898-8e29-ff4c82d82dde)) ) (symbol (lib_id "laser_driver_schlib:VSOURCE") (at 67.31 90.17 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057336052") + (uuid 00000000-0000-0000-0000-000057336052) (property "Reference" "V1" (id 0) (at 70.5612 89.0016 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -850,11 +949,13 @@ (property "Spice_Model" "pulse(0 3 100n 1n 1n 20n 100n )" (id 5) (at 67.31 90.17 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 5197a420-36c0-4e94-837c-3869abda7adb)) + (pin "2" (uuid 963aa2ed-8174-4bfb-b58d-9c313f986efb)) ) (symbol (lib_id "laser_driver_schlib:VSOURCE") (at 245.11 46.99 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578900ba") + (uuid 00000000-0000-0000-0000-0000578900ba) (property "Reference" "V2" (id 0) (at 248.3612 45.8216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -872,11 +973,13 @@ (property "Spice_Node_Sequence" "1 2" (id 6) (at 237.49 41.91 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 59def277-e482-49e4-add6-23c83a4a40f8)) + (pin "2" (uuid a39c4b2c-a516-4aca-bbb1-61566aa7552b)) ) (symbol (lib_id "laser_driver_schlib:VSOURCE") (at 245.11 59.69 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890232") + (uuid 00000000-0000-0000-0000-000057890232) (property "Reference" "V3" (id 0) (at 248.3612 58.5216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -894,11 +997,13 @@ (property "Spice_Node_Sequence" "1 2" (id 6) (at 237.49 54.61 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid dc35ef92-0606-4330-8cb1-d06edd284c72)) + (pin "2" (uuid 2948c442-fd64-48d5-9bf5-9bf1d6f9c96a)) ) (symbol (lib_id "laser_driver_schlib:Q_NPN_CBE") (at 160.02 88.9 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578eadcc") + (uuid 00000000-0000-0000-0000-0000578eadcc) (property "Reference" "Q1" (id 0) (at 164.8714 87.7316 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -922,11 +1027,14 @@ (property "Spice_Lib_File" "fzt1049a.lib" (id 8) (at 160.02 88.9 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 075a8c7c-8c08-4a89-bb61-0344115b2289)) + (pin "2" (uuid 19199317-6644-4fd5-bdba-2e53c0ea9083)) + (pin "3" (uuid fe56b655-ba64-4769-806c-0fea7a1f0c4c)) ) (symbol (lib_id "laser_driver_schlib:Generic_Opamp") (at 128.27 88.9 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005788ff9f") + (uuid 00000000-0000-0000-0000-00005788ff9f) (property "Reference" "U1" (id 0) (at 128.27 85.09 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -950,6 +1058,11 @@ (property "Spice_Lib_File" "ad8009.lib" (id 8) (at 128.27 88.9 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c5ddd1b2-802e-4d44-a9a8-5fd98b85169e)) + (pin "2" (uuid 80f4fcf7-6b65-4e5c-a550-c3831bb0b43b)) + (pin "3" (uuid 39576561-900c-4bb3-8e71-d4a42b9eec4d)) + (pin "4" (uuid 018b4743-3f9d-4a1a-a0ee-da99f89800e3)) + (pin "5" (uuid 7f0810ec-9686-4533-b099-7c8b8e4f9857)) ) (sheet_instances diff --git a/demos/simulation/pspice/pspice.kicad_pro b/demos/simulation/pspice/pspice.kicad_pro index 847eb1007b..63e96471b6 100644 --- a/demos/simulation/pspice/pspice.kicad_pro +++ b/demos/simulation/pspice/pspice.kicad_pro @@ -13,6 +13,7 @@ "equivalence_files": [] }, "erc": { + "erc_exclusions": [], "meta": { "version": 0 }, @@ -23,6 +24,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -36,6 +38,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -49,6 +52,7 @@ 0, 0, 0, + 0, 1, 0, 1, @@ -62,6 +66,7 @@ 0, 0, 0, + 0, 1, 1, 2, @@ -75,6 +80,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -82,12 +88,27 @@ 0, 2 ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], [ 1, 1, 1, 1, 1, + 0, 1, 1, 1, @@ -101,6 +122,7 @@ 0, 1, 0, + 0, 1, 0, 0, @@ -114,6 +136,7 @@ 1, 2, 0, + 0, 1, 0, 2, @@ -127,6 +150,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -140,6 +164,7 @@ 1, 1, 0, + 0, 1, 0, 2, @@ -158,17 +183,21 @@ 2, 2, 2, + 2, 2 ] ], "rule_severities": { "bus_definition_conflict": "error", + "bus_entry_needed": "error", "bus_label_syntax": "error", "bus_to_bus_conflict": "error", "bus_to_net_conflict": "error", "different_unit_footprint": "error", "different_unit_net": "error", + "duplicate_reference": "error", "duplicate_sheet_names": "error", + "extra_units": "error", "global_label_dangling": "warning", "hier_label_mismatch": "error", "label_dangling": "error", @@ -182,6 +211,8 @@ "pin_to_pin": "warning", "power_pin_not_driven": "error", "similar_labels": "warning", + "unannotated": "error", + "unit_value_mismatch": "error", "unresolved_variable": "error", "wire_dangling": "error" } @@ -215,7 +246,7 @@ } ], "meta": { - "version": 0 + "version": 2 }, "net_colors": null }, @@ -231,6 +262,7 @@ "page_layout_descr_file": "" }, "schematic": { + "annotate_start_num": 0, "drawing": { "default_bus_thickness": 12.0, "default_junction_size": 40.0, @@ -238,20 +270,31 @@ "default_text_size": 50.0, "default_wire_thickness": 6.0, "field_names": [], + "intersheets_ref_own_page": false, "intersheets_ref_prefix": "", "intersheets_ref_short": false, "intersheets_ref_show": false, "intersheets_ref_suffix": "", "junction_size_choice": 3, + "label_size_ratio": 0.3, "pin_symbol_size": 25.0, "text_offset_ratio": 0.3 }, "legacy_lib_dir": "", "legacy_lib_list": [], "meta": { - "version": 0 + "version": 1 }, "net_format_name": "", + "ngspice": { + "fix_include_paths": true, + "fix_passive_vals": false, + "meta": { + "version": 0 + }, + "model_mode": 0, + "workbook_filename": "" + }, "page_layout_descr_file": "", "plot_directory": "", "spice_adjust_passive_values": false, @@ -261,7 +304,7 @@ }, "sheets": [ [ - "f677828c-ca14-4db1-bece-cae0f95e097c", + "a4349b77-fc13-4b06-b73d-e811f055a7b6", "" ] ], diff --git a/demos/simulation/pspice/pspice.kicad_sch b/demos/simulation/pspice/pspice.kicad_sch index 3bbbf3afd1..a45f375a90 100644 --- a/demos/simulation/pspice/pspice.kicad_sch +++ b/demos/simulation/pspice/pspice.kicad_sch @@ -1,6 +1,6 @@ -(kicad_sch (version 20201015) (generator eeschema) +(kicad_sch (version 20210621) (generator eeschema) - (page 1 1) + (uuid a4349b77-fc13-4b06-b73d-e811f055a7b6) (paper "A4") @@ -34,21 +34,24 @@ (xy -0.762 1.27) (xy 0 2.54) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 0) (xy 0 2.54) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 2.54) (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" @@ -79,7 +82,8 @@ (xy 1.27 0) (xy -1.27 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "0_1_1" @@ -108,14 +112,16 @@ (xy -3.81 -1.27) (xy 3.81 -1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -3.81 1.27) (xy 3.81 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "C_1_1" @@ -148,14 +154,16 @@ (xy -3.81 -1.27) (xy 3.81 -1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -3.81 1.27) (xy 3.81 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "CAP_1_1" @@ -183,17 +191,21 @@ (effects (font (size 1.27 1.27))) ) (symbol "INDUCTOR_0_1" - (arc (start -2.54 0) (end -5.08 0) (radius (at -3.81 0) (length 1.27) (angles 0.1 179.9)) - (stroke (width 0)) (fill (type none)) + (arc (start -2.54 0) (mid -3.81 1.27) (end -5.08 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end -2.54 0) (radius (at -1.27 0) (length 1.27) (angles 0.1 179.9)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid -1.27 1.27) (end -2.54 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 2.54 0) (end 0 0) (radius (at 1.27 0) (length 1.27) (angles 0.1 179.9)) - (stroke (width 0)) (fill (type none)) + (arc (start 2.54 0) (mid 1.27 1.27) (end 0 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 5.08 0) (end 2.54 0) (radius (at 3.81 0) (length 1.27) (angles 0.1 179.9)) - (stroke (width 0)) (fill (type none)) + (arc (start 5.08 0) (mid 3.81 1.27) (end 2.54 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "INDUCTOR_1_1" @@ -226,6 +238,12 @@ (property "ki_description" "general power-flag symbol" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) + (symbol "PWR_FLAG_0_0" + (pin power_out line (at 0 0 90) (length 0) + (name "pwr" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + ) (symbol "PWR_FLAG_0_1" (polyline (pts @@ -236,13 +254,8 @@ (xy 1.016 1.905) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) - ) - ) - (symbol "PWR_FLAG_0_0" - (pin power_out line (at 0 0 90) (length 0) - (name "pwr" (effects (font (size 1.27 1.27)))) - (number "1" (effects (font (size 1.27 1.27)))) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) ) @@ -265,7 +278,8 @@ (xy 0 0) (xy 3.81 -3.81) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -274,7 +288,8 @@ (xy 1.27 -3.81) (xy 3.81 -3.81) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) ) ) (symbol "QNPN_0_1" @@ -283,14 +298,16 @@ (xy 0 -3.81) (xy 0 3.81) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 0) (xy 3.81 3.81) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "QNPN_1_1" @@ -329,7 +346,8 @@ ) (symbol "R_0_1" (rectangle (start -1.016 3.81) (end 1.016 -3.81) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "R_1_1" @@ -357,16 +375,13 @@ (effects (font (size 1.27 1.27))) ) (symbol "VSOURCE_0_1" - (circle (center 0 0) (radius 10.16) (stroke (width 0)) (fill (type none))) - (text "V" (at -8.128 -0.254 0) - (effects (font (size 2.54 2.54))) - ) (polyline (pts (xy -6.35 -6.35) (xy -6.35 3.81) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) ) (polyline (pts @@ -374,7 +389,14 @@ (xy -6.35 6.35) (xy -5.08 3.81) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (circle (center 0 0) (radius 10.16) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (text "V" (at -8.128 -0.254 0) + (effects (font (size 2.54 2.54))) ) ) (symbol "VSOURCE_1_1" @@ -408,230 +430,414 @@ (wire (pts (xy 72.39 73.66) (xy 72.39 74.93)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 071196ed-da27-476a-a0cf-3f333ddfd057) ) (wire (pts (xy 92.71 106.68) (xy 92.71 107.95)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 7fc661e7-01ba-4f88-9114-d133e8f16294) ) (wire (pts (xy 97.79 106.68) (xy 92.71 106.68)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 426ad71a-f537-4340-9d17-bd6976ea42cb) ) (wire (pts (xy 97.79 106.68) (xy 97.79 107.95)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2ff59997-dc99-4f9e-b240-027ee32648f7) ) (wire (pts (xy 99.06 71.12) (xy 97.79 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 67ca520c-b1f7-4ec4-aeed-eef936981578) ) (wire (pts (xy 111.76 71.12) (xy 129.54 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a3e3cef2-4a3e-4e83-bc7e-bd16ec34782d) ) (wire (pts (xy 129.54 44.45) (xy 129.54 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid faf25f99-bd42-4fd9-803e-8b56942c3a46) ) (wire (pts (xy 129.54 58.42) (xy 129.54 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e70019d3-fef6-4041-8a1f-034b6debb72a) ) (wire (pts (xy 129.54 71.12) (xy 129.54 83.82)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 967b0626-97a8-44ae-beb9-81dad09187c1) ) (wire (pts (xy 129.54 71.12) (xy 134.62 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f848fc76-581c-4ec1-a9b4-2e9145300d0e) ) (wire (pts (xy 129.54 96.52) (xy 129.54 97.79)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 19ce079a-4c44-4644-b081-7350c3495124) ) (wire (pts (xy 146.05 44.45) (xy 146.05 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ebc1e184-b44c-472c-9cbc-7f98641622bc) ) (wire (pts (xy 146.05 62.23) (xy 146.05 58.42)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b2eeea1f-a252-4dec-a257-bb206037aa47) ) (wire (pts (xy 146.05 80.01) (xy 146.05 81.28)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c9a49b89-3193-499c-886c-7e8ce528bbf0) ) (wire (pts (xy 146.05 81.28) (xy 151.13 81.28)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 53963efc-60de-45d6-bb9b-93593840202d) ) (wire (pts (xy 151.13 81.28) (xy 151.13 83.82)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6e1bf9e2-bb2f-4c1f-8fdb-721f4668854f) ) (wire (pts (xy 151.13 81.28) (xy 154.94 81.28)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 52f8accb-4789-4357-96dc-45bd561d3c02) ) (wire (pts (xy 151.13 96.52) (xy 151.13 97.79)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid afb8f4ab-61a7-4a8e-b661-88e8cf32bddd) ) (wire (pts (xy 154.94 44.45) (xy 154.94 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 52d2bcba-3657-42da-9d11-dc00adcfd0d3) ) (wire (pts (xy 154.94 62.23) (xy 154.94 58.42)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid dcea6893-7252-4648-8059-110744638814) ) (wire (pts (xy 154.94 62.23) (xy 179.07 62.23)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f5f5ec59-2fa0-45c7-b03d-657acffa84d5) ) (wire (pts (xy 154.94 81.28) (xy 154.94 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5bdf9160-bb4d-49f7-b6a3-8547979f467b) ) (wire (pts (xy 166.37 71.12) (xy 170.18 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ecfb912b-04c8-4fdf-a910-29d26a062b50) ) (wire (pts (xy 170.18 44.45) (xy 170.18 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid acf74d69-0dc8-4169-8b3f-fc0f4a02302d) ) (wire (pts (xy 170.18 58.42) (xy 170.18 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 13fe4cc2-4713-4347-9b0a-871a110c08a0) ) (wire (pts (xy 170.18 71.12) (xy 170.18 83.82)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5646c709-63d8-410d-92fe-a8fd34175e64) ) (wire (pts (xy 170.18 97.79) (xy 170.18 96.52)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0e50f3ba-e5cc-4d6b-b8e3-78f02877acdf) ) (wire (pts (xy 179.07 62.23) (xy 184.15 62.23)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 09bebe20-6451-4669-930b-103dc0b2dba7) ) (wire (pts (xy 179.07 66.04) (xy 179.07 62.23)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid cb268c38-5321-4c14-a843-72ee2b7e122d) ) (wire (pts (xy 179.07 80.01) (xy 179.07 78.74)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e5557d20-c7f8-4ae0-b970-bdd6c69b4760) ) (wire (pts (xy 190.5 22.86) (xy 190.5 21.59)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 9f7315bf-8633-4c29-9446-76d27ad7a29c) ) (wire (pts (xy 195.58 53.34) (xy 233.68 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 15cdf902-fcf7-4d94-81fd-fe0d44e72b0a) ) (wire (pts (xy 195.58 71.12) (xy 195.58 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 64c85fcd-8a67-490e-a107-403b9c72f66d) ) (wire (pts (xy 195.58 73.66) (xy 195.58 76.2)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a6af4aa0-3b72-4a54-a061-21e658ddd145) ) (wire (pts (xy 195.58 90.17) (xy 195.58 88.9)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5b7f89ab-b381-407e-b6c0-fc629dbd5d7b) ) (wire (pts (xy 198.12 21.59) (xy 198.12 22.86)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 10b3fb20-f1b1-41e1-bc98-d8baf6bdfbf7) ) (wire (pts (xy 198.12 22.86) (xy 190.5 22.86)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5bbfe2bd-e027-4468-a075-692ad4873bd8) ) (wire (pts (xy 198.12 22.86) (xy 198.12 24.13)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5be36789-f7a0-4fdf-8e4d-51a97723f2a8) ) (wire (pts (xy 198.12 36.83) (xy 198.12 38.1)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f0490cbd-9640-4071-b6e9-2d45943c5cd9) ) (wire (pts (xy 198.12 38.1) (xy 198.12 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 26a03db4-b059-4949-b9f1-8c63144d6f3b) ) (wire (pts (xy 198.12 38.1) (xy 204.47 38.1)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1ec5926f-5b51-4547-a7ec-ec7ed2be78ff) ) (wire (pts (xy 198.12 45.72) (xy 208.28 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid de388234-29ba-4a59-8aba-fc793b637ef9) ) (wire (pts (xy 203.2 73.66) (xy 195.58 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 159502ba-ba35-4215-adec-cbc57b77a603) ) (wire (pts (xy 204.47 26.67) (xy 204.47 38.1)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d82ad9ed-1be3-4f15-9e85-d0e07c513f48) ) (wire (pts (xy 204.47 38.1) (xy 209.55 38.1)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 59bd3a54-91fe-4263-a0b2-81bf575707e3) ) (wire (pts (xy 209.55 26.67) (xy 204.47 26.67)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1cdc01c2-befd-471e-8b57-cdc9df67de88) ) (wire (pts (xy 215.9 73.66) (xy 222.25 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 59b6b2e3-00a7-424d-a0eb-79c6d3d57be8) ) (wire (pts (xy 222.25 26.67) (xy 233.68 26.67)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 64ad3867-9129-4101-b945-1b67e3c20007) ) (wire (pts (xy 222.25 71.12) (xy 222.25 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0a9580d0-fb1d-493f-8418-362377bd6c27) ) (wire (pts (xy 222.25 73.66) (xy 222.25 77.47)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2a7e384c-184c-4628-9590-707e283287c6) ) (wire (pts (xy 222.25 77.47) (xy 224.79 77.47)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 751438cf-fa1b-432b-aa2c-784b3f67336b) ) (wire (pts (xy 224.79 71.12) (xy 222.25 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e41dd035-c55c-4a8a-8a3e-53e163aba3ee) ) (wire (pts (xy 233.68 26.67) (xy 233.68 38.1)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d016cecd-179b-4847-a6b2-345ef9666e54) ) (wire (pts (xy 233.68 38.1) (xy 222.25 38.1)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 97781c41-7f58-4dc8-94a8-008f88be770f) ) (wire (pts (xy 233.68 38.1) (xy 233.68 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 27bfd999-856a-497e-a936-d36ce0ecf13d) ) (wire (pts (xy 233.68 45.72) (xy 220.98 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c91305b5-4574-4571-9eed-e12137b78fac) ) (wire (pts (xy 233.68 45.72) (xy 233.68 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 37af9d9d-d86e-44fc-98ef-766e8173dea6) ) (wire (pts (xy 233.68 53.34) (xy 234.95 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid dc007b6d-b1b4-4de4-aded-dc1af4ed1aea) ) (wire (pts (xy 237.49 71.12) (xy 238.76 71.12)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 942325ec-633f-48d4-b3d3-1e46a05f980e) ) (wire (pts (xy 238.76 71.12) (xy 238.76 74.93)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid be59c4b2-2c26-40b4-9a85-be3ad43fa4f8) ) (wire (pts (xy 238.76 74.93) (xy 238.76 77.47)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f6832478-3bab-4e3a-97f3-4fdfc6decb3d) ) (wire (pts (xy 238.76 74.93) (xy 242.57 74.93)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f48b2d93-8bc4-48a9-9657-b502b0b3d326) ) (wire (pts (xy 238.76 77.47) (xy 237.49 77.47)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2c0b3dd4-4daf-4853-95db-20c17416783f) ) (wire (pts (xy 242.57 88.9) (xy 242.57 87.63)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5074d293-d86d-4407-bb3a-708ce04125b6) ) (polyline (pts (xy 27.94 168.91) (xy 27.94 157.48)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 2d5b85aa-3287-4982-a214-9a2130a85d71) ) (polyline (pts (xy 27.94 168.91) (xy 99.06 168.91)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid e0b437bd-99c2-4402-9397-ce3ce17944d0) ) (polyline (pts (xy 99.06 157.48) (xy 27.94 157.48)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 8eac7ae8-5f0f-4caf-8b21-53375bc9a6a3) ) (polyline (pts (xy 99.06 168.91) (xy 99.06 157.48)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 09452a86-f9a8-4cad-bc35-c749894f4c07) ) (text "Pspice directives using one multiline text:" (at 27.94 157.48 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 0ddada8a-70ea-40ec-85b3-fe06299d60b4) ) (text ".model Q2N2222 npn (bf=200)\n.ac dec 100 10 1Meg\n" (at 29.21 165.1 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 3f1c85ee-fda3-40b1-bed1-9da936a0795e) ) (label "VIN" (at 116.84 71.12 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 19c72826-abeb-464e-ace6-d9728a71405b) ) (label "VBASE" (at 158.75 62.23 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 0b1936f2-8ed8-4e2f-a111-c7c832361c5d) ) (global_label "VOUT" (shape output) (at 234.95 53.34 0) (effects (font (size 1.524 1.524)) (justify left)) + (uuid e5aefc98-2a36-4b47-b1b3-6340fc8f1986) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + ) + + (symbol (lib_id "schematic_libspice:+12V") (at 72.39 38.1 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000032cfc34d) + (property "Reference" "#+12V02" (id 0) (at 72.39 33.02 0) + (effects (font (size 1.016 1.016)) hide) + ) + (property "Value" "+12V" (id 1) (at 72.39 34.29 0) + (effects (font (size 1.016 1.016))) + ) + (property "Footprint" "" (id 2) (at 72.39 38.1 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Datasheet" "" (id 3) (at 72.39 38.1 0) + (effects (font (size 1.524 1.524)) hide) + ) + (pin "1" (uuid 94e8202e-f44c-4b4c-ae0f-ded51f92f19a)) + ) + + (symbol (lib_id "schematic_libspice:+12V") (at 129.54 44.45 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000032cfc2f7) + (property "Reference" "#+12V03" (id 0) (at 129.54 39.37 0) + (effects (font (size 1.016 1.016)) hide) + ) + (property "Value" "+12V" (id 1) (at 129.54 40.64 0) + (effects (font (size 1.016 1.016))) + ) + (property "Footprint" "" (id 2) (at 129.54 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Datasheet" "" (id 3) (at 129.54 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (pin "1" (uuid 9344cc35-4e54-4c9a-9cf6-dd49bf037b56)) + ) + + (symbol (lib_id "schematic_libspice:+12V") (at 146.05 44.45 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000032cfc2fd) + (property "Reference" "#+12V04" (id 0) (at 146.05 39.37 0) + (effects (font (size 1.016 1.016)) hide) + ) + (property "Value" "+12V" (id 1) (at 146.05 40.64 0) + (effects (font (size 1.016 1.016))) + ) + (property "Footprint" "" (id 2) (at 146.05 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Datasheet" "" (id 3) (at 146.05 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (pin "1" (uuid 3ba7662e-0223-4126-b8ae-01ff15137ecc)) + ) + + (symbol (lib_id "schematic_libspice:+12V") (at 154.94 44.45 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000032cfc2ff) + (property "Reference" "#+12V05" (id 0) (at 154.94 39.37 0) + (effects (font (size 1.016 1.016)) hide) + ) + (property "Value" "+12V" (id 1) (at 154.94 40.64 0) + (effects (font (size 1.016 1.016))) + ) + (property "Footprint" "" (id 2) (at 154.94 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Datasheet" "" (id 3) (at 154.94 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (pin "1" (uuid daeaf39d-5480-47cc-8f1a-9bc9d29a96bb)) + ) + + (symbol (lib_id "schematic_libspice:+12V") (at 170.18 44.45 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000032cfc303) + (property "Reference" "#+12V06" (id 0) (at 170.18 39.37 0) + (effects (font (size 1.016 1.016)) hide) + ) + (property "Value" "+12V" (id 1) (at 170.18 40.64 0) + (effects (font (size 1.016 1.016))) + ) + (property "Footprint" "" (id 2) (at 170.18 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Datasheet" "" (id 3) (at 170.18 44.45 0) + (effects (font (size 1.524 1.524)) hide) + ) + (pin "1" (uuid 01daa9c9-36ed-42c6-a812-70f458508e0a)) + ) + + (symbol (lib_id "schematic_libspice:+12V") (at 198.12 21.59 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000032e8b84a) + (property "Reference" "#+12V01" (id 0) (at 198.12 16.51 0) + (effects (font (size 1.016 1.016)) hide) + ) + (property "Value" "+12V" (id 1) (at 198.12 17.78 0) + (effects (font (size 1.016 1.016))) + ) + (property "Footprint" "" (id 2) (at 198.12 21.59 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Datasheet" "" (id 3) (at 198.12 21.59 0) + (effects (font (size 1.524 1.524)) hide) + ) + (pin "1" (uuid d7492737-e963-4b16-bd67-d972ad10b277)) ) (symbol (lib_id "schematic_libspice:0") (at 72.39 74.93 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc344") + (uuid 00000000-0000-0000-0000-000032cfc344) (property "Reference" "#GND01" (id 0) (at 72.39 77.47 0) (effects (font (size 1.016 1.016)) hide) ) @@ -644,11 +850,12 @@ (property "Datasheet" "" (id 3) (at 72.39 74.93 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 5279db28-aeca-4fc9-b2dd-7ef276d13bfc)) ) (symbol (lib_id "schematic_libspice:0") (at 97.79 107.95 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc469") + (uuid 00000000-0000-0000-0000-000032cfc469) (property "Reference" "#GND08" (id 0) (at 97.79 110.49 0) (effects (font (size 1.016 1.016)) hide) ) @@ -661,11 +868,12 @@ (property "Datasheet" "" (id 3) (at 97.79 107.95 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c2c2ac80-c0a3-4170-8e0a-f56ab535ed25)) ) (symbol (lib_id "schematic_libspice:0") (at 129.54 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc2b5") + (uuid 00000000-0000-0000-0000-000032cfc2b5) (property "Reference" "#GND05" (id 0) (at 129.54 100.33 0) (effects (font (size 1.016 1.016)) hide) ) @@ -678,11 +886,12 @@ (property "Datasheet" "" (id 3) (at 129.54 97.79 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c466d45f-536c-4bb9-bd2a-b4af4ca6011a)) ) (symbol (lib_id "schematic_libspice:0") (at 151.13 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc26c") + (uuid 00000000-0000-0000-0000-000032cfc26c) (property "Reference" "#GND06" (id 0) (at 151.13 100.33 0) (effects (font (size 1.016 1.016)) hide) ) @@ -695,11 +904,12 @@ (property "Datasheet" "" (id 3) (at 151.13 97.79 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 01850e7c-b0d4-46c1-919e-888291aef98d)) ) (symbol (lib_id "schematic_libspice:0") (at 170.18 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc2b8") + (uuid 00000000-0000-0000-0000-000032cfc2b8) (property "Reference" "#GND07" (id 0) (at 170.18 100.33 0) (effects (font (size 1.016 1.016)) hide) ) @@ -712,11 +922,12 @@ (property "Datasheet" "" (id 3) (at 170.18 97.79 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 953faa28-8f78-44f7-ab4e-27e62d2189f8)) ) (symbol (lib_id "schematic_libspice:0") (at 179.07 80.01 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d1eff") + (uuid 00000000-0000-0000-0000-00003e9d1eff) (property "Reference" "#GND02" (id 0) (at 179.07 82.55 0) (effects (font (size 1.016 1.016)) hide) ) @@ -729,11 +940,12 @@ (property "Datasheet" "" (id 3) (at 179.07 80.01 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 03ba2abc-a52b-4ff3-aa28-5c4ca0ce01ce)) ) (symbol (lib_id "schematic_libspice:0") (at 195.58 90.17 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032e8b852") + (uuid 00000000-0000-0000-0000-000032e8b852) (property "Reference" "#GND04" (id 0) (at 195.58 92.71 0) (effects (font (size 1.016 1.016)) hide) ) @@ -746,11 +958,12 @@ (property "Datasheet" "" (id 3) (at 195.58 90.17 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid d3ff1b58-d39f-4c84-9a5a-d964c97675ac)) ) (symbol (lib_id "schematic_libspice:0") (at 242.57 88.9 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d3de2") + (uuid 00000000-0000-0000-0000-00003e9d3de2) (property "Reference" "#GND03" (id 0) (at 242.57 91.44 0) (effects (font (size 1.016 1.016)) hide) ) @@ -763,11 +976,12 @@ (property "Datasheet" "" (id 3) (at 242.57 88.9 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 98093c45-59d2-41ea-849a-a109da84099c)) ) (symbol (lib_id "schematic_libspice:PWR_FLAG") (at 92.71 107.95 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000592c3ea3") + (uuid 00000000-0000-0000-0000-0000592c3ea3) (property "Reference" "#FLG02" (id 0) (at 92.71 109.855 0) (effects (font (size 1.27 1.27)) hide) ) @@ -781,11 +995,12 @@ (property "Spice_Netlist_Enabled" "N" (id 4) (at 92.71 107.95 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c91ab8de-49e4-4e74-a731-8cb6d6bdfde3)) ) (symbol (lib_id "schematic_libspice:PWR_FLAG") (at 190.5 21.59 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000592c404d") + (uuid 00000000-0000-0000-0000-0000592c404d) (property "Reference" "#FLG01" (id 0) (at 190.5 19.685 0) (effects (font (size 1.27 1.27)) hide) ) @@ -799,113 +1014,12 @@ (property "Spice_Netlist_Enabled" "N" (id 4) (at 190.5 21.59 0) (effects (font (size 1.524 1.524)) hide) ) - ) - - (symbol (lib_id "schematic_libspice:+12V") (at 72.39 38.1 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc34d") - (property "Reference" "#+12V02" (id 0) (at 72.39 33.02 0) - (effects (font (size 1.016 1.016)) hide) - ) - (property "Value" "+12V" (id 1) (at 72.39 34.29 0) - (effects (font (size 1.016 1.016))) - ) - (property "Footprint" "" (id 2) (at 72.39 38.1 0) - (effects (font (size 1.524 1.524)) hide) - ) - (property "Datasheet" "" (id 3) (at 72.39 38.1 0) - (effects (font (size 1.524 1.524)) hide) - ) - ) - - (symbol (lib_id "schematic_libspice:+12V") (at 129.54 44.45 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc2f7") - (property "Reference" "#+12V03" (id 0) (at 129.54 39.37 0) - (effects (font (size 1.016 1.016)) hide) - ) - (property "Value" "+12V" (id 1) (at 129.54 40.64 0) - (effects (font (size 1.016 1.016))) - ) - (property "Footprint" "" (id 2) (at 129.54 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - (property "Datasheet" "" (id 3) (at 129.54 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - ) - - (symbol (lib_id "schematic_libspice:+12V") (at 146.05 44.45 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc2fd") - (property "Reference" "#+12V04" (id 0) (at 146.05 39.37 0) - (effects (font (size 1.016 1.016)) hide) - ) - (property "Value" "+12V" (id 1) (at 146.05 40.64 0) - (effects (font (size 1.016 1.016))) - ) - (property "Footprint" "" (id 2) (at 146.05 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - (property "Datasheet" "" (id 3) (at 146.05 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - ) - - (symbol (lib_id "schematic_libspice:+12V") (at 154.94 44.45 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc2ff") - (property "Reference" "#+12V05" (id 0) (at 154.94 39.37 0) - (effects (font (size 1.016 1.016)) hide) - ) - (property "Value" "+12V" (id 1) (at 154.94 40.64 0) - (effects (font (size 1.016 1.016))) - ) - (property "Footprint" "" (id 2) (at 154.94 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - (property "Datasheet" "" (id 3) (at 154.94 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - ) - - (symbol (lib_id "schematic_libspice:+12V") (at 170.18 44.45 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc303") - (property "Reference" "#+12V06" (id 0) (at 170.18 39.37 0) - (effects (font (size 1.016 1.016)) hide) - ) - (property "Value" "+12V" (id 1) (at 170.18 40.64 0) - (effects (font (size 1.016 1.016))) - ) - (property "Footprint" "" (id 2) (at 170.18 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - (property "Datasheet" "" (id 3) (at 170.18 44.45 0) - (effects (font (size 1.524 1.524)) hide) - ) - ) - - (symbol (lib_id "schematic_libspice:+12V") (at 198.12 21.59 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032e8b84a") - (property "Reference" "#+12V01" (id 0) (at 198.12 16.51 0) - (effects (font (size 1.016 1.016)) hide) - ) - (property "Value" "+12V" (id 1) (at 198.12 17.78 0) - (effects (font (size 1.016 1.016))) - ) - (property "Footprint" "" (id 2) (at 198.12 21.59 0) - (effects (font (size 1.524 1.524)) hide) - ) - (property "Datasheet" "" (id 3) (at 198.12 21.59 0) - (effects (font (size 1.524 1.524)) hide) - ) + (pin "1" (uuid 543a559b-b06e-4e20-82fb-ab9348890dd8)) ) (symbol (lib_id "schematic_libspice:INDUCTOR") (at 215.9 38.1 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d4a5d") + (uuid 00000000-0000-0000-0000-00003e9d4a5d) (property "Reference" "L1" (id 0) (at 215.9 35.56 0)) (property "Value" "100mH" (id 1) (at 215.9 40.64 0)) (property "Footprint" "" (id 2) (at 215.9 38.1 0) @@ -914,11 +1028,13 @@ (property "Datasheet" "" (id 3) (at 215.9 38.1 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 87045877-3271-4d58-92ca-ad889dc6cca9)) + (pin "2" (uuid 54a4f219-cd84-413f-979c-e131c021d173)) ) (symbol (lib_id "schematic_libspice:INDUCTOR") (at 231.14 71.12 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000592c1eb9") + (uuid 00000000-0000-0000-0000-0000592c1eb9) (property "Reference" "L2" (id 0) (at 231.14 68.58 0)) (property "Value" "100mH" (id 1) (at 231.14 73.66 0)) (property "Footprint" "" (id 2) (at 231.14 71.12 0) @@ -927,11 +1043,13 @@ (property "Datasheet" "" (id 3) (at 231.14 71.12 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 888b607b-a6e0-49bf-9b59-c2ede8c85c7e)) + (pin "2" (uuid 07ed30de-fe0f-4ddb-a996-60e770e772c7)) ) (symbol (lib_id "schematic_libspice:R") (at 129.54 52.07 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc288") + (uuid 00000000-0000-0000-0000-000032cfc288) (property "Reference" "R3" (id 0) (at 127 46.99 0)) (property "Value" "22K" (id 1) (at 129.54 52.07 90)) (property "Footprint" "" (id 2) (at 129.54 52.07 0) @@ -940,11 +1058,13 @@ (property "Datasheet" "" (id 3) (at 129.54 52.07 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 60060ce6-2e33-460b-8c5d-c0482b8b6dd6)) + (pin "2" (uuid fafa3e44-a677-4f8b-9987-e9e904317bb9)) ) (symbol (lib_id "schematic_libspice:R") (at 129.54 90.17 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc293") + (uuid 00000000-0000-0000-0000-000032cfc293) (property "Reference" "R9" (id 0) (at 131.572 90.17 90)) (property "Value" "10K" (id 1) (at 129.54 90.17 90)) (property "Footprint" "" (id 2) (at 129.54 90.17 0) @@ -953,11 +1073,13 @@ (property "Datasheet" "" (id 3) (at 129.54 90.17 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 6c1e77a5-6299-40fb-acbf-502bf10fc41b)) + (pin "2" (uuid 1a08f38e-2c23-4c20-9351-39714f8a5443)) ) (symbol (lib_id "schematic_libspice:R") (at 146.05 52.07 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc24c") + (uuid 00000000-0000-0000-0000-000032cfc24c) (property "Reference" "R4" (id 0) (at 143.51 46.99 0)) (property "Value" "1K" (id 1) (at 146.05 52.07 90)) (property "Footprint" "" (id 2) (at 146.05 52.07 0) @@ -966,11 +1088,13 @@ (property "Datasheet" "" (id 3) (at 146.05 52.07 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 7a93175e-d94d-413b-89e0-b6ee49d4119d)) + (pin "2" (uuid 2e42bda8-c2bb-47cc-9ca4-861a6c3b255f)) ) (symbol (lib_id "schematic_libspice:R") (at 151.13 90.17 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc25a") + (uuid 00000000-0000-0000-0000-000032cfc25a) (property "Reference" "R10" (id 0) (at 153.162 90.17 90)) (property "Value" "470" (id 1) (at 151.13 90.17 90)) (property "Footprint" "" (id 2) (at 151.13 90.17 0) @@ -979,11 +1103,13 @@ (property "Datasheet" "" (id 3) (at 151.13 90.17 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid a11ddd68-fa44-4b2e-9303-c8daceb869c3)) + (pin "2" (uuid 74e1b038-20c6-41bd-b20d-6f5f78df1635)) ) (symbol (lib_id "schematic_libspice:R") (at 154.94 52.07 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc254") + (uuid 00000000-0000-0000-0000-000032cfc254) (property "Reference" "R5" (id 0) (at 152.4 46.99 0)) (property "Value" "1K" (id 1) (at 154.94 52.07 90)) (property "Footprint" "" (id 2) (at 154.94 52.07 0) @@ -992,11 +1118,13 @@ (property "Datasheet" "" (id 3) (at 154.94 52.07 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid b953c171-53cb-47b3-85d4-1f359cb93a7d)) + (pin "2" (uuid 851e5f47-1aec-48ce-945b-aadb0b1c5f79)) ) (symbol (lib_id "schematic_libspice:R") (at 170.18 52.07 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc27f") + (uuid 00000000-0000-0000-0000-000032cfc27f) (property "Reference" "R6" (id 0) (at 167.64 46.99 0)) (property "Value" "22K" (id 1) (at 170.18 52.07 90)) (property "Footprint" "" (id 2) (at 170.18 52.07 0) @@ -1005,11 +1133,13 @@ (property "Datasheet" "" (id 3) (at 170.18 52.07 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid d36159f6-280a-4c12-b78b-d3437ee0f4db)) + (pin "2" (uuid 1a520b54-0f6a-4a4a-9344-e057e81fef99)) ) (symbol (lib_id "schematic_libspice:R") (at 170.18 90.17 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc277") + (uuid 00000000-0000-0000-0000-000032cfc277) (property "Reference" "R11" (id 0) (at 172.212 90.17 90)) (property "Value" "10K" (id 1) (at 170.18 90.17 90)) (property "Footprint" "" (id 2) (at 170.18 90.17 0) @@ -1018,11 +1148,13 @@ (property "Datasheet" "" (id 3) (at 170.18 90.17 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid f6aabf21-2d58-4cff-bee2-f2b516cdc71d)) + (pin "2" (uuid f545ee34-3e83-40ac-ba00-838c7d71723d)) ) (symbol (lib_id "schematic_libspice:R") (at 195.58 82.55 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032e8b80e") + (uuid 00000000-0000-0000-0000-000032e8b80e) (property "Reference" "R8" (id 0) (at 197.612 82.55 90)) (property "Value" "2.2K" (id 1) (at 195.58 82.55 90)) (property "Footprint" "" (id 2) (at 195.58 82.55 0) @@ -1031,11 +1163,13 @@ (property "Datasheet" "" (id 3) (at 195.58 82.55 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 86730e95-294f-40a3-9239-70f5cc9c167a)) + (pin "2" (uuid 27991339-795f-400f-918e-d8ee74369746)) ) (symbol (lib_id "schematic_libspice:R") (at 198.12 30.48 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d4d47") + (uuid 00000000-0000-0000-0000-00003e9d4d47) (property "Reference" "R1" (id 0) (at 195.58 25.4 0)) (property "Value" "10" (id 1) (at 198.12 30.48 90)) (property "Footprint" "" (id 2) (at 198.12 30.48 0) @@ -1044,11 +1178,13 @@ (property "Datasheet" "" (id 3) (at 198.12 30.48 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid f853ed7d-4142-4e13-8d30-c3f682dca42a)) + (pin "2" (uuid 3b648ed9-5520-44f4-be08-2f472c25fd97)) ) (symbol (lib_id "schematic_libspice:R") (at 209.55 73.66 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000592c449d") + (uuid 00000000-0000-0000-0000-0000592c449d) (property "Reference" "R12" (id 0) (at 209.55 75.692 90)) (property "Value" "100" (id 1) (at 209.55 73.66 90)) (property "Footprint" "" (id 2) (at 209.55 73.66 0) @@ -1057,11 +1193,13 @@ (property "Datasheet" "" (id 3) (at 209.55 73.66 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 86582c63-a691-4f73-8657-24ccb071fef6)) + (pin "2" (uuid 706dbc2e-d955-4d40-b420-324285b0b5b5)) ) (symbol (lib_id "schematic_libspice:R") (at 214.63 45.72 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d53da") + (uuid 00000000-0000-0000-0000-00003e9d53da) (property "Reference" "R2" (id 0) (at 214.63 47.752 90)) (property "Value" "22K" (id 1) (at 214.63 45.72 90)) (property "Footprint" "" (id 2) (at 214.63 45.72 0) @@ -1070,11 +1208,13 @@ (property "Datasheet" "" (id 3) (at 214.63 45.72 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 95ef9151-a53d-408e-a9ae-9e954cee470f)) + (pin "2" (uuid b540c796-597a-4aab-a3c9-e05534eae664)) ) (symbol (lib_id "schematic_libspice:R") (at 231.14 77.47 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000592c1eb3") + (uuid 00000000-0000-0000-0000-0000592c1eb3) (property "Reference" "R7" (id 0) (at 231.14 79.502 90)) (property "Value" "22K" (id 1) (at 231.14 77.47 90)) (property "Footprint" "" (id 2) (at 231.14 77.47 0) @@ -1083,11 +1223,13 @@ (property "Datasheet" "" (id 3) (at 231.14 77.47 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid fcbdf0fe-a250-4f1b-8c3d-fb4fb99ca24b)) + (pin "2" (uuid 3b32561b-5950-41aa-8854-478b2db6d173)) ) (symbol (lib_id "schematic_libspice:C") (at 105.41 71.12 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc413") + (uuid 00000000-0000-0000-0000-000032cfc413) (property "Reference" "C1" (id 0) (at 109.22 73.66 90)) (property "Value" "1UF" (id 1) (at 101.6 73.66 90)) (property "Footprint" "" (id 2) (at 105.41 71.12 0) @@ -1096,11 +1238,13 @@ (property "Datasheet" "" (id 3) (at 105.41 71.12 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 17742f54-f0cb-414a-96aa-23908a85bc69)) + (pin "2" (uuid fdbe8020-5706-4a2e-98e4-4f5b7eb30c20)) ) (symbol (lib_id "schematic_libspice:C") (at 179.07 72.39 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d1ef8") + (uuid 00000000-0000-0000-0000-00003e9d1ef8) (property "Reference" "C2" (id 0) (at 181.61 68.58 90)) (property "Value" "220pF" (id 1) (at 181.61 76.2 90)) (property "Footprint" "" (id 2) (at 179.07 72.39 0) @@ -1109,11 +1253,13 @@ (property "Datasheet" "" (id 3) (at 179.07 72.39 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid da53b0db-67cd-4ffc-8de8-6fec29c85424)) + (pin "2" (uuid b2dcde2e-7c76-4360-8ad4-07683f4e82d4)) ) (symbol (lib_id "schematic_libspice:CAP") (at 215.9 26.67 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000592c267c") + (uuid 00000000-0000-0000-0000-0000592c267c) (property "Reference" "C4" (id 0) (at 219.71 29.21 90)) (property "Value" "10nF" (id 1) (at 212.09 29.21 90)) (property "Footprint" "" (id 2) (at 215.9 26.67 0) @@ -1122,11 +1268,13 @@ (property "Datasheet" "" (id 3) (at 215.9 26.67 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid 77e896d6-b7f6-40dd-9c00-bf2c5989b657)) + (pin "2" (uuid 2ddfaae6-2371-4ca8-bc33-33eabc9c3131)) ) (symbol (lib_id "schematic_libspice:CAP") (at 242.57 81.28 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00003e9d3dd3") + (uuid 00000000-0000-0000-0000-00003e9d3dd3) (property "Reference" "C3" (id 0) (at 245.11 77.47 90)) (property "Value" "10nF" (id 1) (at 245.11 85.09 90)) (property "Footprint" "" (id 2) (at 242.57 81.28 0) @@ -1135,11 +1283,13 @@ (property "Datasheet" "" (id 3) (at 242.57 81.28 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid ecafb960-ab89-437e-a28e-d03a53bd6788)) + (pin "2" (uuid f778e58f-2cea-4cf5-804a-578d0d59fc6d)) ) (symbol (lib_id "schematic_libspice:QNPN") (at 142.24 71.12 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc227") + (uuid 00000000-0000-0000-0000-000032cfc227) (property "Reference" "Q2" (id 0) (at 139.7 63.5 0)) (property "Value" "Q2N2222" (id 1) (at 139.7 66.04 0)) (property "Footprint" "" (id 2) (at 142.24 71.12 0) @@ -1148,11 +1298,14 @@ (property "Datasheet" "" (id 3) (at 142.24 71.12 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 705319b9-8503-42db-9062-d9d138027781)) + (pin "2" (uuid 6d635333-416f-44fc-9c6a-725e30c4e4a4)) + (pin "3" (uuid 3f871b07-9065-408c-96e2-faf4b4625d8d)) ) (symbol (lib_id "schematic_libspice:QNPN") (at 158.75 71.12 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc230") + (uuid 00000000-0000-0000-0000-000032cfc230) (property "Reference" "Q3" (id 0) (at 161.29 63.5 0)) (property "Value" "Q2N2222" (id 1) (at 161.29 66.04 0)) (property "Footprint" "" (id 2) (at 158.75 71.12 0) @@ -1161,11 +1314,14 @@ (property "Datasheet" "" (id 3) (at 158.75 71.12 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 36a40cd7-7d50-458e-add7-125f6d732851)) + (pin "2" (uuid 8fba8fca-6e03-4da5-ae6b-292eae8e4d1e)) + (pin "3" (uuid d0b29582-8e9f-4d5c-925a-c265fd09065b)) ) (symbol (lib_id "schematic_libspice:QNPN") (at 191.77 62.23 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032e8b7fc") + (uuid 00000000-0000-0000-0000-000032e8b7fc) (property "Reference" "Q1" (id 0) (at 189.23 54.61 0)) (property "Value" "Q2N2222" (id 1) (at 189.23 57.15 0)) (property "Footprint" "" (id 2) (at 191.77 62.23 0) @@ -1174,11 +1330,14 @@ (property "Datasheet" "" (id 3) (at 191.77 62.23 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid d6abae40-7890-459f-8a50-b5eca82ea2df)) + (pin "2" (uuid 4d560946-efc0-447b-9d34-7c63f0fa87c6)) + (pin "3" (uuid a509d581-7438-4eba-9d3a-281cd39ea394)) ) (symbol (lib_id "schematic_libspice:VSOURCE") (at 72.39 55.88 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc337") + (uuid 00000000-0000-0000-0000-000032cfc337) (property "Reference" "V1" (id 0) (at 72.39 58.42 0) (effects (font (size 1.524 1.524))) ) @@ -1191,11 +1350,13 @@ (property "Datasheet" "" (id 3) (at 72.39 55.88 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c7380a71-e268-4410-a851-71aa9b97717f)) + (pin "2" (uuid 395ffb0b-5c63-41a4-b6ea-26128a93b28f)) ) (symbol (lib_id "schematic_libspice:VSOURCE") (at 97.79 88.9 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000032cfc454") + (uuid 00000000-0000-0000-0000-000032cfc454) (property "Reference" "V2" (id 0) (at 97.79 91.44 0) (effects (font (size 1.524 1.524))) ) @@ -1217,6 +1378,8 @@ (property "Spice_Netlist_Enabled" "Y" (id 6) (at 97.79 88.9 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 8425b0cb-e0e5-4782-bc29-385480732729)) + (pin "2" (uuid ac37aa8e-0a13-4391-9464-5f9ca089b4dd)) ) (sheet_instances diff --git a/demos/simulation/rectifier/rectifier.kicad_pro b/demos/simulation/rectifier/rectifier.kicad_pro index e9e56b583e..55ca761537 100644 --- a/demos/simulation/rectifier/rectifier.kicad_pro +++ b/demos/simulation/rectifier/rectifier.kicad_pro @@ -29,6 +29,7 @@ "equivalence_files": [] }, "erc": { + "erc_exclusions": [], "meta": { "version": 0 }, @@ -39,6 +40,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -52,6 +54,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -65,6 +68,7 @@ 0, 0, 0, + 0, 1, 0, 1, @@ -78,6 +82,7 @@ 0, 0, 0, + 0, 1, 1, 2, @@ -91,6 +96,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -98,12 +104,27 @@ 0, 2 ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], [ 1, 1, 1, 1, 1, + 0, 1, 1, 1, @@ -117,6 +138,7 @@ 0, 1, 0, + 0, 1, 0, 0, @@ -130,6 +152,7 @@ 1, 2, 0, + 0, 1, 0, 2, @@ -143,6 +166,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -156,6 +180,7 @@ 1, 1, 0, + 0, 1, 0, 2, @@ -174,17 +199,21 @@ 2, 2, 2, + 2, 2 ] ], "rule_severities": { "bus_definition_conflict": "error", + "bus_entry_needed": "error", "bus_label_syntax": "error", "bus_to_bus_conflict": "error", "bus_to_net_conflict": "error", "different_unit_footprint": "error", "different_unit_net": "error", + "duplicate_reference": "error", "duplicate_sheet_names": "error", + "extra_units": "error", "global_label_dangling": "warning", "hier_label_mismatch": "error", "label_dangling": "error", @@ -198,6 +227,8 @@ "pin_to_pin": "warning", "power_pin_not_driven": "error", "similar_labels": "warning", + "unannotated": "error", + "unit_value_mismatch": "error", "unresolved_variable": "error", "wire_dangling": "error" } @@ -231,7 +262,7 @@ } ], "meta": { - "version": 0 + "version": 2 }, "net_colors": null }, @@ -247,6 +278,7 @@ "page_layout_descr_file": "" }, "schematic": { + "annotate_start_num": 0, "drawing": { "default_bus_thickness": 12.0, "default_junction_size": 40.0, @@ -254,20 +286,31 @@ "default_text_size": 50.0, "default_wire_thickness": 6.0, "field_names": [], + "intersheets_ref_own_page": false, "intersheets_ref_prefix": "", "intersheets_ref_short": false, "intersheets_ref_show": false, "intersheets_ref_suffix": "", "junction_size_choice": 3, + "label_size_ratio": 0.3, "pin_symbol_size": 25.0, "text_offset_ratio": 0.3 }, "legacy_lib_dir": "", "legacy_lib_list": [], "meta": { - "version": 0 + "version": 1 }, "net_format_name": "", + "ngspice": { + "fix_include_paths": true, + "fix_passive_vals": false, + "meta": { + "version": 0 + }, + "model_mode": 0, + "workbook_filename": "" + }, "page_layout_descr_file": "", "plot_directory": "", "spice_adjust_passive_values": false, @@ -277,7 +320,7 @@ }, "sheets": [ [ - "44b83a72-9432-4d83-8777-cf2ffbf3b822", + "2382c413-3719-4909-9dfc-b83bba71274f", "" ] ], diff --git a/demos/simulation/rectifier/rectifier.kicad_sch b/demos/simulation/rectifier/rectifier.kicad_sch index add734e89e..1aeef3ed37 100644 --- a/demos/simulation/rectifier/rectifier.kicad_sch +++ b/demos/simulation/rectifier/rectifier.kicad_sch @@ -1,6 +1,6 @@ -(kicad_sch (version 20201015) (generator eeschema) +(kicad_sch (version 20210621) (generator eeschema) - (page 1 1) + (uuid 2382c413-3719-4909-9dfc-b83bba71274f) (paper "A4") @@ -24,6 +24,12 @@ (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) + (symbol "PWR_FLAG_0_0" + (pin power_out line (at 0 0 90) (length 0) + (name "pwr" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + ) (symbol "PWR_FLAG_0_1" (polyline (pts @@ -34,13 +40,8 @@ (xy 1.016 1.905) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) - ) - ) - (symbol "PWR_FLAG_0_0" - (pin power_out line (at 0 0 90) (length 0) - (name "pwr" (effects (font (size 1.27 1.27)))) - (number "1" (effects (font (size 1.27 1.27)))) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) ) @@ -66,14 +67,16 @@ (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 (pts (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" @@ -109,7 +112,8 @@ (xy -1.27 1.27) (xy -1.27 -1.27) ) - (stroke (width 0.1524)) (fill (type none)) + (stroke (width 0.1524) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -117,7 +121,8 @@ (xy -1.27 0) (xy 1.27 -1.27) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) ) ) (symbol "D_1_1" @@ -154,7 +159,8 @@ (xy -1.27 -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" @@ -182,7 +188,8 @@ ) (symbol "R_0_1" (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" @@ -219,13 +226,13 @@ (effects (font (size 1.524 1.524)) hide) ) (symbol "VSOURCE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 -1.905) (xy 0 1.905) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -234,7 +241,11 @@ (xy 0.635 0.635) (xy 0 1.905) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VSOURCE_1_1" @@ -257,67 +268,86 @@ (wire (pts (xy 111.76 93.98) (xy 114.3 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid fff0c783-b4be-416f-b7af-fc7db21b4306) ) (wire (pts (xy 111.76 97.79) (xy 111.76 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e7bec0fd-e2ed-4647-bfd3-db53dfb47684) ) (wire (pts (xy 111.76 109.22) (xy 111.76 107.95)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 61ad572b-bbce-46de-8b95-6d669a3972a4) ) (wire (pts (xy 111.76 109.22) (xy 123.19 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 268ad5c7-a8e0-4402-a4c8-7931e9c0ece4) ) (wire (pts (xy 111.76 110.49) (xy 111.76 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8b873279-d1d9-4581-a487-d093a5f25f9d) ) (wire (pts (xy 121.92 93.98) (xy 125.73 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f72d8a2b-f8a5-4d0b-b1b9-22d72e34cff0) ) (wire (pts (xy 123.19 109.22) (xy 123.19 110.49)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e33b77ef-ccda-42f4-8363-f91dfba35f2d) ) (wire (pts (xy 123.19 109.22) (xy 137.16 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 34f3d2e2-8462-4fdb-a2ac-7c0b1c2ca19d) ) (wire (pts (xy 133.35 93.98) (xy 137.16 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 07ab9493-5de4-4ff4-90d8-8ba5a553168e) ) (wire (pts (xy 137.16 93.98) (xy 146.05 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 83ef7177-a51c-4eb1-8fb6-2f8f3cbe438f) ) (wire (pts (xy 137.16 97.79) (xy 137.16 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 89891bdd-bef2-43f1-a6a1-c994dbe853f7) ) (wire (pts (xy 137.16 109.22) (xy 137.16 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c67361f2-c274-4eeb-a601-a8a87b98198f) ) (wire (pts (xy 137.16 109.22) (xy 146.05 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 56b1d650-b6db-40fc-89ac-235e374651ff) ) (wire (pts (xy 146.05 93.98) (xy 146.05 97.79)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 20848edf-3aaa-41cb-8373-cf3e968c8757) ) (wire (pts (xy 146.05 109.22) (xy 146.05 105.41)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2207d2b7-bc12-4982-8cfb-7b37bb776130) ) (text ".tran 1u 10m\n" (at 109.22 124.46 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 725dced4-bed6-43ad-ba3b-46e6299827e1) ) (text "*.ac dec 10 1 1Meg\n" (at 109.22 127 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 31be42c9-a83f-44a4-aa95-efe30553d4bb) ) (label "signal_in" (at 111.76 93.98 180) (effects (font (size 1.524 1.524)) (justify right bottom)) + (uuid 9fe48f3c-97dc-4bd8-9dda-1f57ffd91008) ) (label "rect_out" (at 146.05 93.98 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 6e768832-e739-40a3-b1cf-e04b6064ba05) ) (symbol (lib_id "power:PWR_FLAG") (at 123.19 110.49 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "3cf2b621-b5e0-4e3b-ad75-1de14d8fb5dc") + (uuid 3cf2b621-b5e0-4e3b-ad75-1de14d8fb5dc) (property "Reference" "#FLG0101" (id 0) (at 123.19 112.395 0) (effects (font (size 1.27 1.27)) hide) ) @@ -328,22 +358,24 @@ (property "Datasheet" "~" (id 3) (at 123.19 110.49 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 87870f0c-d5ce-4211-ab10-80d3de7d5711)) ) (symbol (lib_id "rectifier_schlib:GND") (at 111.76 110.49 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000573360d3") + (uuid 00000000-0000-0000-0000-0000573360d3) (property "Reference" "#PWR01" (id 0) (at 111.76 116.84 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 111.887 114.8842 0)) (property "Footprint" "" (id 2) (at 111.76 110.49 0)) (property "Datasheet" "" (id 3) (at 111.76 110.49 0)) + (pin "1" (uuid e661509b-2354-4ad2-8b1b-69de4a26a842)) ) (symbol (lib_id "rectifier_schlib:R") (at 118.11 93.98 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000573360f5") + (uuid 00000000-0000-0000-0000-0000573360f5) (property "Reference" "R1" (id 0) (at 118.11 88.7222 90)) (property "Value" "1k" (id 1) (at 118.11 91.0336 90)) (property "Footprint" "" (id 2) (at 118.11 92.202 90)) @@ -357,11 +389,13 @@ (property "Spice_Primitive" "R" (id 6) (at 118.11 93.98 90) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid ffba358e-71d4-44b9-b9db-81db4067656e)) + (pin "2" (uuid d87a6c4f-baef-46a7-9b5d-c27db04b6a1c)) ) (symbol (lib_id "rectifier_schlib:R") (at 146.05 101.6 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000573362f7") + (uuid 00000000-0000-0000-0000-0000573362f7) (property "Reference" "R2" (id 0) (at 147.828 100.4316 0) (effects (font (size 1.27 1.27)) (justify right)) ) @@ -379,11 +413,13 @@ (property "Spice_Primitive" "R" (id 6) (at 146.05 101.6 90) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 135c45f3-f802-4e57-9f37-b45cf0926449)) + (pin "2" (uuid fec36f3a-ec93-4b2c-84a0-fb7b5ab96f03)) ) (symbol (lib_id "rectifier_schlib:D") (at 129.54 93.98 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000573361b8") + (uuid 00000000-0000-0000-0000-0000573361b8) (property "Reference" "D1" (id 0) (at 129.54 88.519 0)) (property "Value" "1N4148" (id 1) (at 129.54 90.8304 0)) (property "Footprint" "" (id 2) (at 129.54 93.98 0)) @@ -406,11 +442,13 @@ (property "Spice_Lib_File" "diode.mod" (id 9) (at 129.54 93.98 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 3282902d-f9c3-4e48-96be-8748796bdce2)) + (pin "2" (uuid aeebb790-4cf0-490d-8f08-cd28027978ed)) ) (symbol (lib_id "rectifier_schlib:C") (at 137.16 101.6 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005733628f") + (uuid 00000000-0000-0000-0000-00005733628f) (property "Reference" "C1" (id 0) (at 140.081 100.4316 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -428,11 +466,13 @@ (property "SpiceMapping" "1 2" (id 6) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 8927c4f6-bfd9-437a-8ad5-25802d51ce9d)) + (pin "2" (uuid 92fca1af-ccee-47d4-8c4d-392ffd77d66b)) ) (symbol (lib_id "rectifier_schlib:VSOURCE") (at 111.76 102.87 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057336052") + (uuid 00000000-0000-0000-0000-000057336052) (property "Reference" "V1" (id 0) (at 108.5088 104.0384 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -450,6 +490,8 @@ (property "Spice_Node_Sequence" "1 2" (id 6) (at 119.38 107.95 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid aceef1a1-5447-491e-8c51-e4c2fefde62d)) + (pin "2" (uuid 295a3a80-e3ec-4047-94bb-44838c8835f0)) ) (sheet_instances diff --git a/demos/simulation/sallen_key/sallen_key.kicad_pro b/demos/simulation/sallen_key/sallen_key.kicad_pro index 01ebfe7120..7b7a7409f8 100644 --- a/demos/simulation/sallen_key/sallen_key.kicad_pro +++ b/demos/simulation/sallen_key/sallen_key.kicad_pro @@ -299,6 +299,7 @@ ], "rule_severities": { "bus_definition_conflict": "error", + "bus_entry_needed": "error", "bus_label_syntax": "error", "bus_to_bus_conflict": "error", "bus_to_net_conflict": "error", @@ -355,7 +356,7 @@ } ], "meta": { - "version": 1 + "version": 2 }, "net_colors": null }, @@ -371,6 +372,7 @@ "page_layout_descr_file": "" }, "schematic": { + "annotate_start_num": 0, "drawing": { "default_bus_thickness": 12.0, "default_junction_size": 40.0, @@ -384,20 +386,24 @@ "intersheets_ref_show": false, "intersheets_ref_suffix": "", "junction_size_choice": 3, + "label_size_ratio": 0.3, "pin_symbol_size": 25.0, "text_offset_ratio": 0.3 }, "legacy_lib_dir": "", "legacy_lib_list": [], "meta": { - "version": 0 + "version": 1 }, "net_format_name": "", "ngspice": { + "fix_include_paths": true, + "fix_passive_vals": false, "meta": { "version": 0 }, - "model_mode": 0 + "model_mode": 0, + "workbook_filename": "" }, "page_layout_descr_file": "", "plot_directory": "", @@ -408,7 +414,7 @@ }, "sheets": [ [ - "f876fb8e-239d-4024-923f-c28189413c8d", + "403a5eac-c035-4b08-8ba1-e036b0ed18fb", "" ] ], diff --git a/demos/simulation/sallen_key/sallen_key.kicad_sch b/demos/simulation/sallen_key/sallen_key.kicad_sch index 47d7edabea..e587c3d4c3 100644 --- a/demos/simulation/sallen_key/sallen_key.kicad_sch +++ b/demos/simulation/sallen_key/sallen_key.kicad_sch @@ -1,6 +1,6 @@ -(kicad_sch (version 20201015) (generator eeschema) +(kicad_sch (version 20210621) (generator eeschema) - (page 1 1) + (uuid 403a5eac-c035-4b08-8ba1-e036b0ed18fb) (paper "A4") @@ -24,6 +24,12 @@ (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) + (symbol "PWR_FLAG_0_0" + (pin power_out line (at 0 0 90) (length 0) + (name "pwr" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + ) (symbol "PWR_FLAG_0_1" (polyline (pts @@ -34,13 +40,8 @@ (xy 1.016 1.905) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) - ) - ) - (symbol "PWR_FLAG_0_0" - (pin power_out line (at 0 0 90) (length 0) - (name "pwr" (effects (font (size 1.27 1.27)))) - (number "1" (effects (font (size 1.27 1.27)))) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) ) @@ -66,14 +67,16 @@ (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 (pts (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" @@ -110,7 +113,8 @@ (xy -1.27 -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" @@ -141,7 +145,8 @@ (xy -5.08 -5.08) (xy -5.08 5.08) ) - (stroke (width 0.254)) (fill (type background)) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "Generic_Opamp_1_1" @@ -185,7 +190,8 @@ ) (symbol "R_0_1" (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" @@ -213,13 +219,16 @@ (effects (font (size 1.524 1.524))) ) (symbol "VDD_0_1" - (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 0) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VDD_1_1" @@ -252,13 +261,13 @@ (effects (font (size 1.524 1.524)) hide) ) (symbol "VSOURCE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 -1.905) (xy 0 1.905) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -267,7 +276,11 @@ (xy 0.635 0.635) (xy 0 1.905) ) - (stroke (width 0)) (fill (type outline)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VSOURCE_1_1" @@ -295,13 +308,16 @@ (effects (font (size 1.524 1.524))) ) (symbol "VSS_0_1" - (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (fill (type none))) (polyline (pts (xy 0 0) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 1.905) (radius 0.635) (stroke (width 0)) (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VSS_1_1" @@ -324,103 +340,182 @@ (wire (pts (xy 152.4 109.22) (xy 152.4 114.3)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid fc2d08ca-d4e2-4706-9885-a0781d86f92f) ) (wire (pts (xy 152.4 124.46) (xy 152.4 127)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 3b4eed65-c7c5-4efe-babc-151ad52f99ad) ) (wire (pts (xy 158.75 109.22) (xy 152.4 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e2298bba-e155-47c7-bbf1-ddeed005fc64) ) (wire (pts (xy 166.37 109.22) (xy 168.91 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 65aa925b-cc2b-4ed1-938b-53ab398eaeac) ) (wire (pts (xy 168.91 109.22) (xy 172.72 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0a3a4288-cc59-4f63-8919-1ed2d0495376) ) (wire (pts (xy 168.91 125.73) (xy 168.91 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 55ebc0b1-c787-407c-a267-6e11e8f64dac) ) (wire (pts (xy 173.99 125.73) (xy 168.91 125.73)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 644909cf-ebce-45bb-9cf8-d7ff7b16ce44) ) (wire (pts (xy 180.34 109.22) (xy 186.69 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 38332f6a-ef3c-4b8f-a7a0-c5d0ca83aacf) ) (wire (pts (xy 186.69 96.52) (xy 186.69 97.79)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid dad68928-14fc-4cec-851a-d33b8a09ed10) ) (wire (pts (xy 186.69 105.41) (xy 186.69 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 99cc3a79-95ad-48e7-907c-7be9ee6eeee0) ) (wire (pts (xy 186.69 109.22) (xy 191.77 109.22)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2c3d03d4-6df6-4aea-9439-547003fbd912) ) (wire (pts (xy 187.96 114.3) (xy 191.77 114.3)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 18af8a04-7474-4306-bc63-fb241a675c11) ) (wire (pts (xy 187.96 125.73) (xy 181.61 125.73)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 36dc6c4c-5af7-4616-ba76-d4c9f815abbd) ) (wire (pts (xy 187.96 125.73) (xy 187.96 114.3)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 619abdde-c8ec-4cd3-b2ac-96f4c0be3b95) ) (wire (pts (xy 207.01 111.76) (xy 212.09 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid dbc07984-8dcb-427d-9b78-57aeeb8bf649) ) (wire (pts (xy 212.09 111.76) (xy 226.06 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 640ba09e-d127-41b3-9851-0b378f034976) ) (wire (pts (xy 212.09 125.73) (xy 187.96 125.73)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 04a0fa97-724b-4250-b3c9-50868d81ca29) ) (wire (pts (xy 212.09 125.73) (xy 212.09 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 5799e104-a3aa-48fe-a8aa-4ded2dcc8dbe) ) (wire (pts (xy 232.41 53.34) (xy 232.41 54.61)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a426ff34-4317-4d53-8ebb-77d42a3aef18) ) (wire (pts (xy 232.41 53.34) (xy 238.76 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ccb9d828-8fe0-4c3e-8489-2598990b2481) ) (wire (pts (xy 237.49 64.77) (xy 237.49 66.04)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 29ec3d0b-f6aa-4938-895a-e7a4f9c879e8) ) (wire (pts (xy 238.76 40.64) (xy 245.11 40.64)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 93d26412-87cc-4799-a843-8829f8fcbe4f) ) (wire (pts (xy 238.76 53.34) (xy 238.76 54.61)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 843a6d4c-45b3-4f69-a0a1-f472412e2c21) ) (wire (pts (xy 238.76 53.34) (xy 245.11 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 20cdbfb1-cf98-4869-ae0a-35934c6fe1c1) ) (wire (pts (xy 245.11 40.64) (xy 245.11 41.91)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid cd086666-3eba-4dec-b71d-7f0791de7a0a) ) (wire (pts (xy 245.11 52.07) (xy 245.11 53.34)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 689f4ba3-6ca8-461e-86fc-2a1db5fafcec) ) (wire (pts (xy 245.11 53.34) (xy 245.11 54.61)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 9c22a812-9067-4604-be3f-547a0a2217c9) ) (wire (pts (xy 245.11 64.77) (xy 237.49 64.77)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 467689ee-94c7-439f-9284-4154ec32566c) ) (wire (pts (xy 245.11 66.04) (xy 245.11 64.77)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c854f96f-1c70-4368-a74d-7eed960694e1) ) (text ".ac dec 10 1 1Meg\n" (at 109.22 127 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid d38c3d1e-9916-43e1-b08b-2be978d6d7e1) ) (label "lowpass" (at 217.17 111.76 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid bd619414-e4f2-475c-8922-cde135b28a78) + ) + + (symbol (lib_id "sallen_key_schlib:VDD") (at 196.85 104.14 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000057890425) + (property "Reference" "#PWR03" (id 0) (at 196.85 107.95 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VDD" (id 1) (at 197.2818 99.7458 0)) + (property "Footprint" "" (id 2) (at 196.85 104.14 0)) + (property "Datasheet" "" (id 3) (at 196.85 104.14 0)) + (pin "1" (uuid d071a357-1d06-4ef1-a4cb-70a18c24ba96)) + ) + + (symbol (lib_id "sallen_key_schlib:VSS") (at 196.85 119.38 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-000057890453) + (property "Reference" "#PWR04" (id 0) (at 196.85 115.57 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VSS" (id 1) (at 196.3928 123.7742 0)) + (property "Footprint" "" (id 2) (at 196.85 119.38 0)) + (property "Datasheet" "" (id 3) (at 196.85 119.38 0)) + (pin "1" (uuid 6ff1c0ce-774e-419b-b6ea-34916926fb24)) + ) + + (symbol (lib_id "sallen_key_schlib:VDD") (at 245.11 40.64 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-0000578903c0) + (property "Reference" "#PWR06" (id 0) (at 245.11 44.45 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VDD" (id 1) (at 245.5418 36.2458 0)) + (property "Footprint" "" (id 2) (at 245.11 40.64 0)) + (property "Datasheet" "" (id 3) (at 245.11 40.64 0)) + (pin "1" (uuid 08fb5b5f-9d7e-42cd-85b7-2369422cf2e4)) + ) + + (symbol (lib_id "sallen_key_schlib:VSS") (at 245.11 66.04 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 00000000-0000-0000-0000-0000578903e2) + (property "Reference" "#PWR07" (id 0) (at 245.11 62.23 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "VSS" (id 1) (at 244.6528 70.4342 0)) + (property "Footprint" "" (id 2) (at 245.11 66.04 0)) + (property "Datasheet" "" (id 3) (at 245.11 66.04 0)) + (pin "1" (uuid 954b9000-f9d7-465e-8075-b60c8cee0229)) ) (symbol (lib_id "power:PWR_FLAG") (at 232.41 54.61 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "e06aaf18-42f6-424d-8f09-e7146efa2360") + (uuid e06aaf18-42f6-424d-8f09-e7146efa2360) (property "Reference" "#FLG0102" (id 0) (at 232.41 56.515 0) (effects (font (size 1.27 1.27)) hide) ) @@ -431,11 +526,12 @@ (property "Datasheet" "~" (id 3) (at 232.41 54.61 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid e1826a3e-938e-458c-9c54-55323c05818a)) ) (symbol (lib_id "power:PWR_FLAG") (at 237.49 66.04 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "c10484fa-5553-45ee-ac36-942fdc26ec8e") + (uuid c10484fa-5553-45ee-ac36-942fdc26ec8e) (property "Reference" "#FLG0101" (id 0) (at 237.49 67.945 0) (effects (font (size 1.27 1.27)) hide) ) @@ -446,11 +542,12 @@ (property "Datasheet" "~" (id 3) (at 237.49 66.04 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid c12835cf-8fd3-413e-ba06-7c963e127850)) ) (symbol (lib_id "power:PWR_FLAG") (at 238.76 40.64 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "d2ccd91b-84a5-4a27-b12e-cea8603afb89") + (uuid d2ccd91b-84a5-4a27-b12e-cea8603afb89) (property "Reference" "#FLG0103" (id 0) (at 238.76 38.735 0) (effects (font (size 1.27 1.27)) hide) ) @@ -461,88 +558,48 @@ (property "Datasheet" "~" (id 3) (at 238.76 40.64 0) (effects (font (size 1.27 1.27)) hide) ) - ) - - (symbol (lib_id "sallen_key_schlib:VDD") (at 196.85 104.14 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890425") - (property "Reference" "#PWR03" (id 0) (at 196.85 107.95 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VDD" (id 1) (at 197.2818 99.7458 0)) - (property "Footprint" "" (id 2) (at 196.85 104.14 0)) - (property "Datasheet" "" (id 3) (at 196.85 104.14 0)) - ) - - (symbol (lib_id "sallen_key_schlib:VSS") (at 196.85 119.38 180) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890453") - (property "Reference" "#PWR04" (id 0) (at 196.85 115.57 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VSS" (id 1) (at 196.3928 123.7742 0)) - (property "Footprint" "" (id 2) (at 196.85 119.38 0)) - (property "Datasheet" "" (id 3) (at 196.85 119.38 0)) - ) - - (symbol (lib_id "sallen_key_schlib:VDD") (at 245.11 40.64 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578903c0") - (property "Reference" "#PWR06" (id 0) (at 245.11 44.45 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VDD" (id 1) (at 245.5418 36.2458 0)) - (property "Footprint" "" (id 2) (at 245.11 40.64 0)) - (property "Datasheet" "" (id 3) (at 245.11 40.64 0)) - ) - - (symbol (lib_id "sallen_key_schlib:VSS") (at 245.11 66.04 180) (unit 1) - (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578903e2") - (property "Reference" "#PWR07" (id 0) (at 245.11 62.23 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "VSS" (id 1) (at 244.6528 70.4342 0)) - (property "Footprint" "" (id 2) (at 245.11 66.04 0)) - (property "Datasheet" "" (id 3) (at 245.11 66.04 0)) + (pin "1" (uuid 2e534ba7-e485-440d-ab50-1013be43f65a)) ) (symbol (lib_id "sallen_key_schlib:GND") (at 152.4 127 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005a0b57f1") + (uuid 00000000-0000-0000-0000-00005a0b57f1) (property "Reference" "#PWR0101" (id 0) (at 152.4 133.35 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 152.527 131.3942 0)) (property "Footprint" "" (id 2) (at 152.4 127 0)) (property "Datasheet" "" (id 3) (at 152.4 127 0)) + (pin "1" (uuid b676fc81-c1ef-4fa1-a0c3-6854254163ad)) ) (symbol (lib_id "sallen_key_schlib:GND") (at 186.69 96.52 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890b95") + (uuid 00000000-0000-0000-0000-000057890b95) (property "Reference" "#PWR02" (id 0) (at 186.69 90.17 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 186.563 92.1258 0)) (property "Footprint" "" (id 2) (at 186.69 96.52 0)) (property "Datasheet" "" (id 3) (at 186.69 96.52 0)) + (pin "1" (uuid 3a5206ce-0eb3-487f-b69e-eca956e6bcc8)) ) (symbol (lib_id "sallen_key_schlib:GND") (at 238.76 54.61 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578902d2") + (uuid 00000000-0000-0000-0000-0000578902d2) (property "Reference" "#PWR05" (id 0) (at 238.76 60.96 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (id 1) (at 238.887 59.0042 0)) (property "Footprint" "" (id 2) (at 238.76 54.61 0)) (property "Datasheet" "" (id 3) (at 238.76 54.61 0)) + (pin "1" (uuid e291403e-12ec-4780-94f1-476cef62b8fd)) ) (symbol (lib_id "sallen_key_schlib:R") (at 162.56 109.22 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578906ff") + (uuid 00000000-0000-0000-0000-0000578906ff) (property "Reference" "R1" (id 0) (at 162.56 103.9622 90)) (property "Value" "1k" (id 1) (at 162.56 106.2736 90)) (property "Footprint" "" (id 2) (at 162.56 107.442 90)) @@ -556,11 +613,13 @@ (property "Spice_Primitive" "R" (id 6) (at 162.56 109.22 90) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 58c9f791-9dd7-4632-b8eb-c2cf84d59bb7)) + (pin "2" (uuid f9915401-49fb-4d8b-a88a-406c8445878e)) ) (symbol (lib_id "sallen_key_schlib:R") (at 176.53 109.22 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890691") + (uuid 00000000-0000-0000-0000-000057890691) (property "Reference" "R2" (id 0) (at 176.53 103.9622 90)) (property "Value" "1k" (id 1) (at 176.53 106.2736 90)) (property "Footprint" "" (id 2) (at 176.53 107.442 90)) @@ -574,20 +633,24 @@ (property "Spice_Primitive" "R" (id 6) (at 176.53 109.22 90) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid fcb5a355-f45c-497e-b6a3-3e5a13cc7722)) + (pin "2" (uuid 4422bd9e-5e5f-4bc2-bf15-76469b94f69c)) ) (symbol (lib_id "sallen_key_schlib:C") (at 177.8 125.73 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005789077d") + (uuid 00000000-0000-0000-0000-00005789077d) (property "Reference" "C1" (id 0) (at 177.8 119.3292 90)) (property "Value" "100n" (id 1) (at 177.8 121.6406 90)) (property "Footprint" "" (id 2) (at 173.99 126.6952 0)) (property "Datasheet" "" (id 3) (at 177.8 125.73 0)) + (pin "1" (uuid d06ec118-9aea-40e0-bc66-0c264d3d39d8)) + (pin "2" (uuid cab9a507-b497-44ad-a2d5-72bd7ea0128f)) ) (symbol (lib_id "sallen_key_schlib:C") (at 186.69 101.6 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005789085b") + (uuid 00000000-0000-0000-0000-00005789085b) (property "Reference" "C2" (id 0) (at 183.769 102.7684 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -605,11 +668,13 @@ (property "SpiceMapping" "1 2" (id 6) (at 186.69 101.6 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid f26dfb31-49c6-4c2c-94ed-a4dda9281e00)) + (pin "2" (uuid c612e07d-6937-41c6-b3be-261e6cbb96da)) ) (symbol (lib_id "sallen_key_schlib:VSOURCE") (at 152.4 119.38 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057336052") + (uuid 00000000-0000-0000-0000-000057336052) (property "Reference" "V1" (id 0) (at 155.6512 118.2116 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -618,11 +683,13 @@ ) (property "Footprint" "" (id 2) (at 152.4 119.38 0)) (property "Datasheet" "" (id 3) (at 152.4 119.38 0)) + (pin "1" (uuid 6b115aad-7e6a-4d3d-9f04-32436028f2e2)) + (pin "2" (uuid 676ffa01-b5ac-46ff-aa06-7a996aec4756)) ) (symbol (lib_id "sallen_key_schlib:VSOURCE") (at 245.11 46.99 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000578900ba") + (uuid 00000000-0000-0000-0000-0000578900ba) (property "Reference" "V2" (id 0) (at 248.3612 45.8216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -640,11 +707,13 @@ (property "Spice_Node_Sequence" "1 2" (id 6) (at 237.49 41.91 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 63d57c3f-1061-4b05-b866-55bec0c26e5b)) + (pin "2" (uuid 5c0c2285-7e50-4c77-a6f7-d3a084f8ed0d)) ) (symbol (lib_id "sallen_key_schlib:VSOURCE") (at 245.11 59.69 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000057890232") + (uuid 00000000-0000-0000-0000-000057890232) (property "Reference" "V3" (id 0) (at 248.3612 58.5216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -662,11 +731,13 @@ (property "Spice_Node_Sequence" "1 2" (id 6) (at 237.49 54.61 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 3a312d53-d59f-447a-afa9-d697fafd0175)) + (pin "2" (uuid 8f8436df-0b89-4660-a3c0-3ba3117ad384)) ) (symbol (lib_id "sallen_key_schlib:Generic_Opamp") (at 199.39 111.76 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005788ff9f") + (uuid 00000000-0000-0000-0000-00005788ff9f) (property "Reference" "U1" (id 0) (at 201.93 107.95 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -687,6 +758,11 @@ (property "Spice_Netlist_Enabled" "Y" (id 7) (at 199.39 111.76 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 5ce021d9-0c83-45c0-a205-62b618da33c2)) + (pin "2" (uuid 5083cecd-6789-4a7e-8828-39dc0e1fe03b)) + (pin "3" (uuid 8101937b-8472-4cd6-8f15-36904ee73daa)) + (pin "4" (uuid bacade97-4581-4b25-9c4a-22c8c16bcb13)) + (pin "5" (uuid 9279f3fb-ce5d-490a-8f5b-684612565b68)) ) (sheet_instances diff --git a/demos/simulation/v_i_sources/v_i_sources.kicad_pro b/demos/simulation/v_i_sources/v_i_sources.kicad_pro index 4aec6ec290..edb1911e79 100644 --- a/demos/simulation/v_i_sources/v_i_sources.kicad_pro +++ b/demos/simulation/v_i_sources/v_i_sources.kicad_pro @@ -29,6 +29,7 @@ "equivalence_files": [] }, "erc": { + "erc_exclusions": [], "meta": { "version": 0 }, @@ -39,6 +40,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -52,6 +54,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -65,6 +68,7 @@ 0, 0, 0, + 0, 1, 0, 1, @@ -78,6 +82,7 @@ 0, 0, 0, + 0, 1, 1, 2, @@ -91,6 +96,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -98,12 +104,27 @@ 0, 2 ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], [ 1, 1, 1, 1, 1, + 0, 1, 1, 1, @@ -117,6 +138,7 @@ 0, 1, 0, + 0, 1, 0, 0, @@ -130,6 +152,7 @@ 1, 2, 0, + 0, 1, 0, 2, @@ -143,6 +166,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -156,6 +180,7 @@ 1, 1, 0, + 0, 1, 0, 2, @@ -174,17 +199,21 @@ 2, 2, 2, + 2, 2 ] ], "rule_severities": { "bus_definition_conflict": "error", + "bus_entry_needed": "error", "bus_label_syntax": "error", "bus_to_bus_conflict": "error", "bus_to_net_conflict": "error", "different_unit_footprint": "error", "different_unit_net": "error", + "duplicate_reference": "error", "duplicate_sheet_names": "error", + "extra_units": "error", "global_label_dangling": "warning", "hier_label_mismatch": "error", "label_dangling": "error", @@ -198,6 +227,8 @@ "pin_to_pin": "warning", "power_pin_not_driven": "error", "similar_labels": "warning", + "unannotated": "error", + "unit_value_mismatch": "error", "unresolved_variable": "error", "wire_dangling": "error" } @@ -231,7 +262,7 @@ } ], "meta": { - "version": 0 + "version": 2 }, "net_colors": null }, @@ -247,6 +278,7 @@ "page_layout_descr_file": "" }, "schematic": { + "annotate_start_num": 0, "drawing": { "default_bus_thickness": 12.0, "default_junction_size": 40.0, @@ -254,20 +286,31 @@ "default_text_size": 50.0, "default_wire_thickness": 6.0, "field_names": [], + "intersheets_ref_own_page": false, "intersheets_ref_prefix": "", "intersheets_ref_short": false, "intersheets_ref_show": false, "intersheets_ref_suffix": "", "junction_size_choice": 3, + "label_size_ratio": 0.3, "pin_symbol_size": 25.0, "text_offset_ratio": 0.3 }, "legacy_lib_dir": "", "legacy_lib_list": [], "meta": { - "version": 0 + "version": 1 }, "net_format_name": "", + "ngspice": { + "fix_include_paths": true, + "fix_passive_vals": false, + "meta": { + "version": 0 + }, + "model_mode": 0, + "workbook_filename": "" + }, "page_layout_descr_file": "", "plot_directory": "", "spice_adjust_passive_values": false, @@ -277,7 +320,7 @@ }, "sheets": [ [ - "e7742228-28f4-4bb6-8fbe-92538b2432d9", + "290fe62e-4cea-473b-badf-2a76c0d280cd", "" ] ], diff --git a/demos/simulation/v_i_sources/v_i_sources.kicad_sch b/demos/simulation/v_i_sources/v_i_sources.kicad_sch index 53e6552712..bd5f9a85e9 100644 --- a/demos/simulation/v_i_sources/v_i_sources.kicad_sch +++ b/demos/simulation/v_i_sources/v_i_sources.kicad_sch @@ -1,6 +1,6 @@ -(kicad_sch (version 20201015) (generator eeschema) +(kicad_sch (version 20210621) (generator eeschema) - (page 1 1) + (uuid 290fe62e-4cea-473b-badf-2a76c0d280cd) (paper "A4") @@ -34,7 +34,8 @@ (xy -1.27 -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" @@ -63,6 +64,12 @@ (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) + (symbol "PWR_FLAG_0_0" + (pin power_out line (at 0 0 90) (length 0) + (name "pwr" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + ) (symbol "PWR_FLAG_0_1" (polyline (pts @@ -73,13 +80,8 @@ (xy 1.016 1.905) (xy 0 1.27) ) - (stroke (width 0)) (fill (type none)) - ) - ) - (symbol "PWR_FLAG_0_0" - (pin power_out line (at 0 0 90) (length 0) - (name "pwr" (effects (font (size 1.27 1.27)))) - (number "1" (effects (font (size 1.27 1.27)))) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) ) @@ -106,54 +108,55 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "IAM-Simulation_SPICE_0_0" - (arc (start 0 0.508) (end -0.508 0.508) (radius (at -0.254 0.508) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0.508) (mid -0.254 0.762) (end -0.508 0.508) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "IAM-Simulation_SPICE_0_1" - (arc (start -1.016 0) (end -1.524 0) (radius (at -1.27 0) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.016 0) (mid -1.27 0.254) (end -1.524 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start -1.016 0) (end -0.508 0) (radius (at -0.762 0) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.016 0) (mid -0.762 -0.254) (end -0.508 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 -0.508) (end 0.508 -0.508) (radius (at 0.254 -0.508) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 -0.508) (mid 0.254 -0.762) (end 0.508 -0.508) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 1.016 0) (end 0.508 0) (radius (at 0.762 0) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 1.016 0) (end 1.524 0) (radius (at 1.27 0) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) - ) - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy -0.508 0.508) (xy -0.508 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 0.508) (xy 0 -0.508) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0.508 -0.508) (xy 0.508 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -161,7 +164,19 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) + (arc (start 1.016 0) (mid 0.762 0.254) (end 0.508 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 1.016 0) (mid 1.27 -0.254) (end 1.524 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "IAM-Simulation_SPICE_1_1" @@ -197,14 +212,48 @@ (property "Spice_Model" "dc(1)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (symbol "IDC-Simulation_SPICE_0_0" + (polyline + (pts + (xy -1.27 0.254) + (xy 1.27 0.254) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy -0.762 -0.254) + (xy -1.27 -0.254) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 0.254 -0.254) + (xy -0.254 -0.254) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 1.27 -0.254) + (xy 0.762 -0.254) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + ) (symbol "IDC-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -212,37 +261,11 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - ) - (symbol "IDC-Simulation_SPICE_0_0" - (polyline - (pts - (xy -1.27 0.254) - (xy 1.27 0.254) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy -0.762 -0.254) - (xy -1.27 -0.254) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy 0.254 -0.254) - (xy -0.254 -0.254) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy 1.27 -0.254) - (xy 0.762 -0.254) - ) - (stroke (width 0)) (fill (type none)) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "IDC-Simulation_SPICE_1_1" @@ -279,35 +302,39 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "IEXP-Simulation_SPICE_0_0" - (arc (start 0 0.762) (end -1.27 -0.762) (radius (at 0.6096 -1.0414) (length 1.905) (angles 108.7 171.5)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 0 0.762) (end 1.27 -0.762) (radius (at 1.5494 0.762) (length 1.5494) (angles 180 -100.4)) - (stroke (width 0)) (fill (type none)) - ) (polyline (pts (xy -1.27 -0.762) (xy -1.778 -0.762) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.27 -0.762) (xy 1.778 -0.762) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 0 0.762) (mid -0.851 0.1794) (end -1.27 -0.762) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 0 0.762) (mid 0.3591 -0.2299) (end 1.27 -0.762) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "IEXP-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -315,7 +342,11 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "IEXP-Simulation_SPICE_1_1" @@ -351,24 +382,6 @@ (property "Spice_Model" "pulse(0 1 2n 2n 2n 50n 100n)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (symbol "IPULSE-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) - (polyline - (pts - (xy 0 1.27) - (xy 0 2.286) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy -0.254 1.778) - (xy 0 1.27) - (xy 0.254 1.778) - ) - (stroke (width 0)) (fill (type none)) - ) - ) (symbol "IPULSE-Simulation_SPICE_0_0" (polyline (pts @@ -381,7 +394,30 @@ (xy 1.397 0.762) (xy 2.032 0.762) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + ) + (symbol "IPULSE-Simulation_SPICE_0_1" + (polyline + (pts + (xy 0 1.27) + (xy 0 2.286) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy -0.254 1.778) + (xy 0 1.27) + (xy 0.254 1.778) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "IPULSE-Simulation_SPICE_1_1" @@ -417,24 +453,6 @@ (property "Spice_Model" "pwl(0 -1 50n -1 51n 0 97n 1 171n -1 200n -1)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (symbol "IPWL-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) - (polyline - (pts - (xy 0 1.27) - (xy 0 2.286) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy -0.254 1.778) - (xy 0 1.27) - (xy 0.254 1.778) - ) - (stroke (width 0)) (fill (type none)) - ) - ) (symbol "IPWL-Simulation_SPICE_0_0" (polyline (pts @@ -444,7 +462,30 @@ (xy 0.762 0) (xy 1.27 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + ) + (symbol "IPWL-Simulation_SPICE_0_1" + (polyline + (pts + (xy 0 1.27) + (xy 0 2.286) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy -0.254 1.778) + (xy 0 1.27) + (xy 0.254 1.778) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "IPWL-Simulation_SPICE_1_1" @@ -481,73 +522,73 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "ISFFM-Simulation_SPICE_0_1" - (arc (start -1.524 0.254) (end -2.032 0.254) (radius (at -1.778 0.254) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.524 -0.254) (mid -1.27 -0.508) (end -1.016 -0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start -1.524 -0.254) (end -1.016 -0.254) (radius (at -1.27 -0.254) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.524 0.254) (mid -1.778 0.508) (end -2.032 0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end -1.016 0) (radius (at -0.508 0) (length 0.508) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid -0.508 0.508) (end -1.016 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end 1.016 0) (radius (at 0.508 0) (length 0.508) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 1.524 0.254) (end 1.016 0.254) (radius (at 1.27 0.254) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 1.524 -0.254) (end 2.032 -0.254) (radius (at 1.778 -0.254) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) - ) - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy -2.032 0.254) (xy -2.032 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -1.524 -0.254) (xy -1.524 0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -1.016 0) (xy -1.016 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.016 0.254) (xy 1.016 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.524 0.254) (xy 1.524 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 2.032 -0.254) (xy 2.032 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -555,7 +596,23 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 0 0) (mid 0.508 -0.508) (end 1.016 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) + (arc (start 1.524 -0.254) (mid 1.778 -0.508) (end 2.032 -0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 1.524 0.254) (mid 1.27 0.508) (end 1.016 0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "ISFFM-Simulation_SPICE_1_1" @@ -592,21 +649,23 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "ISIN-Simulation_SPICE_0_0" - (arc (start 0 0) (end -1.27 0) (radius (at -0.635 0) (length 0.635) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid -0.635 0.635) (end -1.27 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end 1.27 0) (radius (at 0.635 0) (length 0.635) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "ISIN-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -614,7 +673,11 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "ISIN-Simulation_SPICE_1_1" @@ -651,13 +714,13 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "ITRNOISE-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -665,7 +728,8 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -689,7 +753,11 @@ (xy 1.778 0.381) (xy 2.032 -0.889) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "ITRNOISE-Simulation_SPICE_1_1" @@ -726,13 +794,13 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "ITRRANDOM-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy 0 1.27) (xy 0 2.286) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -740,7 +808,8 @@ (xy 0 1.27) (xy 0.254 1.778) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts @@ -764,7 +833,11 @@ (xy 1.778 0.381) (xy 2.032 -0.889) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "ITRRANDOM-Simulation_SPICE_1_1" @@ -796,7 +869,8 @@ ) (symbol "R-Device_0_1" (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-Device_1_1" @@ -833,50 +907,61 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "VAM-Simulation_SPICE_0_0" - (arc (start 0 0.508) (end -0.508 0.508) (radius (at -0.254 0.508) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0.508) (mid -0.254 0.762) (end -0.508 0.508) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (text "+" (at 0 1.905 0) (effects (font (size 1.27 1.27))) ) ) (symbol "VAM-Simulation_SPICE_0_1" - (arc (start -1.016 0) (end -1.524 0) (radius (at -1.27 0) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.016 0) (mid -1.27 0.254) (end -1.524 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start -1.016 0) (end -0.508 0) (radius (at -0.762 0) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.016 0) (mid -0.762 -0.254) (end -0.508 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 -0.508) (end 0.508 -0.508) (radius (at 0.254 -0.508) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 -0.508) (mid 0.254 -0.762) (end 0.508 -0.508) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 1.016 0) (end 0.508 0) (radius (at 0.762 0) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 1.016 0) (end 1.524 0) (radius (at 1.27 0) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) - ) - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy -0.508 0.508) (xy -0.508 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0 0.508) (xy 0 -0.508) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0.508 -0.508) (xy 0.508 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) + (arc (start 1.016 0) (mid 0.762 0.254) (end 0.508 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 1.016 0) (mid 1.27 -0.254) (end 1.524 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VAM-Simulation_SPICE_1_1" @@ -912,40 +997,46 @@ (property "Spice_Model" "dc(1)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (symbol "VDC-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) - ) (symbol "VDC-Simulation_SPICE_0_0" - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) - ) (polyline (pts (xy -1.27 0.254) (xy 1.27 0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -0.762 -0.254) (xy -1.27 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 0.254 -0.254) (xy -0.254 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.27 -0.254) (xy 0.762 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) + ) + ) + (symbol "VDC-Simulation_SPICE_0_1" + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "VDC-Simulation_SPICE_1_1" @@ -982,32 +1073,38 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "VEXP-Simulation_SPICE_0_0" - (arc (start 0 0.762) (end -1.27 -0.762) (radius (at 0.6096 -1.0414) (length 1.905) (angles 108.7 171.5)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 0 0.762) (end 1.27 -0.762) (radius (at 1.5494 0.762) (length 1.5494) (angles 180 -100.4)) - (stroke (width 0)) (fill (type none)) - ) - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) - ) (polyline (pts (xy -1.27 -0.762) (xy -1.778 -0.762) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.27 -0.762) (xy 1.778 -0.762) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 0 0.762) (mid -0.851 0.1794) (end -1.27 -0.762) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 0 0.762) (mid 0.3591 -0.2299) (end 1.27 -0.762) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) ) ) (symbol "VEXP-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) ) (symbol "VEXP-Simulation_SPICE_1_1" (pin passive line (at 0 5.08 270) (length 2.54) @@ -1042,13 +1139,7 @@ (property "Spice_Model" "pulse(0 1 2n 2n 2n 50n 100n)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (symbol "VPULSE-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) - ) (symbol "VPULSE-Simulation_SPICE_0_0" - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) - ) (polyline (pts (xy -2.032 -0.762) @@ -1060,7 +1151,16 @@ (xy 1.397 0.762) (xy 2.032 0.762) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) + ) + ) + (symbol "VPULSE-Simulation_SPICE_0_1" + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "VPULSE-Simulation_SPICE_1_1" @@ -1096,13 +1196,7 @@ (property "Spice_Model" "pwl(0 -1 50n -1 51n 0 97n 1 171n -1 200n -1)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (symbol "VPWL-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) - ) (symbol "VPWL-Simulation_SPICE_0_0" - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) - ) (polyline (pts (xy -1.778 -1.016) @@ -1111,7 +1205,16 @@ (xy 0.762 0) (xy 1.27 1.27) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) + ) + ) + (symbol "VPWL-Simulation_SPICE_0_1" + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "VPWL-Simulation_SPICE_1_1" @@ -1147,72 +1250,86 @@ (property "Spice_Model" "sffm(0 1 100k 5 1k)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (symbol "VSFFM-Simulation_SPICE_0_0" + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) + ) + ) (symbol "VSFFM-Simulation_SPICE_0_1" - (arc (start -1.524 0.254) (end -2.032 0.254) (radius (at -1.778 0.254) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.524 -0.254) (mid -1.27 -0.508) (end -1.016 -0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start -1.524 -0.254) (end -1.016 -0.254) (radius (at -1.27 -0.254) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start -1.524 0.254) (mid -1.778 0.508) (end -2.032 0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end -1.016 0) (radius (at -0.508 0) (length 0.508) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid -0.508 0.508) (end -1.016 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end 1.016 0) (radius (at 0.508 0) (length 0.508) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 1.524 0.254) (end 1.016 0.254) (radius (at 1.27 0.254) (length 0.254) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) - ) - (arc (start 1.524 -0.254) (end 2.032 -0.254) (radius (at 1.778 -0.254) (length 0.254) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) - ) - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy -2.032 0.254) (xy -2.032 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -1.524 -0.254) (xy -1.524 0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy -1.016 0) (xy -1.016 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.016 0.254) (xy 1.016 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 1.524 0.254) (xy 1.524 -0.254) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (polyline (pts (xy 2.032 -0.254) (xy 2.032 0) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - ) - (symbol "VSFFM-Simulation_SPICE_0_0" - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) + (arc (start 0 0) (mid 0.508 -0.508) (end 1.016 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) + (arc (start 1.524 -0.254) (mid 1.778 -0.508) (end 2.032 -0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (arc (start 1.524 0.254) (mid 1.27 0.508) (end 1.016 0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) ) (symbol "VSFFM-Simulation_SPICE_1_1" @@ -1249,18 +1366,22 @@ (effects (font (size 1.27 1.27)) (justify left)) ) (symbol "VSIN-Simulation_SPICE_0_0" - (arc (start 0 0) (end -1.27 0) (radius (at -0.635 0) (length 0.635) (angles 0.1 180)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid -0.635 0.635) (end -1.27 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - (arc (start 0 0) (end 1.27 0) (radius (at 0.635 0) (length 0.635) (angles 180 -0.1)) - (stroke (width 0)) (fill (type none)) + (arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) (text "+" (at 0 1.905 0) (effects (font (size 1.27 1.27))) ) ) (symbol "VSIN-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) ) (symbol "VSIN-Simulation_SPICE_1_1" (pin passive line (at 0 5.08 270) (length 2.54) @@ -1295,8 +1416,12 @@ (property "Spice_Model" "trnoise(20n 0.5n 0 0)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (symbol "VTRNOISE-Simulation_SPICE_0_0" + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) + ) + ) (symbol "VTRNOISE-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy -2.032 -0.762) @@ -1319,12 +1444,11 @@ (xy 1.778 0.381) (xy 2.032 -0.889) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - ) - (symbol "VTRNOISE-Simulation_SPICE_0_0" - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "VTRNOISE-Simulation_SPICE_1_1" @@ -1360,8 +1484,12 @@ (property "Spice_Model" "trrandom(2 10m 0 1)" (id 6) (at 2.54 -2.54 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (symbol "VTRRANDOM-Simulation_SPICE_0_0" + (text "+" (at 0 1.905 0) + (effects (font (size 1.27 1.27))) + ) + ) (symbol "VTRRANDOM-Simulation_SPICE_0_1" - (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (fill (type background))) (polyline (pts (xy -2.032 -0.762) @@ -1384,12 +1512,11 @@ (xy 1.778 0.381) (xy 2.032 -0.889) ) - (stroke (width 0)) (fill (type none)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) ) - ) - (symbol "VTRRANDOM-Simulation_SPICE_0_0" - (text "+" (at 0 1.905 0) - (effects (font (size 1.27 1.27))) + (circle (center 0 0) (radius 2.54) (stroke (width 0.254)) (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) ) ) (symbol "VTRRANDOM-Simulation_SPICE_1_1" @@ -1443,414 +1570,551 @@ (wire (pts (xy 25.4 15.24) (xy 34.29 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 48d9a607-1ba6-4f3b-a8b4-21db5ba806cb) ) (wire (pts (xy 25.4 17.78) (xy 25.4 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 7045db78-4bd7-42ae-9847-7cca31965c33) ) (wire (pts (xy 25.4 27.94) (xy 25.4 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 90eaf263-25da-4c76-92c3-e780ddb44426) ) (wire (pts (xy 25.4 80.01) (xy 25.4 81.28)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1456a46f-a578-40bc-8265-c459353c4fe2) ) (wire (pts (xy 25.4 80.01) (xy 34.29 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c21f4f02-a39a-473f-b323-a168d37f2e8f) ) (wire (pts (xy 26.67 92.71) (xy 35.56 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 50f58a58-0c9b-43bc-b36c-ee32f0d9fb59) ) (wire (pts (xy 26.67 95.25) (xy 26.67 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 7a853fd8-ac1a-4ac2-afbb-e16cab1acbb6) ) (wire (pts (xy 26.67 105.41) (xy 26.67 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4cfef907-b286-4124-8db7-8734651bebe1) ) (wire (pts (xy 26.67 157.48) (xy 26.67 158.75)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 17c561bb-7eab-4973-a03e-b367c738d599) ) (wire (pts (xy 26.67 157.48) (xy 33.02 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a33d6633-35c6-43a2-8526-96f355ed92ee) ) (wire (pts (xy 33.02 157.48) (xy 33.02 158.75)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 44b5ddab-1ac3-4adf-9b3b-198331e3bfa2) ) (wire (pts (xy 33.02 157.48) (xy 35.56 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f6bba47c-1723-4bff-8c72-81b324274870) ) (wire (pts (xy 34.29 16.51) (xy 34.29 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 457d2c5a-e9fd-4898-b55b-b004cad846db) ) (wire (pts (xy 34.29 24.13) (xy 34.29 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid abe7d0d0-c7dc-45e7-aa03-b01ef984c9df) ) (wire (pts (xy 34.29 80.01) (xy 43.18 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ee2fc6b4-33b5-4869-86bb-ef10a2cb9dd8) ) (wire (pts (xy 35.56 93.98) (xy 35.56 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a6b08366-706b-4b0b-b9df-04293df4ea8a) ) (wire (pts (xy 35.56 101.6) (xy 35.56 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 9213ffea-9c53-47fb-be05-cfdb40b4a0ca) ) (wire (pts (xy 35.56 157.48) (xy 44.45 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1ba2bd77-f219-47df-b217-8a3f0dce0e24) ) (wire (pts (xy 43.18 24.13) (xy 43.18 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 07d55d42-791a-4a6e-bdbc-2f92aad3fda8) ) (wire (pts (xy 43.18 34.29) (xy 43.18 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8fe8793c-1ac1-4b27-972c-ce0e26b8e8dd) ) (wire (pts (xy 43.18 80.01) (xy 52.07 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e4eff686-2841-46b2-9a63-054c69a5a91b) ) (wire (pts (xy 44.45 101.6) (xy 44.45 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 85f8fd8a-8062-46e3-8877-4c10c5dc5656) ) (wire (pts (xy 44.45 111.76) (xy 44.45 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4424f4bc-360c-4a14-bfb3-6e8c33dd81bd) ) (wire (pts (xy 44.45 157.48) (xy 53.34 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 443ac559-76dc-490c-8b56-205420c0cbf0) ) (wire (pts (xy 52.07 15.24) (xy 43.18 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c46f9bdd-804d-4325-9b81-199addf35155) ) (wire (pts (xy 52.07 15.24) (xy 52.07 16.51)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 3ea0b489-169f-4ff5-ba0f-75eecf9c48e4) ) (wire (pts (xy 52.07 24.13) (xy 52.07 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid db0bb5b9-13ba-41dc-a9ad-14faf385f29d) ) (wire (pts (xy 53.34 92.71) (xy 44.45 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 164afe77-a0ff-482b-9c68-f17138fb85f8) ) (wire (pts (xy 53.34 92.71) (xy 53.34 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 90e33c62-9af7-4323-860f-74d7dab27dd9) ) (wire (pts (xy 53.34 101.6) (xy 53.34 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 258789e0-e215-44ff-ad99-5115f2550f18) ) (wire (pts (xy 60.96 15.24) (xy 71.12 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 343daeee-c379-4d38-a564-ec841e974353) ) (wire (pts (xy 60.96 30.48) (xy 60.96 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 72e72fdb-910f-48f1-8bcb-31839fc16b4f) ) (wire (pts (xy 60.96 40.64) (xy 60.96 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6c04b33c-9dfc-4603-b9cd-ac7d49240f4b) ) (wire (pts (xy 60.96 80.01) (xy 52.07 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 54f76e07-8231-4f9e-b133-d3c64b2ea096) ) (wire (pts (xy 60.96 80.01) (xy 71.12 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 53c838a8-d146-4d4e-953a-eb2719681ff4) ) (wire (pts (xy 62.23 92.71) (xy 72.39 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4858c310-9884-4f65-a508-8fcf7e3d8055) ) (wire (pts (xy 62.23 107.95) (xy 62.23 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e717fa96-15ae-433a-bdd4-71dadcaed3c0) ) (wire (pts (xy 62.23 118.11) (xy 62.23 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ddd9a067-596f-48ce-8d8a-bbc46073dd84) ) (wire (pts (xy 62.23 157.48) (xy 53.34 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 39a7a34e-fdef-4ad2-9b12-521f3927f970) ) (wire (pts (xy 62.23 157.48) (xy 72.39 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 9fb9c3ba-1bd7-44b2-8804-5cfd1a61717a) ) (wire (pts (xy 71.12 15.24) (xy 71.12 16.51)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 10f0107a-28a4-4ffd-96f4-a0dc4b989b4b) ) (wire (pts (xy 71.12 24.13) (xy 71.12 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 076d18a8-724b-41f9-9d16-758b92f14de2) ) (wire (pts (xy 72.39 92.71) (xy 72.39 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 059ccfef-03ea-4e6c-96a4-6ed04c91d6e0) ) (wire (pts (xy 72.39 101.6) (xy 72.39 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6add64b3-6b13-483f-88ed-f0891de45111) ) (wire (pts (xy 80.01 15.24) (xy 92.71 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ae948ef6-f7bc-4b6e-8004-3dd5c84f1913) ) (wire (pts (xy 80.01 36.83) (xy 80.01 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2f415448-1cfe-49f0-9084-53e12b986d25) ) (wire (pts (xy 80.01 46.99) (xy 80.01 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4740a3f6-1844-4ee4-a20a-20f3eba6066c) ) (wire (pts (xy 80.01 80.01) (xy 71.12 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid cb0568fc-198b-46f0-ac51-fbc63148fe23) ) (wire (pts (xy 80.01 80.01) (xy 92.71 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1b859a6b-3c60-443f-ac05-c7ce344c8c02) ) (wire (pts (xy 81.28 92.71) (xy 93.98 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8462f3d0-19f0-4b46-b612-f98c1f22a4be) ) (wire (pts (xy 81.28 114.3) (xy 81.28 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ea02abf9-c1bb-4759-86d9-3fb44e6feb3b) ) (wire (pts (xy 81.28 124.46) (xy 81.28 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b6790e0c-624c-4ddf-95f9-0bb51aa32a6e) ) (wire (pts (xy 81.28 157.48) (xy 72.39 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f6f840fa-1c7e-40c4-b856-b91a3acfe9b1) ) (wire (pts (xy 81.28 157.48) (xy 93.98 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6abff720-a370-443e-8f51-64d0042179f0) ) (wire (pts (xy 92.71 15.24) (xy 92.71 16.51)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c4448915-f2bd-4a63-a2c2-24060ad34b87) ) (wire (pts (xy 92.71 24.13) (xy 92.71 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid caaca610-3e80-4f17-bcb8-e4eae1306891) ) (wire (pts (xy 93.98 92.71) (xy 93.98 93.98)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f3edddde-e44a-4a77-9e7b-4ab450efb447) ) (wire (pts (xy 93.98 101.6) (xy 93.98 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 81ab90ef-5f7e-4019-a910-0663a5b02d29) ) (wire (pts (xy 101.6 15.24) (xy 111.76 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 579e0589-4ec3-4b09-bf77-103d55c88376) ) (wire (pts (xy 101.6 43.18) (xy 101.6 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2074dda0-da67-4c49-b971-980ce4a253cf) ) (wire (pts (xy 101.6 53.34) (xy 101.6 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d9e17061-23db-4384-b8c4-181cbf24f8db) ) (wire (pts (xy 101.6 80.01) (xy 92.71 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e0a82756-c1e8-4c87-b3f9-b194d3bd4138) ) (wire (pts (xy 101.6 80.01) (xy 111.76 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 3df1ff07-dfc2-47e4-9c51-e253fbae3603) ) (wire (pts (xy 102.87 92.71) (xy 113.03 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 82303657-4249-40a2-a5b4-a2d92a5daa90) ) (wire (pts (xy 102.87 120.65) (xy 102.87 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8a71e710-b5e0-4efd-92a1-f776d7583684) ) (wire (pts (xy 102.87 130.81) (xy 102.87 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4eb4b6eb-fea1-4176-9545-28fbf41ab5c0) ) (wire (pts (xy 102.87 157.48) (xy 93.98 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a3a72d6b-f647-4cb5-b285-544794ade511) ) (wire (pts (xy 102.87 157.48) (xy 113.03 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0dd3b147-0988-490a-89e2-775188b1db8d) ) (wire (pts (xy 111.76 16.51) (xy 111.76 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid da189438-8675-44ef-85f0-11d6af8d23d3) ) (wire (pts (xy 111.76 24.13) (xy 111.76 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 440dc4c3-8659-4e05-b209-0ed045246d6b) ) (wire (pts (xy 111.76 80.01) (xy 120.65 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b7f2abe5-c205-4084-9e6a-8d6b265bfc2f) ) (wire (pts (xy 113.03 93.98) (xy 113.03 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 222f7deb-1445-4654-bf53-d812c6a902f1) ) (wire (pts (xy 113.03 101.6) (xy 113.03 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 58d694ff-2146-425b-b440-2c7f017e0026) ) (wire (pts (xy 113.03 157.48) (xy 121.92 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f4c9250a-5004-44f1-9b9e-2bf9987b321b) ) (wire (pts (xy 120.65 15.24) (xy 132.08 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2ec5bece-2e1d-4202-80ef-bf490062b516) ) (wire (pts (xy 120.65 49.53) (xy 120.65 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 35d4f9c4-b6d6-4b12-a7c9-b843609edca9) ) (wire (pts (xy 120.65 59.69) (xy 120.65 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8330a4ed-7b35-40ce-a4f1-f383f03c6f16) ) (wire (pts (xy 120.65 80.01) (xy 132.08 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a084b00b-3e11-4d78-bc7e-8ebf6729ae32) ) (wire (pts (xy 121.92 92.71) (xy 133.35 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid fbdf9d0e-ba71-4854-bd29-4a31c52273d5) ) (wire (pts (xy 121.92 127) (xy 121.92 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 9a67126e-6846-493e-9359-08b552be57b9) ) (wire (pts (xy 121.92 137.16) (xy 121.92 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid de87babe-63b3-4bb0-8772-fed8a8ffd71f) ) (wire (pts (xy 121.92 157.48) (xy 133.35 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 80bdae1e-3800-4ba3-b4f8-398f6dedb333) ) (wire (pts (xy 132.08 16.51) (xy 132.08 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6938466f-1844-4261-94b4-d0bb9fed7e3b) ) (wire (pts (xy 132.08 24.13) (xy 132.08 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 44ebceec-6a50-49af-bd6b-c4e2a1dad9f2) ) (wire (pts (xy 132.08 80.01) (xy 140.97 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 27166dc3-cc3e-4a7e-b18a-3748c3afe36a) ) (wire (pts (xy 133.35 93.98) (xy 133.35 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 391cf4e3-4c8d-4e9f-b2cd-fd3afe7ea3b6) ) (wire (pts (xy 133.35 101.6) (xy 133.35 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 43e0b5c9-72ee-4e6c-8f05-8dab987937e9) ) (wire (pts (xy 133.35 157.48) (xy 142.24 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 23e65600-0682-4fa2-9325-82a7b14c68cd) ) (wire (pts (xy 140.97 15.24) (xy 149.86 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4329ca64-d1b7-491c-bbfd-6543e85e9af9) ) (wire (pts (xy 140.97 55.88) (xy 140.97 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 3b1a5079-aa1b-49f4-96da-6df75ffeb849) ) (wire (pts (xy 140.97 66.04) (xy 140.97 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 691eeab5-977b-4a39-8ccd-68f81c2408e2) ) (wire (pts (xy 142.24 92.71) (xy 151.13 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 93622985-c2d1-4939-a2f1-bc5f3161d0ae) ) (wire (pts (xy 142.24 133.35) (xy 142.24 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 743e4dd9-d61e-440b-94d7-2573684de2de) ) (wire (pts (xy 142.24 143.51) (xy 142.24 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2ec90ecd-aef7-455b-909c-7c47a3d47d5c) ) (wire (pts (xy 149.86 16.51) (xy 149.86 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 545ecb70-ab31-4943-b2a7-adf5cde30eb9) ) (wire (pts (xy 149.86 24.13) (xy 149.86 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a0905f1d-90d8-4fad-a6a5-45b1cef2c006) ) (wire (pts (xy 149.86 80.01) (xy 140.97 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 562b741f-4f90-4b93-8c47-b854339f71ae) ) (wire (pts (xy 151.13 93.98) (xy 151.13 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 52ce06d0-c853-437e-9ebb-746c9d466e56) ) (wire (pts (xy 151.13 101.6) (xy 151.13 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b8043f4d-2322-4935-be3e-ade4157d5c7d) ) (wire (pts (xy 151.13 157.48) (xy 142.24 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2152f383-9c8c-42c1-a095-5632ad2d568a) ) (wire (pts (xy 158.75 15.24) (xy 172.72 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b9a61aeb-2cc8-4c8e-a4b4-e1d2d11257f4) ) (wire (pts (xy 158.75 62.23) (xy 158.75 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 802f4bae-d353-40e1-bb7d-e134f664b9c2) ) (wire (pts (xy 158.75 72.39) (xy 158.75 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 39a57e91-cc1a-4510-8806-ea46c8563564) ) (wire (pts (xy 158.75 80.01) (xy 149.86 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b5218282-637b-4ebb-8e25-8db82055a055) ) (wire (pts (xy 158.75 80.01) (xy 172.72 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e3f04829-4ae3-415a-85d1-2d38929c9c64) ) (wire (pts (xy 160.02 92.71) (xy 173.99 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 31fff571-d001-43f3-8a61-925bcd1200ec) ) (wire (pts (xy 160.02 139.7) (xy 160.02 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f5277673-322f-4839-bce3-6698d8a58628) ) (wire (pts (xy 160.02 149.86) (xy 160.02 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 11f80e1f-97e4-4bcb-b3e1-4c648ec6c321) ) (wire (pts (xy 160.02 157.48) (xy 151.13 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 2e4ca71e-6c41-4238-b6d0-4bdd8b86c633) ) (wire (pts (xy 160.02 157.48) (xy 173.99 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c32d025f-223a-481b-acf6-dfb2c984eea2) ) (wire (pts (xy 172.72 16.51) (xy 172.72 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1cda8cd8-e7f1-41f5-966a-0e7829e75d94) ) (wire (pts (xy 172.72 24.13) (xy 172.72 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 339ee74e-5c55-4a83-8de1-584b943763eb) ) (wire (pts (xy 172.72 80.01) (xy 181.61 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 57a00e57-b042-4985-b9cc-9f137b356457) ) (wire (pts (xy 173.99 93.98) (xy 173.99 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 86ae0ee4-36e9-4cb1-9e0c-7be8a9c69820) ) (wire (pts (xy 173.99 101.6) (xy 173.99 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 7b2fe416-afb8-4ee7-9470-2317b1b70733) ) (wire (pts (xy 181.61 15.24) (xy 198.12 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e10388f1-67df-40ba-a8e0-1fbb4997f232) ) (wire (pts (xy 181.61 68.58) (xy 181.61 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1009f357-1721-47c0-b721-75db7e91dcd1) ) (wire (pts (xy 181.61 78.74) (xy 181.61 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0222aa7e-42ba-4244-b173-caad9a6abcd3) ) (wire (pts (xy 181.61 80.01) (xy 198.12 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid aecc6294-7201-41b2-af4e-c0ff25dc3971) ) (wire (pts (xy 182.88 92.71) (xy 199.39 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 6c2aab58-0bf1-46b0-8f48-b6b98c3c8339) ) (wire (pts (xy 182.88 146.05) (xy 182.88 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 998b6e92-b454-4f26-a5f5-dc1c0c087e4d) ) (wire (pts (xy 182.88 156.21) (xy 182.88 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d311ecc6-355c-44db-a2bf-1a1acbab84fa) ) (wire (pts (xy 182.88 157.48) (xy 173.99 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 12a93d19-e0ad-48f1-8b64-0aa809490b96) ) (wire (pts (xy 182.88 157.48) (xy 199.39 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d1cc27a1-1125-4cf8-98b6-a1a2c4b4ec2c) ) (wire (pts (xy 198.12 16.51) (xy 198.12 15.24)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 512981aa-dd19-4ff1-8c97-44bae63faf16) ) (wire (pts (xy 198.12 24.13) (xy 198.12 80.01)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e4e963c8-0171-4cde-988b-492992392e98) ) (wire (pts (xy 199.39 93.98) (xy 199.39 92.71)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e55d5cf7-8ddc-412c-b7f8-51a4c418a2a9) ) (wire (pts (xy 199.39 101.6) (xy 199.39 157.48)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 89067ad2-2f8a-4f68-ab33-601218e9b755) ) (polyline (pts (xy 20.32 12.7) (xy 208.28 12.7)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 77ba8e4e-34b9-4fd5-95f4-170d31a9e2e0) ) (polyline (pts (xy 20.32 87.63) (xy 20.32 12.7)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid f9096862-e3a3-438b-b0cd-b0f7f6c6723d) ) (polyline (pts (xy 20.32 90.17) (xy 20.32 165.1)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid cc6b2904-6de7-4dcd-a1f8-4c0be4e9cde4) ) (polyline (pts (xy 20.32 90.17) (xy 208.28 90.17)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 7d2667d3-bbdf-4f78-ac62-8346a2c9cd40) ) (polyline (pts (xy 208.28 12.7) (xy 208.28 87.63)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 611221e6-aa89-4a77-806b-671d46ee7e96) ) (polyline (pts (xy 208.28 87.63) (xy 20.32 87.63)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid 8804c0dc-9c63-4e4d-9c18-e415c8e2a188) ) (polyline (pts (xy 208.28 90.17) (xy 208.28 165.1)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid ad9706a6-144d-4360-91d6-47fae6535810) ) (polyline (pts (xy 208.28 165.1) (xy 20.32 165.1)) (stroke (width 0) (type dash) (color 0 0 0 0)) + (uuid f73e479e-22e0-4124-93c6-6e72dddb4378) ) (image (at 246.38 33.02) + (uuid bfa2aa0c-8730-4906-9ef4-dba33beae055) (data iVBORw0KGgoAAAANSUhEUgAAAzIAAAHcCAIAAACChgihAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4 nOy9TY/bWJrv+bBRqwsMxov8ANNVpN02HJtaZI0Yy0bmjBQxgG6hS5sCnIoLDNW56WCgEAkkEEah @@ -2325,6 +2589,7 @@ ) ) (image (at 246.38 110.49) + (uuid c159ccf7-7405-4fad-9ee6-1ccd29da5f71) (data iVBORw0KGgoAAAANSUhEUgAAAywAAAHgCAIAAADIWX4sAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4 nOzdTW/jWJov+IcXubrAYGKRH2A6i4zoCIQ3tcga0ctG5oxkD+AuVGmTQIR8gaE6Ny0aBSeQgAOF @@ -2766,72 +3031,93 @@ (text ".tran 1n 300n" (at 20.32 170.18 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 7589969a-705b-4263-a557-26b406d8fe3a) ) (text "Voltage sources" (at 88.9 86.36 0) (effects (font (size 3.81 3.81)) (justify left bottom)) + (uuid 56fc0362-05ac-459e-9e2f-e3c52f91dcb7) ) (text "Current sources" (at 88.9 163.83 0) (effects (font (size 3.81 3.81)) (justify left bottom)) + (uuid 6f3bb422-531d-4104-8f13-c1f844beef33) ) (label "vam" (at 26.67 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid e43aacf7-55fb-47de-b4be-b037e0f9c12f) ) (label "iam" (at 27.94 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 87143484-ee40-4d77-9691-e9e76f4cec2d) ) (label "vdc" (at 44.45 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 579a3da4-93e0-43c1-8489-81871a2db46c) ) (label "idc" (at 45.72 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 49946b13-1fa6-4fbb-83dd-ecba0fc26a62) ) (label "vexp" (at 62.23 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid e52d3f5b-d6bf-4efd-95e8-bd4f294c6fa9) ) (label "iexp" (at 63.5 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 65686e58-96ca-46a1-badd-094ce6209d70) ) (label "vpulse" (at 81.28 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 460e390e-82b3-4ba2-897e-cac216dbe91b) ) (label "ipulse" (at 82.55 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid c5ae9033-2763-4d17-a3e3-c7429dd645f0) ) (label "vpwl" (at 102.87 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 7a21add5-3f4a-4f0d-a8dd-e1cfaf893ee1) ) (label "ipwl" (at 104.14 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid e91d40c5-bdad-4fb9-9c34-de574cf58ef4) ) (label "vsffm" (at 121.92 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid a260599b-3b70-4c9a-bbc5-dcae26421b16) ) (label "isffm" (at 123.19 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 68ce866d-d495-4889-8188-65f9cf6ed54f) ) (label "vsin" (at 142.24 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 9f2a6bb1-9532-426d-b7ea-e1d8c6152ec9) ) (label "isin" (at 143.51 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 24155029-2c2d-43d2-9737-6c0859166459) ) (label "vtrnoise" (at 160.02 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid c6ec5f80-08d3-4bbf-b130-33fde8f5d6ca) ) (label "itrnoise" (at 161.29 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 0324b3e5-288e-486c-806a-b67cee6f4f52) ) (label "vtrrandom" (at 182.88 15.24 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 778e335b-7956-4b4a-85a4-d67b8a0c539e) ) (label "itrrandom" (at 184.15 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid dbbf3396-87f9-407f-96c4-4802df854bfe) ) (symbol (lib_id "power:PWR_FLAG") (at 33.02 158.75 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "a7c49e6c-6736-4a1d-a5d4-9863e74c2de5") + (uuid a7c49e6c-6736-4a1d-a5d4-9863e74c2de5) (property "Reference" "#FLG0101" (id 0) (at 33.02 160.655 0) (effects (font (size 1.27 1.27)) hide) ) @@ -2842,11 +3128,12 @@ (property "Datasheet" "~" (id 3) (at 33.02 158.75 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 06982235-faa6-4e5e-8486-b8bf1f74d827)) ) (symbol (lib_id "power:GND") (at 25.4 81.28 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda09bd") + (uuid 00000000-0000-0000-0000-00005bda09bd) (property "Reference" "#PWR01" (id 0) (at 25.4 87.63 0) (effects (font (size 1.27 1.27)) hide) ) @@ -2857,11 +3144,12 @@ (property "Datasheet" "" (id 3) (at 25.4 81.28 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 4a8220fd-4642-4129-afa8-9081b6df95cf)) ) (symbol (lib_id "power:GND") (at 26.67 158.75 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda717d") + (uuid 00000000-0000-0000-0000-00005bda717d) (property "Reference" "#PWR02" (id 0) (at 26.67 165.1 0) (effects (font (size 1.27 1.27)) hide) ) @@ -2872,11 +3160,12 @@ (property "Datasheet" "" (id 3) (at 26.67 158.75 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 17dd5404-2092-479c-9f11-6e3d26800387)) ) (symbol (lib_id "v_i_sources:R-Device") (at 34.29 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda3c13") + (uuid 00000000-0000-0000-0000-00005bda3c13) (property "Reference" "R1" (id 0) (at 36.068 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2889,11 +3178,13 @@ (property "Datasheet" "~" (id 3) (at 34.29 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 87bfe486-89f4-478e-8385-38181e7f52df)) + (pin "2" (uuid b419ba03-1bb0-41a6-9bb5-c1977a2ecc4b)) ) (symbol (lib_id "v_i_sources:R-Device") (at 35.56 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71a5") + (uuid 00000000-0000-0000-0000-00005bda71a5) (property "Reference" "R10" (id 0) (at 37.338 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2906,11 +3197,13 @@ (property "Datasheet" "~" (id 3) (at 35.56 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 97ffd50d-e06c-404f-86f6-b3509fcf9e05)) + (pin "2" (uuid a7932a17-26ab-45f9-8765-46baca7283d5)) ) (symbol (lib_id "v_i_sources:R-Device") (at 52.07 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda54f9") + (uuid 00000000-0000-0000-0000-00005bda54f9) (property "Reference" "R2" (id 0) (at 53.848 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2923,11 +3216,13 @@ (property "Datasheet" "~" (id 3) (at 52.07 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 9311a22f-0af9-495a-9c75-384d269dad50)) + (pin "2" (uuid a35b6e06-e4da-4ce7-8991-40851c7aabe7)) ) (symbol (lib_id "v_i_sources:R-Device") (at 53.34 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71ac") + (uuid 00000000-0000-0000-0000-00005bda71ac) (property "Reference" "R11" (id 0) (at 55.118 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2940,11 +3235,13 @@ (property "Datasheet" "~" (id 3) (at 53.34 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 6c782352-d6f7-46fd-88a0-cdde8c51567d)) + (pin "2" (uuid 369dd70a-dbac-490c-a0a6-2673a4f632c8)) ) (symbol (lib_id "v_i_sources:R-Device") (at 71.12 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda5e69") + (uuid 00000000-0000-0000-0000-00005bda5e69) (property "Reference" "R3" (id 0) (at 72.898 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2957,11 +3254,13 @@ (property "Datasheet" "~" (id 3) (at 71.12 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid e825e75d-fc85-4966-a329-2bc3c37f2437)) + (pin "2" (uuid 730b649a-0653-42ea-849d-b136b8237c1b)) ) (symbol (lib_id "v_i_sources:R-Device") (at 72.39 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71b2") + (uuid 00000000-0000-0000-0000-00005bda71b2) (property "Reference" "R12" (id 0) (at 74.168 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2974,11 +3273,13 @@ (property "Datasheet" "~" (id 3) (at 72.39 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 5ebad891-90e8-4f8e-8055-269bc66949f1)) + (pin "2" (uuid 33f440c6-d433-4fb1-94db-9b43fac00926)) ) (symbol (lib_id "v_i_sources:R-Device") (at 92.71 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda6c25") + (uuid 00000000-0000-0000-0000-00005bda6c25) (property "Reference" "R4" (id 0) (at 94.488 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -2991,11 +3292,13 @@ (property "Datasheet" "~" (id 3) (at 92.71 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 00c6acd5-7249-4787-a9a7-a583f1330606)) + (pin "2" (uuid fc5cd870-04db-4d06-b91a-a7649bdebc12)) ) (symbol (lib_id "v_i_sources:R-Device") (at 93.98 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71be") + (uuid 00000000-0000-0000-0000-00005bda71be) (property "Reference" "R13" (id 0) (at 95.758 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3008,11 +3311,13 @@ (property "Datasheet" "~" (id 3) (at 93.98 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 2f9b7581-bbf4-46ce-9a1a-3828324d3b07)) + (pin "2" (uuid 5b519160-67b2-44f5-ab68-7be4079ec394)) ) (symbol (lib_id "v_i_sources:R-Device") (at 111.76 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda74fc") + (uuid 00000000-0000-0000-0000-00005bda74fc) (property "Reference" "R5" (id 0) (at 113.538 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3025,11 +3330,13 @@ (property "Datasheet" "~" (id 3) (at 111.76 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 12b11d37-64bf-4e21-a32b-d795095777e2)) + (pin "2" (uuid 56ed50bc-9c83-4eb2-ab32-8e23bc494f24)) ) (symbol (lib_id "v_i_sources:R-Device") (at 113.03 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71c4") + (uuid 00000000-0000-0000-0000-00005bda71c4) (property "Reference" "R14" (id 0) (at 114.808 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3042,11 +3349,13 @@ (property "Datasheet" "~" (id 3) (at 113.03 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 060c3ef6-f63e-4495-9d01-0ffa858677a9)) + (pin "2" (uuid ca3ba06b-0aea-4322-a56b-82798cfcaf07)) ) (symbol (lib_id "v_i_sources:R-Device") (at 132.08 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda7e91") + (uuid 00000000-0000-0000-0000-00005bda7e91) (property "Reference" "R6" (id 0) (at 133.858 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3059,11 +3368,13 @@ (property "Datasheet" "~" (id 3) (at 132.08 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 6aa7b206-5957-4af8-bdf0-cd56b6fbbe15)) + (pin "2" (uuid 0c43c108-34e3-40f9-929a-259d4355be0f)) ) (symbol (lib_id "v_i_sources:R-Device") (at 133.35 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71ca") + (uuid 00000000-0000-0000-0000-00005bda71ca) (property "Reference" "R15" (id 0) (at 135.128 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3076,11 +3387,13 @@ (property "Datasheet" "~" (id 3) (at 133.35 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 57030162-21f8-4ce2-8119-d95bb410cb89)) + (pin "2" (uuid 4a39ec92-4ea9-4f12-8a44-e7098b136cfd)) ) (symbol (lib_id "v_i_sources:R-Device") (at 149.86 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda56df") + (uuid 00000000-0000-0000-0000-00005bda56df) (property "Reference" "R7" (id 0) (at 151.638 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3093,11 +3406,13 @@ (property "Datasheet" "~" (id 3) (at 149.86 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 7e1462b4-543a-489e-82ac-bbb6522092f7)) + (pin "2" (uuid 5eb3fbc0-ba88-492b-8c3c-f2b8f7948c09)) ) (symbol (lib_id "v_i_sources:R-Device") (at 151.13 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda719b") + (uuid 00000000-0000-0000-0000-00005bda719b) (property "Reference" "R16" (id 0) (at 152.908 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3110,11 +3425,13 @@ (property "Datasheet" "~" (id 3) (at 151.13 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 444b9dea-3556-4080-a4f3-31c605424b45)) + (pin "2" (uuid 81c336fc-9612-4ab7-92ba-6ce5fbf771f4)) ) (symbol (lib_id "v_i_sources:R-Device") (at 172.72 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda631a") + (uuid 00000000-0000-0000-0000-00005bda631a) (property "Reference" "R8" (id 0) (at 174.498 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3127,11 +3444,13 @@ (property "Datasheet" "~" (id 3) (at 172.72 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 6920c3b3-2f62-4beb-ad02-20c0782cccb0)) + (pin "2" (uuid 8ca5b0b7-0057-4a11-9d37-e1b085782aef)) ) (symbol (lib_id "v_i_sources:R-Device") (at 173.99 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda71b8") + (uuid 00000000-0000-0000-0000-00005bda71b8) (property "Reference" "R17" (id 0) (at 175.768 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3144,11 +3463,13 @@ (property "Datasheet" "~" (id 3) (at 173.99 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 1f171b98-40c6-42ce-b44d-c4f2f1185555)) + (pin "2" (uuid 33b0b732-252d-44ef-9558-f715b8ff97fc)) ) (symbol (lib_id "v_i_sources:R-Device") (at 198.12 20.32 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bdc2ddf") + (uuid 00000000-0000-0000-0000-00005bdc2ddf) (property "Reference" "R9" (id 0) (at 199.898 19.1516 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3161,11 +3482,13 @@ (property "Datasheet" "~" (id 3) (at 198.12 20.32 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid 9005e327-f1a3-4276-9c80-c4a07972ccf9)) + (pin "2" (uuid 020972d3-a8e6-466e-a28e-4051ff1a19c7)) ) (symbol (lib_id "v_i_sources:R-Device") (at 199.39 97.79 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005bda7207") + (uuid 00000000-0000-0000-0000-00005bda7207) (property "Reference" "R18" (id 0) (at 201.168 96.6216 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3178,11 +3501,13 @@ (property "Datasheet" "~" (id 3) (at 199.39 97.79 0) (effects (font (size 1.27 1.27)) hide) ) + (pin "1" (uuid a8be6a01-c496-4b1a-8935-ddcc9ebfdf87)) + (pin "2" (uuid 9f0eb314-a0b8-4afe-beee-6ecb16246fe8)) ) (symbol (lib_id "v_i_sources:VAM-Simulation_SPICE") (at 25.4 22.86 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c531459") + (uuid 00000000-0000-0000-0000-00005c531459) (property "Reference" "V1" (id 0) (at 28.702 20.5486 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3204,11 +3529,13 @@ (property "Spice_Model" "am(0.5 1 10meg 50meg 20n)" (id 6) (at 28.702 25.1714 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid f31cd362-ec8d-4dd0-98a6-c812e1606c2b)) + (pin "2" (uuid dcfc3488-7bca-4f68-a563-64db473e6899)) ) (symbol (lib_id "v_i_sources:IAM-Simulation_SPICE") (at 26.67 100.33 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52b633") + (uuid 00000000-0000-0000-0000-00005c52b633) (property "Reference" "I1" (id 0) (at 29.972 98.0186 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3230,11 +3557,13 @@ (property "Spice_Model" "am(0.5 1 10meg 50meg 20n)" (id 6) (at 29.972 102.6414 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 24bc80f1-ea2b-42bf-a182-40ae0f059f55)) + (pin "2" (uuid 4bb0a1f9-59d6-4284-963f-6c8f007a9c1b)) ) (symbol (lib_id "v_i_sources:VDC-Simulation_SPICE") (at 43.18 29.21 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c530c73") + (uuid 00000000-0000-0000-0000-00005c530c73) (property "Reference" "V2" (id 0) (at 46.482 26.8986 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3256,11 +3585,13 @@ (property "Spice_Model" "dc 2.345" (id 6) (at 46.482 31.5214 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 5cee3d30-d590-497f-8a34-4225f7eacc7e)) + (pin "2" (uuid 62091122-84c0-4892-992b-c9b3a04d6103)) ) (symbol (lib_id "v_i_sources:IDC-Simulation_SPICE") (at 44.45 106.68 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52abaa") + (uuid 00000000-0000-0000-0000-00005c52abaa) (property "Reference" "I2" (id 0) (at 47.752 104.3686 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3282,11 +3613,13 @@ (property "Spice_Model" "dc 2.345" (id 6) (at 47.752 108.9914 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 1afb3527-d69a-4e1d-8c32-7352a57061c6)) + (pin "2" (uuid c98acd97-8ace-4f47-9842-c14243a1a5f5)) ) (symbol (lib_id "v_i_sources:VEXP-Simulation_SPICE") (at 60.96 35.56 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c53039f") + (uuid 00000000-0000-0000-0000-00005c53039f) (property "Reference" "V3" (id 0) (at 64.262 33.2486 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3308,11 +3641,13 @@ (property "Spice_Model" "exp(-4 -1 2n 30n 60n 40n)" (id 6) (at 64.262 37.8714 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid d22c1d55-25f8-4f9d-ae8c-f479b0bfd150)) + (pin "2" (uuid 89905da9-6216-4575-9d27-93bc7100e5c7)) ) (symbol (lib_id "v_i_sources:IEXP-Simulation_SPICE") (at 62.23 113.03 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52a002") + (uuid 00000000-0000-0000-0000-00005c52a002) (property "Reference" "I3" (id 0) (at 65.532 110.7186 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3334,11 +3669,13 @@ (property "Spice_Model" "exp(-4 -1 2n 30n 60n 40n)" (id 6) (at 65.532 115.3414 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 017174bb-e1df-493e-b1f4-8918deddfffc)) + (pin "2" (uuid 77261519-f995-4c4b-85f1-4008bdb22513)) ) (symbol (lib_id "v_i_sources:VPULSE-Simulation_SPICE") (at 80.01 41.91 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52f92f") + (uuid 00000000-0000-0000-0000-00005c52f92f) (property "Reference" "V4" (id 0) (at 83.312 39.5986 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3360,11 +3697,13 @@ (property "Spice_Model" "pulse(-1 1 2n 30n 2n 50n 100n)" (id 6) (at 83.312 44.2214 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 1cd1c486-1ecb-4ce6-a5bc-ab485954ce64)) + (pin "2" (uuid f6079f67-93cb-4076-9cdb-70b7aeeb7d87)) ) (symbol (lib_id "v_i_sources:IPULSE-Simulation_SPICE") (at 81.28 119.38 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c529462") + (uuid 00000000-0000-0000-0000-00005c529462) (property "Reference" "I4" (id 0) (at 84.582 117.0686 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3386,11 +3725,13 @@ (property "Spice_Model" "pulse(-1 1 2n 30n 2n 50n 100n)" (id 6) (at 84.582 121.6914 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 7ed9130e-2b33-447e-b612-755bc409baa2)) + (pin "2" (uuid 40ff61b8-8e26-4f05-9d4f-a0f29d685fa4)) ) (symbol (lib_id "v_i_sources:VPWL-Simulation_SPICE") (at 101.6 48.26 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52ef6f") + (uuid 00000000-0000-0000-0000-00005c52ef6f) (property "Reference" "V5" (id 0) (at 104.902 45.9486 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3412,11 +3753,13 @@ (property "Spice_Model" "pwl(0 -7 50n -7 51n -3 97n -4 171n -6.5 200n -6.5)" (id 6) (at 104.902 50.5714 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 73fa552d-091b-4c27-8262-df550a759cb8)) + (pin "2" (uuid 17acb785-e2d1-4c03-929f-4c3bca98c497)) ) (symbol (lib_id "v_i_sources:IPWL-Simulation_SPICE") (at 102.87 125.73 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c528b91") + (uuid 00000000-0000-0000-0000-00005c528b91) (property "Reference" "I5" (id 0) (at 106.172 123.4186 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3438,11 +3781,13 @@ (property "Spice_Model" "pwl(0 -7 50n -7 51n -3 97n -4 171n -6.5 200n -6.5)" (id 6) (at 106.172 128.0414 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid beddc87e-e1b9-4ad3-bf36-4b93dafe600b)) + (pin "2" (uuid 1df1dca0-2cdf-449d-8474-e977ba6c2d3e)) ) (symbol (lib_id "v_i_sources:VSFFM-Simulation_SPICE") (at 120.65 54.61 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52e253") + (uuid 00000000-0000-0000-0000-00005c52e253) (property "Reference" "V6" (id 0) (at 123.952 52.2986 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3464,11 +3809,13 @@ (property "Spice_Model" "sffm(-5 1 100meg 5 10meg)" (id 6) (at 123.952 56.9214 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid d0440d48-479e-49ad-b501-8ba8ea011253)) + (pin "2" (uuid ff0155b8-6687-4da7-acff-9c62cb9d867e)) ) (symbol (lib_id "v_i_sources:ISFFM-Simulation_SPICE") (at 121.92 132.08 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c527dc7") + (uuid 00000000-0000-0000-0000-00005c527dc7) (property "Reference" "I6" (id 0) (at 125.222 129.7686 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3490,11 +3837,13 @@ (property "Spice_Model" "sffm(-5 1 100meg 5 10meg)" (id 6) (at 125.222 134.3914 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 654c4b81-b27d-4c7b-9c43-6c9ca40a1727)) + (pin "2" (uuid 368383a1-dcdd-4eb4-abfb-90d268924eea)) ) (symbol (lib_id "v_i_sources:VSIN-Simulation_SPICE") (at 140.97 60.96 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52d6bf") + (uuid 00000000-0000-0000-0000-00005c52d6bf) (property "Reference" "V7" (id 0) (at 144.272 58.6486 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3516,11 +3865,13 @@ (property "Spice_Model" "sin(0 1 100meg 1n 1e10)" (id 6) (at 144.272 63.2714 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid da9bd840-85bd-4460-9436-00e156d2fe08)) + (pin "2" (uuid 9fe84b6c-bf14-4c8a-9849-0af2e9fcc408)) ) (symbol (lib_id "v_i_sources:ISIN-Simulation_SPICE") (at 142.24 138.43 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c527479") + (uuid 00000000-0000-0000-0000-00005c527479) (property "Reference" "I7" (id 0) (at 145.542 136.1186 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3542,11 +3893,13 @@ (property "Spice_Model" "sin(0 1 100meg 1n 1e10)" (id 6) (at 145.542 140.7414 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 54e10e6b-294d-4667-92b7-30eec6ca3d72)) + (pin "2" (uuid 13499c7b-0dec-4ad1-9d08-2df89822dd5c)) ) (symbol (lib_id "v_i_sources:VTRNOISE-Simulation_SPICE") (at 158.75 67.31 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52cc31") + (uuid 00000000-0000-0000-0000-00005c52cc31) (property "Reference" "V8" (id 0) (at 162.052 64.9986 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3568,11 +3921,13 @@ (property "Spice_Model" "trnoise(0.1 0.5n 0 0)" (id 6) (at 162.052 69.6214 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid b849f051-5bdb-467f-baec-73487da7e690)) + (pin "2" (uuid 54fb837b-32cc-4776-a9a5-75c81598ae8b)) ) (symbol (lib_id "v_i_sources:ITRNOISE-Simulation_SPICE") (at 160.02 144.78 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c526b8f") + (uuid 00000000-0000-0000-0000-00005c526b8f) (property "Reference" "I8" (id 0) (at 163.322 142.4686 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3594,11 +3949,13 @@ (property "Spice_Model" "trnoise(0.1 0.5n 0 0)" (id 6) (at 163.322 147.0914 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid bbde6d81-a73f-4f07-852e-109cea86b2ff)) + (pin "2" (uuid 64028ca2-3e0c-4f48-8d42-1b34a8f4d6bd)) ) (symbol (lib_id "v_i_sources:VTRRANDOM-Simulation_SPICE") (at 181.61 73.66 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c52c2f7") + (uuid 00000000-0000-0000-0000-00005c52c2f7) (property "Reference" "V9" (id 0) (at 184.912 71.3486 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3620,11 +3977,13 @@ (property "Spice_Model" "trrandom(2 100n 0 1)" (id 6) (at 184.912 75.9714 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid 54c01134-ed0e-4d05-8b29-fd0fee4b3a54)) + (pin "2" (uuid a36dff9b-03db-4744-bf5f-2ff2a759fbc4)) ) (symbol (lib_id "v_i_sources:ITRRANDOM-Simulation_SPICE") (at 182.88 151.13 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00005c5263e1") + (uuid 00000000-0000-0000-0000-00005c5263e1) (property "Reference" "I9" (id 0) (at 186.182 148.8186 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -3646,6 +4005,8 @@ (property "Spice_Model" "trrandom(2 100n 0 1)" (id 6) (at 186.182 153.4414 0) (effects (font (size 1.27 1.27)) (justify left)) ) + (pin "1" (uuid e4d6581a-ba1e-49b8-b0ad-a879c84f77d4)) + (pin "2" (uuid 789bcb71-994b-4a99-aec3-ce70d0152222)) ) (sheet_instances diff --git a/pcb_calculator/transline/units.h b/pcb_calculator/transline/units.h index 5a15863a5a..d604d5448c 100644 --- a/pcb_calculator/transline/units.h +++ b/pcb_calculator/transline/units.h @@ -40,10 +40,10 @@ inline double asinh( double x ) inline double acosh( double x ) { // must be x>=1, if not return Nan (Not a Number) - if( !(x>1.0) ) return sqrt( -1.0 ); + if( x < 1.0 ) return sqrt( -1.0 ); // return only the positive result (as sqrt does). - return log( x+sqrt(x*x-1.0) ); + return log( x+sqrt( x*x-1.0 ) ); } #endif