merge

Author: ducky64

edg/abstract_parts/DigitalAmplifiers.py

@@ -49,8 +49,6 @@ def generate(self):
       drain_current=(0, pull_current_max),
       gate_voltage=(self.control.link().output_thresholds.upper(), self.control.link().voltage.upper()),
       rds_on=(0, low_amp_rds_max),  # TODO size on turnon time
-      gate_charge=(0, float('inf')),  # TODO size on turnon time
-      power=(0, 0) * Watt,
       frequency=self.frequency,
       drive_current=self.control.link().current_limits  # TODO this is kind of a max drive current
     ))
@@ -71,8 +69,6 @@ def generate(self):
       drain_current=self.output.link().current_drawn,
       gate_voltage=pass_gate_voltage,
       rds_on=(0, self.max_rds),
-      gate_charge=(0, float('inf')),  # TODO size on turnon time
-      power=(0, 0) * Watt,
       frequency=self.frequency,
       drive_current=(-1 * pwr_voltage.lower() / pull_resistance.upper(),
                      pwr_voltage.lower() / low_amp_rds_max)  # TODO simultaneously solve both FETs

edg/abstract_parts/PartsTable.py

@@ -103,7 +103,10 @@ def filter(self, fn: Callable[[PartsTableRow], bool]) -> PartsTable:
 
   def map_new_columns(self, fn: Callable[[PartsTableRow], Optional[Dict[PartsTableColumn[Any], Any]]],
                       overwrite: bool = False) -> PartsTable:
-    """Creates a new table (deep copy) with additional rows."""
+    """Creates a new table (deep copy) with additional rows.
+    All entries must have the same keys.
+    Specify overwrite=True to overwrite an existing row. To preserve the existing value (no-op), return it.
+    Return None to drop the row."""
     new_rows: List[PartsTableRow] = []
     first_keys: Optional[KeysView] = None
     for row in self.rows:

edg/abstract_parts/PartsTablePart.py

@@ -81,11 +81,9 @@ def generate(self):
     postprocessed_table = self._table_postprocess(matching_table)
     postprocessed_table = postprocessed_table.sort_by(self._row_sort_by)
     self.assign(self.matching_parts, postprocessed_table.map(lambda row: row[self.PART_NUMBER_COL]))
-    if len(postprocessed_table) > 0:
-      selected_row = postprocessed_table.first()
-      self._row_generate(selected_row)
-    else:  # if no matching part, generate a parameter error instead of crashing
-      self.require(False, "no matching part")
+    assert len(postprocessed_table) > 0, "no matching part"  # crash to make generator failures more obvious
+    selected_row = postprocessed_table.first()
+    self._row_generate(selected_row)
 
 
 @abstract_block

edg/abstract_parts/test_resistor_generic.py

@@ -8,7 +8,6 @@ def __init__(self):
     super().__init__()
     self.dut = self.Block(GenericChipResistor(
       resistance=1 * kOhm(tol=0.1),
-      power=(0, 0)*Watt
     ))
     (self.dummya, ), _ = self.chain(self.dut.a, self.Block(DummyPassive()))
     (self.dummyb, ), _ = self.chain(self.dut.b, self.Block(DummyPassive()))
@@ -30,7 +29,6 @@ def __init__(self):
     super().__init__()
     self.dut = self.Block(GenericChipResistor(
       resistance=8.06 * kOhm(tol=0.01),
-      power=(0, 0)*Watt
     ))
     (self.dummya, ), _ = self.chain(self.dut.a, self.Block(DummyPassive()))
     (self.dummyb, ), _ = self.chain(self.dut.b, self.Block(DummyPassive()))

edg/electronics_model/DigitalPorts.py

@@ -252,8 +252,8 @@ def __init__(self):
       current_draw=RangeExpr()
     ))
     self.dst = self.Port(VoltageSource(
-      voltage_out=(self.src.link().output_thresholds.upper(), self.src.link().voltage.upper()),
-      current_limits=(-float('inf'), float('inf'))))
+      voltage_out=(self.src.link().output_thresholds.upper(), self.src.link().voltage.upper())
+    ))
     self.assign(self.src.current_draw, self.dst.link().current_drawn)
 
 

edg/electronics_model/GroundPort.py

@@ -91,7 +91,6 @@ def __init__(self):
         self.dst = self.Port(AnalogSource(
             voltage_out=self.src.link().voltage,
             signal_out=self.src.link().voltage,
-            impedance=(0, 0)*Ohm,
         ))
 
 

edg/electronics_model/VoltagePorts.py

