From bb563d9feba8d171ab548a22f2f25cda27f3fe17 Mon Sep 17 00:00:00 2001
From: Richard Lin <richard.lin@berkeley.edu>
Date: Mon, 1 Jan 2024 16:41:28 -0800
Subject: [PATCH] Update AbstractTestPoint.py

---
 .../AbstractTestPoint.py                      | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/electronics_abstract_parts/AbstractTestPoint.py b/electronics_abstract_parts/AbstractTestPoint.py
index 4e46f5612..7235dda86 100644
--- a/electronics_abstract_parts/AbstractTestPoint.py
+++ b/electronics_abstract_parts/AbstractTestPoint.py
@@ -17,12 +17,26 @@ def __init__(self, name: StringLike = "") -> None:
     self.tp_name = self.ArgParameter(name)
 
 
-class VoltageTestPoint(TypedTestPoint, Block):
-  """Test point with a VoltageSink port."""
-  def __init__(self):
+@non_library
+class BaseTypedTestPoint(TypedTestPoint, Block):
+  """Base class with utility infrastructure for typed test points"""
+  @init_in_parent
+  def __init__(self, name: StringLike = "") -> None:
     super().__init__()
+    self.io: Port
+    self.tp_name = self.ArgParameter(name)
+    self.tp = self.Block(TestPoint(name=StringExpr()))
+
+  def contents(self):
+    super().contents()
+    self.assign(self.tp.tp_name, (self.tp_name == "").then_else(self.io.link().name(), self.tp_name))
+
+
+class VoltageTestPoint(BaseTypedTestPoint, Block):
+  """Test point with a VoltageSink port."""
+  def __init__(self, *args):
+    super().__init__(*args)
     self.io = self.Port(VoltageSink.empty(), [InOut])
-    self.tp = self.Block(TestPoint(name=self.io.link().name()))
     self.connect(self.io, self.tp.io.adapt_to(VoltageSink()))
 
   def connected(self, io: Port[VoltageLink]) -> 'VoltageTestPoint':
@@ -30,12 +44,11 @@ def connected(self, io: Port[VoltageLink]) -> 'VoltageTestPoint':
     return self
 
 
-class DigitalTestPoint(TypedTestPoint, Block):
+class DigitalTestPoint(BaseTypedTestPoint, Block):
   """Test point with a DigitalSink port."""
-  def __init__(self):
-    super().__init__()
+  def __init__(self, *args):
+    super().__init__(*args)
     self.io = self.Port(DigitalSink.empty(), [InOut])
-    self.tp = self.Block(TestPoint(name=self.io.link().name()))
     self.connect(self.io, self.tp.io.adapt_to(DigitalSink()))
 
   def connected(self, io: Port[DigitalLink]) -> 'DigitalTestPoint':
@@ -45,10 +58,11 @@ def connected(self, io: Port[DigitalLink]) -> 'DigitalTestPoint':
 
 class DigitalArrayTestPoint(TypedTestPoint, GeneratorBlock):
   """Creates an array of Digital test points, sized from the port array's connections."""
-  def __init__(self):
+  def __init__(self, name: StringLike = ''):
     super().__init__()
     self.io = self.Port(Vector(DigitalSink.empty()), [InOut])
-    self.generator_param(self.io.requested())
+    self.tp_name = self.ArgParameter(name)
+    self.generator_param(self.io.requested(), self.tp_name)
 
   def generate(self):
     super().generate()
@@ -62,12 +76,11 @@ def generate(self):
       self.connect(self.io.append_elt(DigitalSink.empty(), requested), tp.io)
 
 
-class AnalogTestPoint(TypedTestPoint, Block):
+class AnalogTestPoint(BaseTypedTestPoint, Block):
   """Test point with a AnalogSink port."""
-  def __init__(self):
-    super().__init__()
+  def __init__(self, *args):
+    super().__init__(*args)
     self.io = self.Port(AnalogSink.empty(), [InOut])
-    self.tp = self.Block(TestPoint(name=self.io.link().name()))
     self.connect(self.io, self.tp.io.adapt_to(AnalogSink()))
 
   def connected(self, io: Port[AnalogLink]) -> 'AnalogTestPoint':