fix type errors

Author: ducky64

edg/abstract_parts/TestPoint.py

@@ -1,4 +1,4 @@
-from typing import Any, TypeVar, Generic
+from typing import Any, TypeVar, Generic, Self
 from typing_extensions import override
 
 from ..electronics_interfaces import *
@@ -16,7 +16,6 @@ def __init__(self, tp_name: StringLike = "") -> None:
 
 
 TestPointLinkType = TypeVar("TestPointLinkType", bound=Link)
-SelfType = TypeVar("SelfType", bound="BaseTypedTestPoint[Link]")
 
 
 @non_library
@@ -28,7 +27,7 @@ def __init__(self, tp_name: StringLike = "") -> None:
         self.io: Port[TestPointLinkType]
         self.tp_name = self.ArgParameter(tp_name)
 
-    def connected(self: SelfType, io: Port[TestPointLinkType]) -> SelfType:
+    def connected(self, io: Port[TestPointLinkType]) -> Self:
         builder.block().connect(io, self.io)
         return self
 

edg/circuits/LevelShifter.py

@@ -86,5 +86,4 @@ def generate(self) -> None:
         if self.get(self.hv_res) != RangeExpr.INF:
             self.hv_pu = self.Block(PullupResistor(self.hv_res)).connected(self.hv_pwr, self.hv_io)
         else:
-            # TODO debug this type check failure
-            self.dummy_hv = self.Block(DummyVoltageSink()).connected(self.hv_pwr)  # type: ignore
+            self.dummy_hv = self.Block(DummyVoltageSink()).connected(self.hv_pwr)  # mark as connected

edg/electronics_interfaces/DummyDevices.py

@@ -1,4 +1,4 @@
-from typing import Dict, TypeVar, Generic
+from typing import Dict, TypeVar, Generic, Self
 from typing_extensions import override
 
 from ..electronics_model import *
@@ -7,7 +7,6 @@
 from .AnalogPort import AnalogSink, AnalogSource, AnalogLink
 
 DummyLinkType = TypeVar("DummyLinkType", bound=Link)
-SelfType = TypeVar("SelfType", bound="BaseDummyBlock[Link]")
 
 
 @non_library
@@ -18,7 +17,7 @@ def __init__(self) -> None:
         super().__init__()
         self.io: Port[DummyLinkType]
 
-    def connected(self: SelfType, io: Port[DummyLinkType]) -> SelfType:
+    def connected(self, io: Port[DummyLinkType]) -> Self:
         builder.block().connect(io, self.io)
         return self
 

edg/parts/microcontroller/Esp32.py

@@ -413,8 +413,7 @@ def generate(self) -> None:
             self.connect(self.gnd, self.model.gnd)
             self.export_tap(self.gnd, self.device.gnd)
         else:
-            # TODO debug this type failure
-            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)  # type: ignore
+            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)
 
         if self.get(self.pwr.is_connected()):  # power supplied externally
             self.connect(self.pwr, self.model.pwr)

edg/parts/microcontroller/Esp32c3.py

@@ -581,8 +581,7 @@ def generate(self) -> None:
             self.connect(self.gnd, self.model.gnd)
             self.export_tap(self.gnd, self.device.gnd)
         else:
-            # TODO debug this type failure
-            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)  # type: ignore
+            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)
 
         self.connect(
             self.model.vdda, self.model.vdd3p3, self.model.vdd3p3_rtc, self.model.vdd3p3_cpu, self.model.vdd_spi

edg/parts/microcontroller/Esp32s3.py

@@ -393,8 +393,7 @@ def generate(self) -> None:
             self.connect(self.gnd, self.model.gnd)
             self.export_tap(self.gnd, self.device.gnd)
         else:
-            # TODO debug this type failure
-            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)  # type: ignore
+            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)
 
         if self.get(self.pwr.is_connected()):  # power supplied externally
             self.connect(self.pwr, self.model.pwr)

edg/parts/microcontroller/Rp2040.py

@@ -500,8 +500,7 @@ def generate(self) -> None:
             self.connect(self.gnd, self.model.gnd)
             self.export_tap(self.gnd, self.device.gnd)
         else:
-            # TODO debug this type failure
-            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)  # type: ignore
+            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)
 
         self.connect(self.model.vreg_vout, self.model.dvdd)
         model_pwr = self.connect(self.model.iovdd, self.model.vreg_vin, self.model.adc_avdd, self.model.usb_vdd)

edg/parts/microcontroller/nRF52840.py

@@ -710,8 +710,7 @@ def generate(self) -> None:
             self.connect(self.gnd, self.model.gnd)
             self.export_tap(self.gnd, self.device.gnd)
         else:
-            # TODO debug this type failure
-            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)  # type: ignore
+            self.gnd_model = self.Block(DummyGround()).connected(self.model.gnd)
 
         if self.get(self.pwr.is_connected()):  # power supplied externally
             self.connect(self.pwr, self.model.pwr)