fix gndlink in .connecteds and make things compile

Author: ducky64

edg/abstract_parts/AbstractDevices.py

@@ -17,6 +17,6 @@ def __init__(self, voltage: RangeLike,
     self.capacity = self.ArgParameter(capacity)
     self.actual_capacity = self.Parameter(RangeExpr())
 
-    self.require(self.pwr.voltage_out.within(voltage))
+    self.require(self.pwr.voltage_out.within(voltage + self.gnd.link().voltage))
     self.require(self.pwr.current_limits.contains(current))
     self.require(self.actual_capacity.upper() >= capacity)

edg/abstract_parts/AbstractResistor.py

@@ -157,7 +157,7 @@ def __init__(self, resistance: RangeLike) -> None:
       DigitalSource.pulldown_from_supply(self.gnd)
     ), [InOut])
 
-  def connected(self, gnd: Optional[Port[VoltageLink]] = None, io: Optional[Port[DigitalLink]] = None) -> \
+  def connected(self, gnd: Optional[Port[GroundLink]] = None, io: Optional[Port[DigitalLink]] = None) -> \
       'PulldownResistor':
     """Convenience function to connect both ports, returning this object so it can still be given a name."""
     if gnd is not None:

edg/abstract_parts/PassiveFilters.py

@@ -51,7 +51,7 @@ def __init__(self, impedance: RangeLike, time_constant: RangeLike):
     self.io = self.Export(self.rc.output.adapt_to(DigitalSource.pullup_from_supply(self.pwr)), [Output])
     self.gnd = self.Export(self.rc.gnd.adapt_to(Ground()), [Common])
 
