cleaning an rebaseline

Author: ducky64

edg/abstract_parts/PassiveFilters.py

@@ -159,7 +159,7 @@ def __init__(self, impedance: RangeLike, cutoff_freq: RangeLike):
     self.gnd = self.Export(self.rc.gnd.adapt_to(Ground()), [Common])
 
 
-class LowPassAnalogDifferentialRc(AnalogFilter, KiCadImportableBlock, GeneratorBlock):
+class LowPassAnalogDifferentialRc(AnalogFilter, KiCadImportableBlock):
   """Analog-typed low-pass differential RC filter, with cutoff frequency specified at the -3dB (~70%) point.
   Impedance is the single-ended resistor value."""
   def symbol_pinning(self, symbol_name: str) -> Mapping[str, BasePort]:
@@ -179,16 +179,14 @@ def __init__(self, impedance: RangeLike, cutoff_freq: RangeLike):
     self.impedance = self.ArgParameter(impedance)
     self.cutoff_freq = self.ArgParameter(cutoff_freq)
 
-    self.generator_param(self.impedance, self.cutoff_freq)
-
-  def generate(self) -> None:
-    super().generate()
+  def contents(self) -> None:
+    super().contents()
 
     self.rp = self.Block(Resistor(resistance=self.impedance))
     self.rn = self.Block(Resistor(resistance=self.impedance))
-    capacitance = Range.cancel_multiply(1 / (2 * pi * self.get(self.impedance)), 1 / self.get(self.cutoff_freq))
+    capacitance = (1 / self.cutoff_freq).shrink_multiply(1 / (2 * pi * self.impedance))
     # capacitance is single-ended, halve it for differential
-    self.c = self.Block(Capacitor(capacitance=0.5*capacitance*Farad,
+    self.c = self.Block(Capacitor(capacitance=0.5*capacitance,
                                   voltage=self.inp.link().voltage-self.inn.link().voltage))
     self.connect(self.inp, self.rp.a.adapt_to(AnalogSink(
       impedance=self.rp.actual_resistance + self.outp.link().sink_impedance,

edg/parts/Inamp_Ina826.py

@@ -101,9 +101,7 @@ def generate(self):
     # gain error, lumped into the resistor gain
     self.require(self.ratio.within(Range(1, 1000)))
     # note, worst case gain at +/- 0.04%
-    # TODO use 49...*kOhm(tol=...), once cancel_multiply can support RangeExpr types
-    self.rg = self.Block(Resistor(Range.cancel_multiply(Range.from_tolerance(49.4e3, 0.0004),
-                                                        1/(self.get(self.ratio) - 1))))
+    self.rg = self.Block(Resistor((1/(self.ratio - 1)).shrink_multiply(49.4*kOhm(tol=0.0004))))
     self.connect(self.rg.a, self.ic.rg2)
     self.connect(self.rg.b, self.ic.rg3)
 

examples/Multimeter/Multimeter.net

@@ -608,6 +608,7 @@ board.setNetlist([
   {name: "measure.range.dummy.io", pads: [["U11", "1"]]},
   {name: "measure.range.switch.sw[0_0].com", pads: [["U12", "3"], ["U10", "4"]]},
   {name: "measure.range.switch.sw[0_1].com", pads: [["U12", "1"], ["U11", "4"]]},
+  {name: "adc.mclkin", pads: [["U14", "18"]]},
   {name: "adc.vins.2", pads: [["U14", "7"]]},
   {name: "adc.vins.3", pads: [["U14", "8"]]},
   {name: "adc.vins.4", pads: [["U14", "9"]]},