From 70fa76337f407f99a40495aa2c97c3077b8030bc Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Thu, 18 Jun 2020 09:06:10 -0700 Subject: [PATCH] Update rectifier example The rectifier example used an alternate order that refered to pin numbers rather than pin names as KiCad expects Fixes https://gitlab.com/kicad/code/kicad/issues/4678 --- .../simulation/rectifier/rectifier.kicad_sch | 388 ++++++++++++++++++ demos/simulation/rectifier/rectifier.pro | 6 +- demos/simulation/rectifier/rectifier.sch | 137 ------- 3 files changed, 393 insertions(+), 138 deletions(-) create mode 100644 demos/simulation/rectifier/rectifier.kicad_sch delete mode 100644 demos/simulation/rectifier/rectifier.sch diff --git a/demos/simulation/rectifier/rectifier.kicad_sch b/demos/simulation/rectifier/rectifier.kicad_sch new file mode 100644 index 0000000000..2768b398f2 --- /dev/null +++ b/demos/simulation/rectifier/rectifier.kicad_sch @@ -0,0 +1,388 @@ +(kicad_sch (version 20200608) (host eeschema "(5.99.0-1983-g08c61e678)") + + (page 1 1) + + (paper "A4") + + (lib_symbols + (symbol "rectifier_schlib:C" (pin_numbers hide) (pin_names (offset 0.254)) + (property "Reference" "C" (id 0) (at 0.635 2.54 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "C" (id 1) (at 0.635 -2.54 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 0.9652 -3.81 0) + (effects (font (size 1.27 1.27))) + ) + (property "Datasheet" "" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27))) + ) + (property "ki_fp_filters" "C?\nC_????_*\nC_????\nSMD*_c\nCapacitor*\nCapacitors_ThroughHole:C_Radial_D10_L13_P5\nCapacitors_SMD:C_0805\nCapacitors_SMD:C_1206" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "C_0_1" + (polyline + (pts (xy -2.032 -0.762) (xy 2.032 -0.762)) + (stroke (width 0.508)) (fill (type none)) + ) + (polyline + (pts (xy -2.032 0.762) (xy 2.032 0.762)) + (stroke (width 0.508)) (fill (type none)) + ) + ) + (symbol "C_1_1" + (pin passive line (at 0 3.81 270) (length 2.794) + (name "~" (effects (font (size 1.016 1.016)))) + (number "1" (effects (font (size 1.016 1.016)))) + ) + (pin passive line (at 0 -3.81 90) (length 2.794) + (name "~" (effects (font (size 1.016 1.016)))) + (number "2" (effects (font (size 1.016 1.016)))) + ) + ) + ) + (symbol "rectifier_schlib:D" (pin_numbers hide) (pin_names hide) + (property "Reference" "D" (id 0) (at 0 2.54 0) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "D" (id 1) (at 0 -2.54 0) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "" (id 2) (at 0 0 0) + (effects (font (size 1.27 1.27))) + ) + (property "Datasheet" "" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27))) + ) + (property "ki_fp_filters" "Diode_*\nD-Pak_TO252AA\n*SingleDiode\n*_Diode_*\n*SingleDiode*" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "D_0_1" + (polyline + (pts (xy -1.27 1.27) (xy -1.27 -1.27)) + (stroke (width 0.1524)) (fill (type none)) + ) + (polyline + (pts (xy 1.27 1.27) (xy -1.27 0) (xy 1.27 -1.27)) + (stroke (width 0)) (fill (type outline)) + ) + ) + (symbol "D_1_1" + (pin passive line (at -3.81 0 0) (length 2.54) + (name "K" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 3.81 0 180) (length 2.54) + (name "A" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + ) + ) + (symbol "rectifier_schlib:GND" (power) (pin_names (offset 0)) + (property "Reference" "#PWR" (id 0) (at 0 -3.81 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GND" (id 1) (at 0 -3.1242 0) + (effects (font (size 0.762 0.762))) + ) + (property "Footprint" "" (id 2) (at 0 0 0) + (effects (font (size 1.524 1.524))) + ) + (property "Datasheet" "" (id 3) (at 0 0 0) + (effects (font (size 1.524 1.524))) + ) + (symbol "GND_0_1" + (polyline + (pts (xy 0 0) (xy 0 -1.27) (xy 1.27 -1.27) (xy 0 -2.54) + (xy -1.27 -1.27) (xy 0 -1.27) + ) + (stroke (width 0)) (fill (type none)) + ) + ) + (symbol "GND_1_1" + (pin power_in line (at 0 0 270) (length 0) hide + (name "GND" (effects (font (size 0.762 0.762)))) + (number "1" (effects (font (size 0.508 0.508)))) + ) + ) + ) + (symbol "rectifier_schlib:R" (pin_numbers hide) (pin_names (offset 0)) + (property "Reference" "R" (id 0) (at 2.032 0 90) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "R" (id 1) (at 0 0 90) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "" (id 2) (at -1.778 0 90) + (effects (font (size 1.27 1.27))) + ) + (property "Datasheet" "" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27))) + ) + (property "ki_fp_filters" "R_*\nResistor_*" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "R_0_1" + (rectangle (start -1.016 -2.54) (end 1.016 2.54) + (stroke (width 0.254)) (fill (type none)) + ) + ) + (symbol "R_1_1" + (pin passive line (at 0 3.81 270) (length 1.27) + (name "~" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 0 -3.81 90) (length 1.27) + (name "~" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + ) + ) + (symbol "rectifier_schlib:VSOURCE" + (property "Reference" "V" (id 0) (at 5.08 5.08 0) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "VSOURCE" (id 1) (at 6.35 2.54 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Footprint" "" (id 2) (at 0 0 0) + (effects (font (size 1.27 1.27))) + ) + (property "Datasheet" "" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27))) + ) + (property "Fieldname" "Value" (id 4) (at 0 0 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Primitive" "V" (id 5) (at 0 0 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Node_Sequence" "1 2" (id 6) (at -7.62 5.08 0) + (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)) + ) + (polyline + (pts (xy 0 1.905) (xy -0.635 0.635) (xy 0.635 0.635) (xy 0 1.905)) + (stroke (width 0)) (fill (type outline)) + ) + ) + (symbol "VSOURCE_1_1" + (pin input line (at 0 5.08 270) (length 2.54) + (name "~" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin input line (at 0 -5.08 90) (length 2.54) + (name "~" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + ) + ) + ) + + (junction (at 111.76 109.22)) + (junction (at 137.16 93.98)) + (junction (at 137.16 109.22)) + + (wire (pts (xy 111.76 93.98) (xy 114.3 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 111.76 97.79) (xy 111.76 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 111.76 109.22) (xy 111.76 107.95)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 111.76 109.22) (xy 137.16 109.22)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 111.76 110.49) (xy 111.76 109.22)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 121.92 93.98) (xy 125.73 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 133.35 93.98) (xy 137.16 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 137.16 93.98) (xy 146.05 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 137.16 97.79) (xy 137.16 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 137.16 109.22) (xy 137.16 105.41)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 137.16 109.22) (xy 146.05 109.22)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 146.05 93.98) (xy 146.05 97.79)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 146.05 109.22) (xy 146.05 105.41)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + + (text ".tran 1u 10m\n" (at 109.22 124.46 0) + (effects (font (size 1.524 1.524)) (justify left bottom)) + ) + (text "*.ac dec 10 1 1Meg\n" (at 109.22 127 0) + (effects (font (size 1.524 1.524)) (justify left bottom)) + ) + + (label "signal_in" (at 111.76 93.98 180) + (effects (font (size 1.524 1.524)) (justify right bottom)) + ) + (label "rect_out" (at 146.05 93.98 0) + (effects (font (size 1.524 1.524)) (justify left bottom)) + ) + + (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") + (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)) + ) + + (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") + (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)) + (property "Datasheet" "" (id 3) (at 118.11 93.98 0)) + (property "Fieldname" "Value" (id 4) (at 118.11 93.98 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "SpiceMapping" "1 2" (id 5) (at 118.11 93.98 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Primitive" "R" (id 6) (at 118.11 93.98 90) + (effects (font (size 1.524 1.524)) hide) + ) + ) + + (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") + (property "Reference" "R2" (id 0) (at 147.828 100.4316 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (property "Value" "100k" (id 1) (at 147.828 102.743 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (property "Footprint" "" (id 2) (at 147.828 101.6 90)) + (property "Datasheet" "" (id 3) (at 146.05 101.6 0)) + (property "Fieldname" "Value" (id 4) (at 146.05 101.6 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "SpiceMapping" "1 2" (id 5) (at 146.05 101.6 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Primitive" "R" (id 6) (at 146.05 101.6 90) + (effects (font (size 1.524 1.524)) hide) + ) + ) + + (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") + (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)) + (property "Datasheet" "" (id 3) (at 129.54 93.98 0)) + (property "Fieldname" "Value" (id 4) (at 129.54 93.98 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Primitive" "D" (id 5) (at 129.54 93.98 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Node_Sequence" "A K" (id 6) (at 129.54 93.98 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Model" "1N4148" (id 7) (at 129.54 93.98 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Spice_Netlist_Enabled" "Y" (id 8) (at 129.54 93.98 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Spice_Lib_File" "diode.mod" (id 9) (at 129.54 93.98 0) + (effects (font (size 1.27 1.27)) hide) + ) + ) + + (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") + (property "Reference" "C1" (id 0) (at 140.081 100.4316 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "100n" (id 1) (at 140.081 102.743 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 138.1252 105.41 0)) + (property "Datasheet" "" (id 3) (at 137.16 101.6 0)) + (property "Fieldname" "Value" (id 4) (at 137.16 101.6 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Primitive" "C" (id 5) (at 137.16 101.6 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "SpiceMapping" "1 2" (id 6) (at 137.16 101.6 0) + (effects (font (size 1.524 1.524)) hide) + ) + ) + + (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") + (property "Reference" "V1" (id 0) (at 108.5088 104.0384 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "SINE(0 1.5 1k 0 0 0 0)" (id 1) (at 108.5088 101.727 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 111.76 102.87 0)) + (property "Datasheet" "" (id 3) (at 111.76 102.87 0)) + (property "Fieldname" "Value" (id 4) (at 111.76 102.87 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Primitive" "V" (id 5) (at 111.76 102.87 0) + (effects (font (size 1.524 1.524)) hide) + ) + (property "Spice_Node_Sequence" "1 2" (id 6) (at 119.38 107.95 0) + (effects (font (size 1.524 1.524)) hide) + ) + ) + + (symbol_instances + (path "/00000000-0000-0000-0000-0000573360d3" + (reference "#PWR01") (unit 1) + ) + (path "/00000000-0000-0000-0000-00005733628f" + (reference "C1") (unit 1) + ) + (path "/00000000-0000-0000-0000-0000573361b8" + (reference "D1") (unit 1) + ) + (path "/00000000-0000-0000-0000-0000573360f5" + (reference "R1") (unit 1) + ) + (path "/00000000-0000-0000-0000-0000573362f7" + (reference "R2") (unit 1) + ) + (path "/00000000-0000-0000-0000-000057336052" + (reference "V1") (unit 1) + ) + ) +) diff --git a/demos/simulation/rectifier/rectifier.pro b/demos/simulation/rectifier/rectifier.pro index a1f75cb663..ef540264a0 100644 --- a/demos/simulation/rectifier/rectifier.pro +++ b/demos/simulation/rectifier/rectifier.pro @@ -1,4 +1,4 @@ -update=14/11/2017 20:04:15 +update=Thu 18 Jun 2020 09:04:02 AM PDT version=1 last_client=kicad [general] @@ -30,3 +30,7 @@ NetIExt=net [eeschema] version=1 LibDir= +[LibeditFrame] +version=1 +[sheetnames] +1=fc849101-9c50-4382-a6ee-be9b346a29f5: diff --git a/demos/simulation/rectifier/rectifier.sch b/demos/simulation/rectifier/rectifier.sch deleted file mode 100644 index d1ba00fe53..0000000000 --- a/demos/simulation/rectifier/rectifier.sch +++ /dev/null @@ -1,137 +0,0 @@ -EESchema Schematic File Version 4 -EELAYER 30 0 -EELAYER END -$Descr A4 11693 8268 -encoding utf-8 -Sheet 1 1 -Title "" -Date "" -Rev "" -Comp "" -Comment1 "" -Comment2 "" -Comment3 "" -Comment4 "" -$EndDescr -$Comp -L rectifier_schlib:VSOURCE V1 -U 1 1 57336052 -P 4400 4050 -F 0 "V1" H 4528 4096 50 0000 L CNN -F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50 0000 L CNN -F 2 "" H 4400 4050 50 0000 C CNN -F 3 "" H 4400 4050 50 0000 C CNN -F 4 "Value" H 4400 4050 60 0001 C CNN "Fieldname" -F 5 "V" H 4400 4050 60 0001 C CNN "Spice_Primitive" -F 6 "1 2" H 4100 4250 60 0001 C CNN "Spice_Node_Sequence" - 1 4400 4050 - -1 0 0 1 -$EndComp -$Comp -L rectifier_schlib:GND #PWR01 -U 1 1 573360D3 -P 4400 4350 -F 0 "#PWR01" H 4400 4100 50 0001 C CNN -F 1 "GND" H 4405 4177 50 0000 C CNN -F 2 "" H 4400 4350 50 0000 C CNN -F 3 "" H 4400 4350 50 0000 C CNN - 1 4400 4350 - 1 0 0 -1 -$EndComp -$Comp -L rectifier_schlib:R R1 -U 1 1 573360F5 -P 4650 3700 -F 0 "R1" V 4443 3700 50 0000 C CNN -F 1 "1k" V 4534 3700 50 0000 C CNN -F 2 "" V 4580 3700 50 0000 C CNN -F 3 "" H 4650 3700 50 0000 C CNN -F 4 "Value" H 4650 3700 60 0001 C CNN "Fieldname" -F 5 "1 2" H 4650 3700 60 0001 C CNN "SpiceMapping" -F 6 "R" V 4650 3700 60 0001 C CNN "Spice_Primitive" - 1 4650 3700 - 0 1 1 0 -$EndComp -$Comp -L rectifier_schlib:D D1 -U 1 1 573361B8 -P 5100 3700 -F 0 "D1" H 5100 3485 50 0000 C CNN -F 1 "1N4148" H 5100 3576 50 0000 C CNN -F 2 "" H 5100 3700 50 0000 C CNN -F 3 "" H 5100 3700 50 0000 C CNN -F 4 "Value" H 5100 3700 60 0001 C CNN "Fieldname" -F 5 "D" H 5100 3700 60 0001 C CNN "Spice_Primitive" -F 6 "2 1" H 5100 3700 60 0001 C CNN "Spice_Node_Sequence" -F 7 "1N4148" H 5100 3700 50 0001 C CNN "Spice_Model" -F 8 "Y" H 5100 3700 50 0001 C CNN "Spice_Netlist_Enabled" -F 9 "diode.mod" H 5100 3700 50 0001 C CNN "Spice_Lib_File" - 1 5100 3700 - -1 0 0 1 -$EndComp -$Comp -L rectifier_schlib:C C1 -U 1 1 5733628F -P 5400 4000 -F 0 "C1" H 5515 4046 50 0000 L CNN -F 1 "100n" H 5515 3955 50 0000 L CNN -F 2 "" H 5438 3850 50 0000 C CNN -F 3 "" H 5400 4000 50 0000 C CNN -F 4 "Value" H 5400 4000 60 0001 C CNN "Fieldname" -F 5 "C" H 5400 4000 60 0001 C CNN "Spice_Primitive" -F 6 "1 2" H 5400 4000 60 0001 C CNN "SpiceMapping" - 1 5400 4000 - 1 0 0 -1 -$EndComp -$Comp -L rectifier_schlib:R R2 -U 1 1 573362F7 -P 5750 4000 -F 0 "R2" H 5680 3954 50 0000 R CNN -F 1 "100k" H 5680 4045 50 0000 R CNN -F 2 "" V 5680 4000 50 0000 C CNN -F 3 "" H 5750 4000 50 0000 C CNN -F 4 "Value" H 5750 4000 60 0001 C CNN "Fieldname" -F 5 "1 2" H 5750 4000 60 0001 C CNN "SpiceMapping" -F 6 "R" V 5750 4000 60 0001 C CNN "Spice_Primitive" - 1 5750 4000 - -1 0 0 1 -$EndComp -Text Notes 4300 4900 0 60 ~ 0 -.tran 1u 10m\n -Wire Wire Line - 4400 4350 4400 4300 -Wire Wire Line - 4400 4300 5400 4300 -Connection ~ 4400 4300 -Wire Wire Line - 5250 3700 5400 3700 -Wire Wire Line - 5750 3700 5750 3850 -Wire Wire Line - 5400 3850 5400 3700 -Connection ~ 5400 3700 -Wire Wire Line - 5400 4300 5400 4150 -Wire Wire Line - 5750 4300 5750 4150 -Connection ~ 5400 4300 -Wire Wire Line - 4800 3700 4950 3700 -Wire Wire Line - 4400 3850 4400 3700 -Wire Wire Line - 4400 3700 4500 3700 -Text Label 4400 3700 2 60 ~ 0 -signal_in -Text Label 5750 3700 0 60 ~ 0 -rect_out -Text Notes 4300 5000 0 60 ~ 0 -*.ac dec 10 1 1Meg\n -Wire Wire Line - 4400 4300 4400 4250 -Wire Wire Line - 5400 3700 5750 3700 -Wire Wire Line - 5400 4300 5750 4300 -$EndSCHEMATC