-  def connected(self, *, gnd: Optional[Port[VoltageLink]] = None, pwr: Optional[Port[VoltageLink]] = None,
+  def connected(self, *, gnd: Optional[Port[GroundLink]] = None, pwr: Optional[Port[VoltageLink]] = None,
                 io: Optional[Port[DigitalLink]] = None) -> 'PullupDelayRc':
     """Convenience function to connect both ports, returning this object so it can still be given a name."""
     if gnd is not None:

edg/electronics_model/CircuitBlock.py

@@ -9,7 +9,7 @@
 from .KiCadImportableBlock import KiCadImportableBlock
 
 
-CircuitLinkType = TypeVar('CircuitLinkType', bound=Link)
+CircuitLinkType = TypeVar('CircuitLinkType', bound=Link, covariant=True)
 class CircuitPort(Port[CircuitLinkType], Generic[CircuitLinkType]):
   """Electrical connection that represents a single port into a single copper net"""
   pass

edg/electronics_model/DigitalPorts.py

@@ -471,7 +471,7 @@ def __init__(self, *, voltage_limits: RangeLike = RangeExpr.ALL,
 class DigitalSingleSourceFake:
   @staticmethod
   @deprecated("use DigitalSource.sink_from_supply")
-  def low_from_supply(neg: Port[VoltageLink], is_pulldown: bool = False) -> DigitalSource:
+  def low_from_supply(neg: Port[GroundLink], is_pulldown: bool = False) -> DigitalSource:
     if not is_pulldown:
       return DigitalSource.low_from_supply(neg)
     else:

edg/parts/Batteries.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Union
 
 from ..abstract_parts import *
 
@@ -57,8 +57,8 @@ def contents(self):
 class AaBattery(Battery, FootprintBlock):
   """AA battery holder supporting alkaline and rechargeable chemistries."""
   @init_in_parent
-  def __init__(self, voltage: RangeLike = (0.9, 1.6)*Volt, *args,
-               actual_voltage: RangeLike = (0.9, 1.6)*Volt, **kwargs):
+  def __init__(self, voltage: RangeLike = (1.0, 1.6)*Volt, *args,
+               actual_voltage: RangeLike = (1.0, 1.6)*Volt, **kwargs):
     super().__init__(voltage, *args, **kwargs)
     self.gnd.init_from(Ground())
     self.pwr.init_from(VoltageSource(
@@ -84,22 +84,28 @@ def contents(self):
 class AaBatteryStack(Battery, GeneratorBlock):
     """AA Alkaline battery stack that generates batteries in series"""
     @init_in_parent
-    def __init__(self, count: IntLike = 1, *, cell_actual_voltage: RangeLike = (0.9, 1.6)*Volt):
-        super().__init__()
+    def __init__(self, count: IntLike = 1, *, cell_actual_voltage: RangeLike = (1.0, 1.6)*Volt):
+        super().__init__(voltage=Range.all())  # no voltage spec passed in
         self.count = self.ArgParameter(count)
         self.cell_actual_voltage = self.ArgParameter(cell_actual_voltage)
         self.generator_param(self.count)
 
     def generate(self):
         super().generate()
         prev_cell: Optional[AaBattery] = None
+        prev_capacity_min: Union[FloatExpr, float] = float('inf')
+        prev_capacity_max: Union[FloatExpr, float] = float('inf')
         self.cell = ElementDict[AaBattery]()
         for i in range(self.get(self.count)):
           self.cell[i] = cell = self.Block(AaBattery(actual_voltage=self.cell_actual_voltage))
-          if prev_cell is None:  # direct connect to gnd
+          if prev_cell is None:  # first cell, direct connect to gnd
             self.connect(self.gnd, cell.gnd)
           else:
-            self.connect(prev_cell.pwr.as_ground(), cell.gnd)
+            self.connect(prev_cell.pwr.as_ground(self.pwr.link().current_drawn), cell.gnd)
+            prev_capacity_min = cell.actual_capacity.lower().min(prev_capacity_min)
+            prev_capacity_max=  cell.actual_capacity.upper().min(prev_capacity_max)
+          prev_cell = cell
 
         assert prev_cell is not None, "must generate >=1 cell"
         self.connect(self.pwr, prev_cell.pwr)
+        self.assign(self.actual_capacity, (prev_capacity_min, prev_capacity_max))

edg/parts/Microcontroller_Rp2040.py

@@ -432,6 +432,7 @@ def contents(self) -> None:
 
     self.pwr_vin.init_from(VoltageSink(  # based on RS3236-3.3
       voltage_limits=(3.3*1.025 + 0.55, 7.5)*Volt,  # output * tolerance + dropout @ 300mA
+      current_draw=RangeExpr()
     ))
     self.vusb_out.init_from(VoltageSource(
       voltage_out=UsbConnector.USB2_VOLTAGE_RANGE,
@@ -447,7 +448,7 @@ def contents(self) -> None:
     ))
     self.require(~self.pwr_out.is_connected() | ~self.pwr.is_connected(), "cannot use both 3.3v out and 3.3v in")
     self.assign(self.pwr_vin.current_draw, self.pwr_out.is_connected().then_else(  # prop output current draw
-      self.pwr_out.link().current_drawn, (0, 0)
+      self.pwr_out.link().current_drawn, (0, 0)*Amp
     ))
 
     self.generator_param(self.pwr.is_connected())

edg/parts/PowerConditioning.py

@@ -254,7 +254,7 @@ def contents(self):
         'gnd': Ground(),
       })
 
-  def connected_from(self, gnd: Optional[Port[VoltageLink]] = None, pwr_hi: Optional[Port[VoltageLink]] = None,
+  def connected_from(self, gnd: Optional[Port[GroundLink]] = None, pwr_hi: Optional[Port[VoltageLink]] = None,
                      pwr_lo: Optional[Port[VoltageLink]] = None) -> 'PriorityPowerOr':
     """Convenience function to connect ports, returning this object so it can still be given a name."""
     if gnd is not None:

examples/test_blinky.py

@@ -20,7 +20,7 @@ class TestBlinkyEmpty(SimpleBoardTop):
 class TestBlinkyBasicBattery(SimpleBoardTop):
   """The simplest cirucit, a microcontroller dev board with a LED, powered from a battery"""
   def contents(self) -> None:
-    self.bat = self.Block(AaBatteryStack(3))
+    self.bat = self.Block(AaBatteryStack(4))
     self.mcu = self.Block(Xiao_Rp2040())
     self.led = self.Block(IndicatorLed())