Break out abstract_parts, electronics_model

edg/__init__.py

@@ -7,6 +7,7 @@
 # This may go away in the future.
 from .core import *
 from .electronics_model import *
+from .electronics_interfaces import *
 from .abstract_parts import *
 from .vendor_parts import *
 from .vendor_parts.jlc import *

edg/abstract_parts/AbstractAnalogSwitch.py → edg/abstract_parts/AnalogSwitch.py

@@ -1,9 +1,8 @@
-from typing import List, cast, Optional, Dict
+from typing import List, Optional, Dict
 
 from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import Interface
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/AbstractAntenna.py → edg/abstract_parts/Antenna.py

@@ -1,7 +1,7 @@
 from typing import Any
+from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import *
+from ..electronics_interfaces import *
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
 

edg/abstract_parts/AbstractDevices.py → edg/abstract_parts/Battery.py

@@ -1,5 +1,4 @@
-from ..electronics_model import *
-from .Categories import *
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/AbstractBjt.py → edg/abstract_parts/Bjt.py

@@ -1,7 +1,7 @@
-from typing import Dict, Any
+from typing import Any, Dict
+from typing_extensions import override
 
 from ..electronics_model import *
-from .Categories import *
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
 from .StandardFootprint import StandardFootprint, HasStandardFootprint

edg/abstract_parts/CanTransceiver.py

@@ -1,5 +1,4 @@
-from ..electronics_model import *
-from .Categories import *
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/AbstractCapacitor.py → edg/abstract_parts/Capacitor.py

@@ -1,16 +1,14 @@
 import re
 import warnings
 from abc import abstractmethod
-from typing import Optional, cast, Dict, Any, Tuple, Mapping
-import math
-
+from typing import Any, Optional, Dict, Tuple, Mapping
 from typing_extensions import override
+import math
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 from .ESeriesUtil import ESeriesUtil
 from .PartsTable import PartsTableColumn, PartsTableRow, PartsTable
 from .PartsTablePart import PartsTableSelector
-from .Categories import *
 from .StandardFootprint import StandardFootprint, HasStandardFootprint
 
 

edg/abstract_parts/Comparator.py

@@ -0,0 +1,28 @@
+from typing import Mapping
+
+from typing_extensions import override
+
+from ..electronics_interfaces import *
+
+
+class Comparator(KiCadInstantiableBlock, Analog):
+    """Abstract comparator interface, output goes high when inp > inn."""
+
+    @override
+    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
+    @override
+    def block_from_symbol(cls, symbol_name: str, properties: Mapping[str, str]) -> "Comparator":
+        return Comparator()
+
+    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/AbstractConnector.py → edg/abstract_parts/Connectors.py

@@ -1,8 +1,7 @@
 from typing import Any
 
-from ..electronics_model import *
-from .Categories import Connector
-from .AbstractAntenna import Antenna
+from ..electronics_interfaces import *
+from .Antenna import Antenna
 
 
 @abstract_block

edg/abstract_parts/AbstractCrystal.py → edg/abstract_parts/Crystal.py

@@ -1,10 +1,10 @@
 from typing import Any
-
 from typing_extensions import override
 
-from ..electronics_model import *
-from . import PartsTableSelector, PartsTableColumn, Capacitor, PartsTableRow
-from .Categories import *
+from ..electronics_interfaces import *
+from .PartsTable import PartsTableColumn, PartsTableRow
+from .PartsTablePart import PartsTableSelector
+from .Capacitor import Capacitor
 from .StandardFootprint import StandardFootprint, HasStandardFootprint
 
 

edg/abstract_parts/DigitalIsolator.py

@@ -1,7 +1,6 @@
 from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import Interface
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/AbstractDiodes.py → edg/abstract_parts/Diode.py

@@ -1,8 +1,8 @@
-from typing import Dict
+from typing import Any, Dict
+from typing_extensions import override
 from deprecated import deprecated
 
-from ..electronics_model import *
-from .Categories import *
+from ..electronics_interfaces import *
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
 from .StandardFootprint import StandardFootprint, HasStandardFootprint

edg/abstract_parts/AbstractFerriteBead.py → edg/abstract_parts/FerriteBead.py

@@ -1,11 +1,9 @@
-from typing import Optional, cast, Dict, Any
-
+from typing import Any, Optional, Dict
 from typing_extensions import override
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
-from .Categories import *
 from .StandardFootprint import StandardFootprint, HasStandardFootprint
 
 

edg/abstract_parts/AbstractFets.py → edg/abstract_parts/Fet.py

@@ -1,11 +1,9 @@
-from typing import Optional, Any, Dict
-
+from typing import Any, Optional, Dict
 from typing_extensions import override
 
 from ..electronics_model import *
 from .PartsTable import PartsTableColumn, PartsTableRow, PartsTable
 from .PartsTablePart import PartsTableSelector
-from .Categories import *
 from .StandardFootprint import StandardFootprint, HasStandardFootprint
 
 

edg/abstract_parts/AbstractFuse.py → edg/abstract_parts/Fuse.py

@@ -1,10 +1,9 @@
-from typing import Optional, cast, Any
+from typing import Any, Optional
+from typing_extensions import override
 
 from deprecated import deprecated
-from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import *
+from ..electronics_interfaces import *
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
 from .StandardFootprint import StandardFootprint, HasStandardFootprint

edg/abstract_parts/GateDrivers.py

@@ -1,7 +1,6 @@
 from typing import Any
 
-from ..electronics_model import *
-from .Categories import PowerSwitch
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/IdealIoController.py

@@ -1,7 +1,6 @@
 from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import IdealModel
