Merge remote-tracking branch 'origin/master' into circle

Author: Suke0811

.github/workflows/pr-scala.yml

@@ -36,6 +36,8 @@ jobs:
     - uses: actions/setup-python@v1
       with:
         python-version: '3.10'
+    - name: Setup sbt launcher
+      uses: sbt/setup-sbt@v1
     - name: install dependencies
       run: pip install -r requirements.txt
     - name: sbt test

compiler/src/main/scala/edg/compiler/ExprEvaluate.scala

@@ -188,7 +188,16 @@ object ExprEvaluate {
         }
 
       case Op.RANGE => (lhs, rhs) match {
-          case (FloatPromotable(lhs), FloatPromotable(rhs)) => RangeValue(math.min(lhs, rhs), math.max(lhs, rhs))
+          case (FloatPromotable(lhs), FloatPromotable(rhs)) =>
+            if (lhs.isNaN && rhs.isNaN) { // here, NaN is treated as empty and dispreferred (instead of NaN prop)
+              RangeEmpty
+            } else if (lhs.isNaN) {
+              RangeValue(rhs, rhs)
+            } else if (rhs.isNaN) {
+              RangeValue(lhs, lhs)
+            } else {
+              RangeValue(math.min(lhs, rhs), math.max(lhs, rhs))
+            }
           case _ =>
             throw new ExprEvaluateException(s"Unknown binary operands types in $lhs ${binary.op} $rhs from $binary")
         }
@@ -253,12 +262,19 @@ object ExprEvaluate {
             RangeValue(1.0 / valMax, 1.0 / valMin)
           case RangeEmpty => RangeEmpty
           case FloatValue(opVal) => FloatValue(1.0 / opVal)
-          case IntValue(opVal) => IntValue(1 / opVal)
+          case IntValue(opVal) =>
+            FloatValue(1.0 / opVal.floatValue) // follow Python convention of division promoting to float
           case _ => throw new ExprEvaluateException(s"Unknown unary operand type in ${unary.op} ${`val`} from $unary")
         }
 
       case (Op.MIN, RangeValue(valMin, _)) => FloatValue(valMin)
       case (Op.MAX, RangeValue(_, valMax)) => FloatValue(valMax)
+
+      // TODO can we have stricter semantics to avoid min(RangeEmpty) and max(RangeEmpty)?
+      // This just NaNs out so at least it propagates
+      case (Op.MAX, RangeEmpty) => FloatValue(Float.NaN)
+      case (Op.MIN, RangeEmpty) => FloatValue(Float.NaN)
+
       case (Op.CENTER, RangeValue(valMin, valMax)) => FloatValue((valMin + valMax) / 2)
       case (Op.WIDTH, RangeValue(valMin, valMax)) => FloatValue(math.abs(valMax - valMin))
 