@@ -176,7 +176,6 @@ def __init__(self):
 
     super().__init__()
     self.src = self.Port(VoltageSink(
-      voltage_limits=(-float('inf'), float('inf'))*Volt,
       current_draw=RangeExpr()
     ))
     self.dst = self.Port(AnalogSource(

edg/jlcparts/JlcPartsFet.py

@@ -8,7 +8,10 @@ class JlcPartsBaseFet(JlcPartsBase, BaseTableFet):
     _JLC_PARTS_FILE_NAMES = ["TransistorsMOSFETs"]
     _CHANNEL_MAP = {
         'N Channel': 'N',
+        '1 N-channel': 'N',
+        '1 N-Channel': 'N',
         'P Channel': 'P',
+        '1 Piece P-Channel': 'P',
     }
 
     @classmethod
@@ -39,14 +42,18 @@ def _entry_to_table_row(cls, row_dict: Dict[PartsTableColumn, Any], filename: st
                 input_capacitance: Optional[float] = attributes.get("Input capacitance (ciss@vds)", float, sub='capacity')
             except (KeyError, TypeError):
                 input_capacitance = None
+
             try:  # not specified for most parts apparently
-                gate_charge = attributes.get("Total gate charge (qg@vgs)", float, sub='charge')
+                gate_charge: Optional[float] = attributes.get("Total gate charge (qg@vgs)", float, sub='charge')
             except (KeyError, TypeError):
                 if input_capacitance is not None:  # not strictly correct but kind of a guesstimate
                     gate_charge = input_capacitance * vgs_for_ids
                 else:
-                    gate_charge = 3000e-9  # very pessimistic upper bound
-            row_dict[cls.GATE_CHARGE] = Range.exact(gate_charge)
+                    gate_charge = None
+            if gate_charge is not None:
+                row_dict[cls.GATE_CHARGE] = Range.exact(gate_charge)
+            else:
+                row_dict[cls.GATE_CHARGE] = Range.all()
 
             return row_dict
         except (KeyError, TypeError, PartParserUtil.ParseError):
@@ -58,23 +65,7 @@ class JlcPartsFet(PartsTableSelectorFootprint, JlcPartsBaseFet, TableFet):
 
 
 class JlcPartsSwitchFet(PartsTableSelectorFootprint, JlcPartsBaseFet, TableSwitchFet):
-    @init_in_parent
-    def __init__(self, *args, manual_gate_charge: RangeLike = RangeExpr.ZERO, **kwargs):
-        super().__init__(*args, **kwargs)
-        # allow the user to specify a gate charge
-        self.manual_gate_charge = self.ArgParameter(manual_gate_charge)
-        self.generator_param(self.manual_gate_charge)
-
-    def _table_postprocess(self, table: PartsTable) -> PartsTable:
-        manual_gate_charge = self.get(self.manual_gate_charge)
-        def process_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
-            return {self.GATE_CHARGE: manual_gate_charge}
-
-        # must run before TableFet power calculations
-        if not manual_gate_charge == Range.exact(0):
-            table = table.map_new_columns(process_row, overwrite=True)
-
-        return super()._table_postprocess(table)
+    pass
 
 
 lambda: JlcPartsFet(), JlcPartsSwitchFet()  # ensure class is instantiable (non-abstract)

edg/parts/AdcSpi_Mcp3201.py

@@ -23,7 +23,6 @@ def __init__(self) -> None:
     dio_model = DigitalBidir.from_supply(
       self.vss, self.vdd,
       voltage_limit_tolerance=(-0.6, 0.6)*Volt,
-      current_draw=(0, 0),  # leakage current not modeled
       input_threshold_factor=(0.3, 0.7)
     )
     # Datasheet section 6.2, minimum clock speed

edg/parts/BatteryProtector_S8261A.py

@@ -52,17 +52,13 @@ def __init__(self) -> None:
 
     self.do_fet = self.Block(Fet.NFet(
       drain_current=self.pwr_in.link().current_drawn,
-      power=RangeExpr.ZERO,
       gate_voltage=self.pwr_in.link().voltage,
-      gate_charge=RangeExpr.ALL,
       rds_on=(0, 0.1)*Ohm,
       drain_voltage=self.pwr_in.link().voltage
     ))
     self.co_fet = self.Block(Fet.NFet(
       drain_current=self.pwr_in.link().current_drawn,
-      power=RangeExpr.ZERO,
       gate_voltage=self.pwr_in.link().voltage,
-      gate_charge=RangeExpr.ALL,
       rds_on=(0, 0.1)*Ohm,
       drain_voltage=self.pwr_in.link().voltage
     ))