Merge pull request #132 from shanemmattner/master

Refactor and move functions
devbisme · Sep 20, 2021 · 99ed232 · 99ed232
2 parents bc2b927 + a28fbc9
commit 99ed232
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 179 deletions.
diff --git a/examples/stm32_usb_buck/connection_circuits.py b/examples/stm32_usb_buck/connection_circuits.py
@@ -2,6 +2,11 @@
 
 # Connectors, terminal blocks, etc
 
+
+# @SubCircuit
+# def headers(i2c_sda, i2c_scl, uart_tx, uart_rx, vdd, gnd):
+
+
 # Debug header circuit
 @SubCircuit
 def debug_header(reset, swdclk, swdio, swo, vref, gnd):

diff --git a/examples/stm32_usb_buck/main.py b/examples/stm32_usb_buck/main.py
@@ -17,9 +17,9 @@
 stm32.stm32f405r()
 pc.power_circuits()
 
-# Generate netlist
-netlist_path = "/home/cdsfsmattner/Desktop/skidl/examples/stm32_usb_buck/stm32/netlist.net"
-generate_netlist(file_ = netlist_path)
+# # Generate netlist
+# netlist_path = "/home/cdsfsmattner/Desktop/skidl/examples/stm32_usb_buck/stm32/netlist.net"
+# generate_netlist(file_ = netlist_path)
 
 # Generate schematic
 schematic_path = "/home/cdsfsmattner/Desktop/skidl/examples/stm32_usb_buck/stm32/stm32.sch"

diff --git a/examples/stm32_usb_buck/power_circuits.py b/examples/stm32_usb_buck/power_circuits.py
@@ -6,7 +6,7 @@
 
 @package
 def power_circuits():
-    buck(pn.v_12v, pn.v_3v3, pn.v_5v, pn.gnd)
+    buck(pn.v_12v,pn.v_5v,pn.v_3v3, pn.gnd)
     anlg_flt(pn.vdda, pn.gnd, pn.vdda)
 
 
@@ -15,7 +15,6 @@ def anlg_flt(vdd, gnd, vdda):
     c1 = Part("Device", 'C_Small', footprint='C_0603_1608Metric', value='1uF')
     c2 = Part("Device", 'C_Small', footprint='C_0603_1608Metric', value='10nF')
     l1 = Part("Device", 'L_Small', footprint='L_0603_1608Metric', value='29nH')
-
     # Connect pins
     vdda += c1.p1, c2.p1, l1.p2
     vdd += l1.p1