@@ -273,6 +289,7 @@ object ExprEvaluate {
       case (Op.SUM, ArrayValue.Empty(_)) => FloatValue(0) // TODO type needs to be dynamic
       case (Op.SUM, ArrayValue.ExtractFloat(vals)) => FloatValue(vals.sum)
       case (Op.SUM, ArrayValue.ExtractInt(vals)) => IntValue(vals.sum)
+      case (Op.SUM, ArrayValue.ExtractBoolean(vals)) => IntValue(vals.count(_ == true))
       case (Op.SUM, ArrayValue.UnpackRange(extracted)) => extracted match {
           case ArrayValue.UnpackRange.FullRange(valMins, valMaxs) => RangeValue(valMins.sum, valMaxs.sum)
           case _ => RangeEmpty // TODO how should sum behave on empty ranges?
@@ -294,15 +311,6 @@ object ExprEvaluate {
       case (Op.MINIMUM, ArrayValue.ExtractFloat(vals)) => FloatValue(vals.min)
       case (Op.MINIMUM, ArrayValue.ExtractInt(vals)) => IntValue(vals.min)
 
-      // TODO this is definitely a hack in the absence of a proper range extractor
-      case (Op.MAXIMUM, RangeValue(lower, upper)) => FloatValue(upper)
-      case (Op.MINIMUM, RangeValue(lower, upper)) => FloatValue(lower)
-
-      // TODO can we have stricter semantics to avoid min(RangeEmpty) and max(RangeEmpty)?
-      // This just NaNs out so at least it propagates
-      case (Op.MAXIMUM, RangeEmpty) => FloatValue(Float.NaN)
-      case (Op.MINIMUM, RangeEmpty) => FloatValue(Float.NaN)
-
       // TODO this should be a user-level assertion instead of a compiler error
       case (Op.SET_EXTRACT, ArrayValue.Empty(_)) =>
         throw new ExprEvaluateException(s"SetExtract with empty values from $unarySet")

developing.md

@@ -38,7 +38,7 @@ python -m unittest discover
 
 Or, to run tests for a specific package (eg, `edg_core` in this command):
 ```
-python -m unittest discover -s edg_core -t .
+python -m unittest discover -s edg.core -t .
 ```
 
 Or, to run one specific test:

edg/BoardTop.py

@@ -95,6 +95,7 @@ def refinements(self) -> Refinements:
         (Fpc050Top, Afc07Top),
         (Fpc030Bottom, HiroseFh35cshw),
         (UsbEsdDiode, Pesd5v0x1bt),
+        (Comparator, Lmv331),
         (Opamp, Lmv321),
         (SpiMemory, W25q),  # 128M version is a basic part
         (TestPoint, Keystone5015),  # this is larger, but is part of JLC's parts inventory

edg/abstract_parts/AbstractComparator.py

@@ -0,0 +1,24 @@
+from typing import Mapping
+
+from ..electronics_model import *
+
+
+class Comparator(KiCadInstantiableBlock, Block):
+    """Abstract comparator interface, output goes high when inp > inn."""
+    def symbol_pinning(self, symbol_name: str) -> Mapping[str, BasePort]:
+        assert symbol_name in ('Simulation_SPICE:OPAMP', 'edg_importable:Opamp')
+        return {'+': self.inp, '-': self.inn, '3': self.out, 'V+': self.pwr, 'V-': self.gnd}
+
+    @classmethod
+    def block_from_symbol(cls, symbol_name: str, properties: Mapping[str, str]) -> 'Comparator':
+        return Comparator()
+
+    @init_in_parent
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.pwr = self.Port(VoltageSink.empty(), [Power])
+        self.gnd = self.Port(Ground.empty(), [Common])
+        self.inn = self.Port(AnalogSink.empty())
+        self.inp = self.Port(AnalogSink.empty())
+        self.out = self.Port(DigitalSource.empty())

edg/abstract_parts/AbstractDebugHeaders.py

@@ -17,7 +17,7 @@ class SwdCortexTargetConnectorReset(BlockInterfaceMixin[SwdCortexTargetConnector
   """Mixin for SWD connectors with adding the optional reset pin"""
   def __init__(self, *args, **kwargs) -> None:
     super().__init__(*args, **kwargs)
-    self.reset = self.Port(DigitalBidir.empty(), optional=True)  # can tri-state when not asserted
+    self.reset = self.Port(DigitalSource.empty(), optional=True)  # as open-drain
 
 
 class SwdCortexTargetConnectorSwo(BlockInterfaceMixin[SwdCortexTargetConnector]):

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

@@ -131,7 +131,7 @@ def __init__(self, resistance: RangeLike) -> None:
 
     self.pwr = self.Export(self.res.a.adapt_to(VoltageSink()), [Power])
     self.io = self.Export(self.res.b.adapt_to(
-      DigitalSingleSource.high_from_supply(self.pwr, is_pullup=True)
+      DigitalSource.pullup_from_supply(self.pwr)
     ), [InOut])
 
   def connected(self, pwr: Optional[Port[VoltageLink]] = None, io: Optional[Port[DigitalLink]] = None) -> \
@@ -154,10 +154,10 @@ def __init__(self, resistance: RangeLike) -> None:
 
     self.gnd = self.Export(self.res.a.adapt_to(Ground()), [Common])
     self.io = self.Export(self.res.b.adapt_to(
-      DigitalSingleSource.low_from_supply(self.gnd, is_pulldown=True)
+      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:
@@ -173,7 +173,7 @@ class PullupResistorArray(TypedTestPoint, GeneratorBlock):
   def __init__(self, resistance: RangeLike):
     super().__init__()
     self.pwr = self.Port(VoltageSink.empty(), [Power])
-    self.io = self.Port(Vector(DigitalSingleSource.empty()), [InOut])
+    self.io = self.Port(Vector(DigitalSource.empty()), [InOut])
     self.generator_param(self.io.requested())
     self.resistance = self.ArgParameter(resistance)
 
@@ -183,7 +183,7 @@ def generate(self):
     for requested in self.get(self.io.requested()):
       res = self.res[requested] = self.Block(PullupResistor(self.resistance))
       self.connect(self.pwr, res.pwr)
-      self.connect(self.io.append_elt(DigitalSingleSource.empty(), requested), res.io)
+      self.connect(self.io.append_elt(DigitalSource.empty(), requested), res.io)
 
 
 class PulldownResistorArray(TypedTestPoint, GeneratorBlock):
@@ -192,7 +192,7 @@ class PulldownResistorArray(TypedTestPoint, GeneratorBlock):
   def __init__(self, resistance: RangeLike):
     super().__init__()
     self.gnd = self.Port(Ground.empty(), [Common])
-    self.io = self.Port(Vector(DigitalSingleSource.empty()), [InOut])
+    self.io = self.Port(Vector(DigitalSource.empty()), [InOut])
     self.generator_param(self.io.requested())
     self.resistance = self.ArgParameter(resistance)
 
@@ -202,7 +202,7 @@ def generate(self):
     for requested in self.get(self.io.requested()):
       res = self.res[requested] = self.Block(PulldownResistor(self.resistance))
       self.connect(self.gnd, res.gnd)
-      self.connect(self.io.append_elt(DigitalSingleSource.empty(), requested), res.io)
+      self.connect(self.io.append_elt(DigitalSource.empty(), requested), res.io)
 
 
 class SeriesPowerResistor(DiscreteApplication):

edg/abstract_parts/AbstractSwitch.py

@@ -89,14 +89,14 @@ def __init__(self) -> None:
     super().__init__()
 
     self.gnd = self.Port(Ground.empty(), [Common])
-    self.out = self.Port(DigitalSingleSource.empty(), [Output])
+    self.out = self.Port(DigitalSource.empty(), [Output])
 
   def contents(self):
     super().contents()
     self.package = self.Block(Switch(current=self.out.link().current_drawn,
                                      voltage=self.out.link().voltage))
 
-    self.connect(self.out, self.package.sw.adapt_to(DigitalSingleSource.low_from_supply(self.gnd)))
+    self.connect(self.out, self.package.sw.adapt_to(DigitalSource.low_from_supply(self.gnd)))
     self.connect(self.gnd, self.package.com.adapt_to(Ground()))
 
 
@@ -107,8 +107,8 @@ def __init__(self) -> None:
     super().__init__()
 
     self.gnd = self.Port(Ground.empty(), [Common])
-    self.a = self.Port(DigitalSingleSource.empty())
-    self.b = self.Port(DigitalSingleSource.empty())
+    self.a = self.Port(DigitalSource.empty())
+    self.b = self.Port(DigitalSource.empty())
 
 
 class DigitalWrapperRotaryEncoder(DigitalRotaryEncoder):
@@ -118,7 +118,7 @@ def contents(self):
     self.package = self.Block(RotaryEncoder(current=self.a.link().current_drawn.hull(self.b.link().current_drawn),
                                             voltage=self.a.link().voltage.hull(self.b.link().voltage)))
 
-    dio_model = DigitalSingleSource.low_from_supply(self.gnd)
+    dio_model = DigitalSource.low_from_supply(self.gnd)
     self.connect(self.a, self.package.a.adapt_to(dio_model))
     self.connect(self.b, self.package.b.adapt_to(dio_model))
     self.connect(self.gnd, self.package.com.adapt_to(Ground()))
@@ -130,7 +130,7 @@ class DigitalRotaryEncoderSwitch(BlockInterfaceMixin[DigitalRotaryEncoder]):
   def __init__(self, *args, **kwargs) -> None:
     super().__init__(*args, **kwargs)
 
-    self.sw = self.Port(DigitalSingleSource.empty(), optional=True)
+    self.sw = self.Port(DigitalSource.empty(), optional=True)
 
 
 class DigitalWrapperRotaryEncoderWithSwitch(DigitalRotaryEncoderSwitch, DigitalWrapperRotaryEncoder, GeneratorBlock):
@@ -142,7 +142,7 @@ def generate(self):
     super().generate()
     if self.get(self.sw.is_connected()):
       package_sw = self.package.with_mixin(RotaryEncoderSwitch())
-      dio_model = DigitalSingleSource.low_from_supply(self.gnd)
+      dio_model = DigitalSource.low_from_supply(self.gnd)
       self.connect(self.sw, package_sw.sw.adapt_to(dio_model))
 
 
@@ -153,10 +153,10 @@ def __init__(self) -> None:
     super().__init__()
 
     self.gnd = self.Port(Ground.empty(), [Common])
-    self.a = self.Port(DigitalSingleSource.empty())
-    self.b = self.Port(DigitalSingleSource.empty())
-    self.c = self.Port(DigitalSingleSource.empty())
-    self.d = self.Port(DigitalSingleSource.empty())
+    self.a = self.Port(DigitalSource.empty())
+    self.b = self.Port(DigitalSource.empty())
+    self.c = self.Port(DigitalSource.empty())
+    self.d = self.Port(DigitalSource.empty())
 
 
 class DigitalWrapperDirectionSwitch(DigitalDirectionSwitch):
@@ -166,7 +166,7 @@ def contents(self):
     self.package = self.Block(DirectionSwitch(current=self.a.link().current_drawn.hull(self.b.link().current_drawn),
                                               voltage=self.a.link().voltage.hull(self.b.link().voltage)))
 
-    dio_model = DigitalSingleSource.low_from_supply(self.gnd)
+    dio_model = DigitalSource.low_from_supply(self.gnd)
     self.connect(self.a, self.package.a.adapt_to(dio_model))
     self.connect(self.b, self.package.b.adapt_to(dio_model))
     self.connect(self.c, self.package.c.adapt_to(dio_model))
@@ -180,7 +180,7 @@ class DigitalDirectionSwitchCenter(BlockInterfaceMixin[DigitalDirectionSwitch]):
   def __init__(self, *args, **kwargs) -> None:
     super().__init__(*args, **kwargs)
 
-    self.center = self.Port(DigitalSingleSource.empty(), optional=True)
+    self.center = self.Port(DigitalSource.empty(), optional=True)
 
 
 class DigitalWrapperDirectionSwitchWithCenter(DigitalDirectionSwitchCenter, DigitalWrapperDirectionSwitch,
@@ -193,5 +193,5 @@ def generate(self):
     super().generate()
     if self.get(self.center.is_connected()):
       package_sw = self.package.with_mixin(DirectionSwitchCenter())
-      dio_model = DigitalSingleSource.low_from_supply(self.gnd)
+      dio_model = DigitalSource.low_from_supply(self.gnd)
       self.connect(self.center, package_sw.center.adapt_to(dio_model))

edg/abstract_parts/DigitalAmplifiers.py

@@ -115,7 +115,7 @@ def __init__(self, max_rds: FloatLike = 1*Ohm, frequency: RangeLike = RangeExpr.
 
     self.gnd = self.Port(Ground.empty(), [Common])
     self.control = self.Port(DigitalSink.empty(), [Input])
-    self.output = self.Port(DigitalSingleSource.empty(), [Output])
+    self.output = self.Port(DigitalSource.empty(), [Output])
 
     self.max_rds = self.ArgParameter(max_rds)
     self.frequency = self.ArgParameter(frequency)
@@ -131,7 +131,7 @@ def contents(self):
       frequency=self.frequency,
       drive_current=self.control.link().current_limits
     ))
-    self.connect(self.drv.drain.adapt_to(DigitalSingleSource.low_from_supply(self.gnd
+    self.connect(self.drv.drain.adapt_to(DigitalSource.low_from_supply(self.gnd
     )), self.output)
     self.connect(self.drv.source.adapt_to(Ground()), self.gnd)
     self.connect(self.drv.gate.adapt_to(DigitalSink()),