Deprecate use of physical ranges (#125)

Author: akhilles

bom/helpers.zen

@@ -3,12 +3,10 @@
 load("../utils.zen", "e96", "e24")
 load(
     "../units.zen",
-    "ResistanceRange",
+    "Resistance",
     "Voltage",
-    "VoltageRange",
     "Power",
     "Capacitance",
-    "Resistance",
     "Impedance",
     "Current",
     "Frequency",
@@ -188,7 +186,7 @@ def resistor_series(manufacturer, series, resistance_range, max_v, power, tolera
     return {
         "manufacturer": manufacturer,
         "series": series,
-        "resistance_range": ResistanceRange(resistance_range),
+        "resistance_range": Resistance(resistance_range),
         "max_v": Voltage(max_v),
         "power": Power(power),
         "tolerance": tolerance,
@@ -321,7 +319,7 @@ def led(color: str, voltage_range: str, mpn: str, manufacturer: str) -> dict:
     """
     return {
         "color": color,
-        "forward_voltage": VoltageRange(voltage_range),
+        "forward_voltage": Voltage(voltage_range),
         "mpn": mpn,
         "manufacturer": manufacturer,
     }
@@ -390,14 +388,10 @@ def tvs(standoff_voltage: str, clamping_voltage: str, peak_pulse_power: str, mpn
     """
     # Use ranges for all values to support flexible matching
     standoff_val = (
-        VoltageRange(standoff_voltage)
-        if "to" in standoff_voltage
-        else VoltageRange(standoff_voltage + " to " + standoff_voltage)
+        Voltage(standoff_voltage) if "to" in standoff_voltage else Voltage(standoff_voltage + " to " + standoff_voltage)
     )
     clamping_val = (
-        VoltageRange(clamping_voltage)
-        if "to" in clamping_voltage
-        else VoltageRange(clamping_voltage + " to " + clamping_voltage)
+        Voltage(clamping_voltage) if "to" in clamping_voltage else Voltage(clamping_voltage + " to " + clamping_voltage)
     )
     power_val = Power(peak_pulse_power)
 

bom/match_generics.zen

@@ -7,9 +7,7 @@ load("manufactuers/wurth_electronik.zen", "WURTH_ELEKTRONIK_WR_PHD")
 load(
     "../units.zen",
     "Voltage",
-    "VoltageRange",
     "Resistance",
-    "ResistanceRange",
     "Capacitance",
     "Power",
     "Current",

bom/test/test_match_Tvs.zen

@@ -2,13 +2,13 @@
 
 load("../../generics/Tvs.zen", "Package", "Direction")
 load("../../interfaces.zen", "Power", "Ground")
-load("../../units.zen", "VoltageRange")
+load("../../units.zen", "Voltage")
 load("../match_generics.zen", "assign_house_parts")
 
 Tvs = Module("../../generics/Tvs.zen")
 
 gnd = Ground("GND")
-vcc = Power("VCC", voltage=VoltageRange("3.3V"))
+vcc = Power("VCC", voltage=Voltage("3.3V"))
 
 # Test cases: (direction, package, reverse_standoff_voltage)
 TVS_TEST_CASES = [
@@ -39,7 +39,7 @@ for id, (direction, package, standoff_voltage) in enumerate(TVS_TEST_CASES):
             name=f"D{id}",
             direction=direction,
             package=package,
-            reverse_standoff_voltage=VoltageRange(standoff_voltage),
+            reverse_standoff_voltage=Voltage(standoff_voltage),
             A=gnd,
             K=vcc,
         )
@@ -48,7 +48,7 @@ for id, (direction, package, standoff_voltage) in enumerate(TVS_TEST_CASES):
             name=f"D{id}",
             direction=direction,
             package=package,
-            reverse_standoff_voltage=VoltageRange(standoff_voltage),
+            reverse_standoff_voltage=Voltage(standoff_voltage),
             A=Net(f"LINE_A_{id}"),
             K=Net(f"LINE_B_{id}"),
         )

checks.zen

@@ -1,16 +1,16 @@
-load("units.zen", "VoltageRange")
+load("units.zen", "Voltage")
 load("interfaces.zen", "Power")
 
 Severity = enum("error", "warning", "advice")
 
 
 def voltage_within(
-    within: str | VoltageRange, name: str = "voltage_check", severity: Severity = Severity("error")
+    within: str | Voltage, name: str = "voltage_check", severity: Severity = Severity("error")
 ) -> typing.Callable:
-    def ensure_voltage_within(_module, net_name: str, voltage: VoltageRange, within: str | VoltageRange):
-        within = VoltageRange(within)
+    def ensure_voltage_within(_module, net_name: str, voltage: Voltage, within: str | Voltage):
+        within = Voltage(within)
         # drop nominal in within:
-        within = VoltageRange(min=within.min, max=within.max)
+        within = Voltage(min=within.min, max=within.max)
         # ensure voltage is within within
         err_msg = "Voltage range " + str(voltage) + " of " + net_name + " is not within " + str(within)
         check(voltage in within, err_msg)

generics/Tvs.zen

@@ -1,4 +1,5 @@
-load("../units.zen", "PowerRange", "Voltage", "VoltageRange", "CurrentRange")
+load("../units.zen", "Power", "Voltage")
+Watts = Power
 load("../interfaces.zen", "Power", "Ground")
 load("../utils.zen", "format_value")
 
@@ -10,21 +11,21 @@ load("../utils.zen", "format_value")
 Package = enum("DO-219AB", "DO-214AC", "DO-214AA", "DO-214AB")
 Direction = enum("Unidirectional", "Bidirectional")
 
-USB_5V_STANDOFF_VOLTAGE = VoltageRange("5 to 6V")
+USB_5V_STANDOFF_VOLTAGE = Voltage("5 to 6V")
 
 package = config("package", Package, default=Package("DO-219AB"))
 direction = config("direction", Direction, default=Direction("Unidirectional"))
 # 8/20 μs waveform acc. IEC 61000-4-5
-reverse_standoff_voltage = config("reverse_standoff_voltage", VoltageRange, default=USB_5V_STANDOFF_VOLTAGE)
-reverse_clamping_voltage = config("reverse_clamping_voltage", VoltageRange, optional=True)
-peak_pulse_power = config("peak_pulse_power", PowerRange, optional=True)
+reverse_standoff_voltage = config("reverse_standoff_voltage", Voltage, default=USB_5V_STANDOFF_VOLTAGE)
+reverse_clamping_voltage = config("reverse_clamping_voltage", Voltage, optional=True)
+peak_pulse_power = config("peak_pulse_power", Watts, optional=True)
 
 mpn = config("mpn", str, optional=True)
 manufacturer = config("manufacturer", str, optional=True)
 
 if direction == Direction("Unidirectional"):
     A = io("A", Ground)
-    K = io("K", Power, default=Power("VCC", voltage=VoltageRange("5V")))
+    K = io("K", Power, default=Power("VCC", voltage=Voltage("5V")))
 else:
     A = io("A", Net)
     K = io("K", Net)

generics/test/test_Tvs.zen

@@ -1,12 +1,13 @@
 """Comprehensive test for TVS Diode component."""
 
+load("../../units.zen", "Power", "Voltage")
+Watts = Power
 load("../../interfaces.zen", "Power", "Ground")
-load("../../units.zen", "PowerRange", "Voltage", "VoltageRange")
 load("../../bom/match_generics.zen", "assign_house_parts")
 
 Tvs = Module("../Tvs.zen")
 
-vcc = Power("VCC", voltage=VoltageRange("3.3V"))
+vcc = Power("VCC", voltage=Voltage("3.3V"))
 gnd = Ground("GND")
 
 # Test all Package values
@@ -16,8 +17,8 @@ for package in Tvs.Package.values():
     Tvs(
         name=name,
         package=package,
-        peak_pulse_power=PowerRange("800 to 1200W"),
-        reverse_clamping_voltage=VoltageRange("9 to 12V"),
+        peak_pulse_power=Watts("800 to 1200W"),
+        reverse_clamping_voltage=Voltage("9 to 12V"),
         A=gnd,
         K=vcc,
     )
@@ -27,9 +28,9 @@ for package in Tvs.Package.values():
 Tvs(
     name="D_TVS_3V3",
     package="DO-219AB",
-    peak_pulse_power=PowerRange("400 to 600W"),
-    reverse_standoff_voltage=VoltageRange("3.3V"),
-    reverse_clamping_voltage=VoltageRange("6 to 8V"),
+    peak_pulse_power=Watts("400 to 600W"),
+    reverse_standoff_voltage=Voltage("3.3V"),
+    reverse_clamping_voltage=Voltage("6 to 8V"),
     A=gnd,
     K=vcc,
 )
@@ -38,9 +39,9 @@ Tvs(
 Tvs(
     name="D_TVS_12V",
     package="DO-214AC",
-    peak_pulse_power=PowerRange("1200 to 1500W"),
-    reverse_standoff_voltage=VoltageRange("12V"),
-    reverse_clamping_voltage=VoltageRange("19 to 21V"),
+    peak_pulse_power=Watts("1200 to 1500W"),
+    reverse_standoff_voltage=Voltage("12V"),
+    reverse_clamping_voltage=Voltage("19 to 21V"),
     A=gnd,
     K=vcc,
 )

interfaces.zen

@@ -1,15 +1,15 @@
-load("units.zen", "VoltageRange", "Impedance")
+load("units.zen", "Voltage", "Impedance")
 
 Power = builtin.net_type(
     "Power",
     symbol=field(Symbol, default=Symbol(library="@kicad-symbols/power.kicad_sym", name="VCC")),
-    voltage=VoltageRange,
+    voltage=Voltage,
 )
 
 Ground = builtin.net_type(
     "Ground",
     symbol=field(Symbol, default=Symbol(library="@kicad-symbols/power.kicad_sym", name="GND")),
-    voltage=field(VoltageRange, default=VoltageRange("0V")),
+    voltage=field(Voltage, default=Voltage("0V")),
 )
 
 NotConnected = builtin.net_type("NotConnected")

test/test_checks.zen

@@ -1,20 +1,21 @@
 load("../checks.zen", "voltage_within")
-load("../interfaces.zen", "Power", "VoltageRange")
+load("../interfaces.zen", "Power")
+load("../units.zen", "Voltage")
 
 # Test 3.3V rail with tolerance
-v3v3 = Power("3V3", voltage=VoltageRange("3.3V 1%"))
+v3v3 = Power("3V3", voltage=Voltage("3.3V 1%"))
 # Check if 3.3V +/- 1% is within 3.3V +/- 5%
 check_3v3 = voltage_within("3.3V 5%")
 check_3v3(v3v3)
 
 # Test 5V rail with explicit range
-v5 = Power("5V", voltage=VoltageRange("5V"))
+v5 = Power("5V", voltage=Voltage("5V"))
 # Check if 5V is within 4.5V to 5.5V (using +/- 10% notation)
 check_5v = voltage_within("5V 10%")
 check_5v(v5)
 
 # Test with tighter tolerance on the rail than the check
-v1v8 = Power("1V8", voltage=VoltageRange("1.8V 1%"))
+v1v8 = Power("1V8", voltage=Voltage("1.8V 1%"))
 check_1v8 = voltage_within("1.8V 5%")
 check_1v8(v1v8)
 

units.zen

@@ -17,15 +17,15 @@ Energy = builtin.physical_value("J")
 MagneticFlux = builtin.physical_value("Wb")
 Conductance = builtin.physical_value("S")
 
-VoltageRange = builtin.physical_range("V")
-CurrentRange = builtin.physical_range("A")
-ResistanceRange = builtin.physical_range("Ohm")
-CapacitanceRange = builtin.physical_range("F")
-InductanceRange = builtin.physical_range("H")
-FrequencyRange = builtin.physical_range("Hz")
-TemperatureRange = builtin.physical_range("K")
-TimeRange = builtin.physical_range("s")
-PowerRange = builtin.physical_range("W")
+VoltageRange = Voltage
+CurrentRange = Current
+ResistanceRange = Resistance
+CapacitanceRange = Capacitance
+InductanceRange = Inductance
+FrequencyRange = Frequency
+TemperatureRange = Temperature
+TimeRange = Time
+PowerRange = Power
 
 
 def unit(spec, type):