cleaning

Author: ducky64

edg/abstract_parts/AbstractPowerConverters.py

@@ -362,6 +362,7 @@ def __init__(self, input_voltage: RangeLike, output_voltage: RangeLike, frequenc
 
     self.actual_dutycycle = self.Parameter(RangeExpr())
     self.actual_inductor_current_ripple = self.Parameter(RangeExpr())
+    self.actual_inductor_current_peak = self.Parameter(RangeExpr())
 
   def contents(self):
     super().contents()
@@ -392,9 +393,11 @@ def generate(self) -> None:
         self._buck_inductor_filter, values.inductor_avg_current.upper, values.ripple_scale, values.min_ripple)
     ))
     self.assign(self.actual_inductor_current_ripple, values.ripple_scale / self.inductor.actual_inductance)
+    self.assign(self.actual_inductor_current_peak,
+                values.inductor_avg_current + self.actual_inductor_current_ripple / 2)
 
     self.connect(self.switch, self.inductor.a.adapt_to(VoltageSink(
-      current_draw=values.inductor_avg_current
+      current_draw=self.output_current * values.effective_dutycycle
     )))
     self.connect(self.pwr_out, self.inductor.b.adapt_to(VoltageSource(
       voltage_out=self.output_voltage,
@@ -553,6 +556,7 @@ def __init__(self, input_voltage: RangeLike, output_voltage: RangeLike, frequenc
 
     self.actual_dutycycle = self.Parameter(RangeExpr())
     self.actual_inductor_current_ripple = self.Parameter(RangeExpr())
+    self.actual_inductor_current_peak = self.Parameter(RangeExpr())
 
   def contents(self):
     super().contents()
@@ -584,6 +588,8 @@ def generate(self) -> None:
         values.inductor_avg_current.upper, values.ripple_scale, values.min_ripple)
     ))
     self.assign(self.actual_inductor_current_ripple, values.ripple_scale / self.inductor.actual_inductance)
+    self.assign(self.actual_inductor_current_peak,
+                values.inductor_avg_current + self.actual_inductor_current_ripple / 2)
 
     self.connect(self.pwr_in, self.inductor.a.adapt_to(VoltageSink(
       current_draw=values.inductor_avg_current

edg/parts/BuckBoostConverter_Custom.py

@@ -71,14 +71,12 @@ def contents(self):
     self.connect(self.buck_sw.pwr_logic, self.pwr_logic)
     self.connect(self.buck_sw.with_mixin(HalfBridgePwm()).pwm_ctl, self.buck_pwm)
     self.connect(self.buck_sw.with_mixin(Resettable()).reset, self.reset)
-    (self.pwr_in_forced, ), _ = self.chain(  # use average draw instead of peak for external draw specs
+    (self.pwr_in_force, ), _ = self.chain(  # use average draw for power input draw
       self.pwr_in,
-      self.Block(ForcedVoltageCurrentDraw(self.pwr_out.link().current_drawn *
-                                          self.output_voltage / self.pwr_in.link().voltage /
-                                          self.power_path.efficiency)),
+      self.Block(ForcedVoltageCurrentDraw(self.power_path.switch_in.current_draw)),
       self.buck_sw.pwr
     )
-    (self._sw_in_force, ), _ = self.chain(  # current draw used to size FETs, size for peak current
+    (self.sw_in_force, ), _ = self.chain(  # current draw used to size FETs, size for peak current
       self.buck_sw.out,
       self.Block(ForcedVoltageCurrentDraw(self.power_path.actual_inductor_current_peak)),
       self.power_path.switch_in
@@ -89,14 +87,14 @@ def contents(self):
     self.connect(self.boost_sw.pwr_logic, self.pwr_logic)
     self.connect(self.boost_sw.with_mixin(HalfBridgePwm()).pwm_ctl, self.boost_pwm)
     self.connect(self.boost_sw.with_mixin(Resettable()).reset, self.reset)
-    (self.boost_pwr_conn, ), _ = self.chain(
+    (self.pwr_out_force, ), _ = self.chain(  # use average output limits for power out limits
       self.boost_sw.pwr,
       self.Block(VoltageSinkConnector(self.output_voltage,
                                       Range.all(),  # unused, port actually in reverse
                                       self.power_path.switch_out.current_limits)),
       self.pwr_out
     )
-    (self._sw_out_force, ), _ = self.chain(  # current draw used to size FETs, size for peak current
+    (self.sw_out_force, ), _ = self.chain(  # current draw used to size FETs, size for peak current
       self.power_path.switch_out,
       self.Block(VoltageSourceConnector(Range.exact(0),
                                         self.power_path.actual_inductor_current_peak)),

edg/parts/BuckConverter_Custom.py

@@ -38,16 +38,15 @@ def contents(self):
 
         self.sw = self.Block(FetHalfBridge(frequency=self.frequency, fet_rds=self.rds_on))
         self.connect(self.sw.gnd, self.gnd)
-        (self.sw_in_force, ), _ = self.chain(  # use average current draw for boundary ports
+        (self.pwr_in_force, ), _ = self.chain(  # use average current draw for boundary ports
             self.pwr_in,
             self.Block(ForcedVoltageCurrentDraw(self.power_path.switch.link().current_drawn)),
             self.sw.pwr)
         self.connect(self.sw.pwr_logic, self.pwr_logic)
         sw_ctl = self.sw.with_mixin(HalfBridgeIndependent())
         self.connect(sw_ctl.low_ctl, self.pwm_low)
         self.connect(sw_ctl.high_ctl, self.pwm_high)
-        (self.sw_force, ), _ = self.chain(
+        (self.sw_out_force, ), _ = self.chain(
             self.sw.out,  # current draw used to size FETs, size for peak current
-            self.Block(ForcedVoltageCurrentDraw(self.power_path.output_current
-                                                + self.power_path.actual_inductor_current_ripple / 2)),
+            self.Block(ForcedVoltageCurrentDraw(self.power_path.actual_inductor_current_peak)),
             self.power_path.switch)

edg/parts/FanConnector.py

@@ -9,7 +9,7 @@ def __init__(self):
         self.gnd = self.Port(Ground(), [Common])
         self.pwr = self.Port(VoltageSink(
             voltage_limits=12*Volt(tol=0.05),
-            current_draw=(0, 2.2)*Amp,  # section 2.1.2: 2.2A max for up to 2s during startup
+            current_draw=(0, 2.2)*Amp,  # section 2.1.2: 2.2A max up to 1s during startup, steady-state 1.5A
         ), [Power])
         self.sense = self.Port(DigitalSource.low_from_supply(self.gnd))  # tolerant up to 12v