+from ..electronics_interfaces import *
 from .IoController import IoController
 from .IoControllerInterfaceMixins import (
     IoControllerSpiPeripheral,

edg/abstract_parts/AbstractInductor.py → edg/abstract_parts/Inductor.py

@@ -1,11 +1,9 @@
-from typing import Dict, Optional, cast, Any
-
+from typing import Any, Dict, Optional
 from typing_extensions import override
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 from .PartsTable import PartsTableColumn, PartsTableRow, ExperimentalUserFnPartsTable
 from .PartsTablePart import PartsTableSelector
-from .Categories import *
 from .StandardFootprint import StandardFootprint, HasStandardFootprint
 
 

edg/abstract_parts/IoController.py

@@ -1,12 +1,10 @@
 from itertools import chain
 from typing import List, Dict, Tuple, Type, Optional, Any, Union
-
-from deprecated import deprecated
 from typing_extensions import override
+from deprecated import deprecated
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 from .PinMappable import AllocatedResource, PinMappable, PinMapUtil
-from .Categories import ProgrammableController
 
 
 @non_library

edg/abstract_parts/IoControllerInterfaceMixins.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 from .IoController import BaseIoController, IoController
 
 

edg/abstract_parts/IoControllerMixins.py

@@ -1,7 +1,7 @@
 from typing_extensions import override
 
 from .IoController import IoController
-from .AbstractCrystal import OscillatorReference
+from .Crystal import OscillatorReference
 from ..electronics_model import *
 
 

edg/abstract_parts/IoControllerProgramming.py

@@ -3,7 +3,7 @@
 from typing_extensions import override
 
 from ..electronics_model import *
-from .AbstractDebugHeaders import (
+from .SwdCortexConnectors import (
     SwdCortexTargetConnector,
     SwdCortexTargetConnectorReset,
     SwdCortexTargetConnectorSwo,

edg/abstract_parts/AbstractJumper.py → edg/abstract_parts/Jumper.py

@@ -1,7 +1,6 @@
 from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import DiscreteComponent, TypedJumper
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/AbstractLed.py → edg/abstract_parts/Led.py

@@ -1,10 +1,8 @@
 from typing import Any
-
 from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import *
-from .AbstractResistor import Resistor
+from ..electronics_interfaces import *
+from .Resistor import Resistor
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
 from .StandardFootprint import StandardFootprint, HasStandardFootprint

edg/abstract_parts/AbstractOpamp.py → edg/abstract_parts/Opamp.py

@@ -2,8 +2,7 @@
 
 from typing_extensions import override
 
-from ..electronics_model import *
-from .Categories import Analog, MultipackDevice
+from ..electronics_interfaces import *
 
 
 @abstract_block

edg/abstract_parts/AbstractOscillator.py → edg/abstract_parts/Oscillator.py

@@ -1,10 +1,9 @@
 from typing import Any
-
 from typing_extensions import override
 
-from ..electronics_model import *
-from . import PartsTableColumn, PartsTableRow, PartsTableSelector
-from .Categories import *
+from ..electronics_interfaces import *
+from .PartsTable import PartsTableColumn, PartsTableRow
+from .PartsTablePart import PartsTableSelector
 
 
 @abstract_block

edg/abstract_parts/PartsTable.py

@@ -21,7 +21,7 @@
 
 from typing_extensions import ParamSpec, TypeVar, override
 
-from ..core.Range import Range
+from ..core import *
 
 
 # from https://stackoverflow.com/questions/47965083/comparable-types-with-mypy

edg/abstract_parts/PartsTablePart.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod
-from typing import Optional, Union, Any, ClassVar, Type, Protocol
+from typing import Optional, Union, Any
 
 from typing_extensions import override
 

edg/abstract_parts/PinMappable.py

@@ -3,7 +3,7 @@
 
 from typing_extensions import override
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 
 
 @non_library

edg/abstract_parts/AbstractPowerConverters.py → edg/abstract_parts/PowerConverters.py

@@ -1,15 +1,14 @@
 from abc import abstractmethod
-from typing import Optional, NamedTuple, Any, Callable, cast
+from typing import Any, Optional, NamedTuple, Callable
+from typing_extensions import override
 
 from deprecated import deprecated
-from typing_extensions import override
 
-from .AbstractCapacitor import DecouplingCapacitor, Capacitor
-from .AbstractInductor import Inductor, TableInductor
-from .Categories import *
+from ..electronics_interfaces import *
+from .Capacitor import DecouplingCapacitor, Capacitor
+from .Inductor import Inductor, TableInductor
 from .PartsTable import PartsTableRow, ExperimentalUserFnPartsTable
 from .Resettable import Resettable
-from ..electronics_model import *
 
 
 @abstract_block_default(lambda: IdealVoltageRegulator)

edg/abstract_parts/Resettable.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 
 
 class Resettable(BlockInterfaceMixin[Block]):

edg/abstract_parts/AbstractResistor.py → edg/abstract_parts/Resistor.py

@@ -1,13 +1,11 @@
 import re
-from typing import Optional, cast, Mapping, Dict, Any
-
+from typing import Any, Optional, Mapping, Dict
 from typing_extensions import override
 
-from ..electronics_model import *
+from ..electronics_interfaces import *
 from .ESeriesUtil import ESeriesUtil
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
-from .Categories import *
 from .StandardFootprint import StandardFootprint, HasStandardFootprint
 
 

edg/abstract_parts/AbstractResistorArray.py → edg/abstract_parts/ResistorArray.py

@@ -1,12 +1,10 @@
 from typing import Any
-
 from typing_extensions import override
 
 from ..electronics_model import *
-from .AbstractResistor import Resistor
+from .Resistor import Resistor
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
-from .Categories import *
 from .StandardFootprint import StandardFootprint, HasStandardFootprint