BerkeleyHCI · ducky64 · Jul 4, 2026 · Jun 28, 2026 · Jun 28, 2026 · Jun 28, 2026
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ class Keyboard(SimpleBoardTop):
             ImplicitConnect(self.reg.pwr_out, [Power]),
             ImplicitConnect(self.reg.gnd, [Common]),
     ) as imp:
-      self.mcu = imp.Block(Stm32f103_48())
+      self.mcu = imp.Block(Stm32f103())
       self.connect(self.usb.usb, self.mcu.usb.request())
 
       self.sw = self.Block(SwitchMatrix(nrows=3, ncols=2))

diff --git a/docs/ide/ide_blinky_blocks.png b/docs/ide/ide_blinky_blocks.png
diff --git a/docs/ide/ide_blinky_connect.png b/docs/ide/ide_blinky_connect.png
diff --git a/docs/ide/ide_connect_mcu_start.png b/docs/ide/ide_connect_mcu_start.png
diff --git a/docs/ide/ide_designhierarchy_switch.png b/docs/ide/ide_designhierarchy_switch.png
diff --git a/docs/ide/ide_library_xiao.png b/docs/ide/ide_library_xiao.png
diff --git a/docs/ide/ide_livetemplate_gnd_connect.png b/docs/ide/ide_livetemplate_gnd_connect.png
diff --git a/docs/ide/ide_livetemplate_mcu.png b/docs/ide/ide_livetemplate_mcu.png
diff --git a/docs/ide/ide_livetemplate_mcu_named.png b/docs/ide/ide_livetemplate_mcu_named.png
diff --git a/docs/ide/ide_refine_switch.png b/docs/ide/ide_refine_switch.png
diff --git a/docs/kicad/app_pcb_editor.png b/docs/kicad/app_pcb_editor.png
diff --git a/docs/kicad/kicad_array.png b/docs/kicad/kicad_array.png
diff --git a/docs/kicad/kicad_designblocks_empty.png b/docs/kicad/kicad_designblocks_empty.png
diff --git a/docs/kicad/kicad_designblocks_newgroup.png b/docs/kicad/kicad_designblocks_newgroup.png
diff --git a/docs/kicad/kicad_designblocks_newlibrary.png b/docs/kicad/kicad_designblocks_newlibrary.png
diff --git a/docs/kicad/kicad_designblocks_refprop.png b/docs/kicad/kicad_designblocks_refprop.png
diff --git a/docs/kicad/kicad_designblocks_replicate.png b/docs/kicad/kicad_designblocks_replicate.png
diff --git a/docs/kicad/kicad_designblocks_save.png b/docs/kicad/kicad_designblocks_save.png
diff --git a/docs/kicad/kicad_designblocks_switchcell.png b/docs/kicad/kicad_designblocks_switchcell.png
diff --git a/docs/kicad/pcb_initial.png b/docs/kicad/pcb_initial.png
diff --git a/docs/kicad/pcb_netlist.png b/docs/kicad/pcb_netlist.png
diff --git a/docs/kicad/pcb_netlist_dialog.png b/docs/kicad/pcb_netlist_dialog.png
diff --git a/docs/kicad/pcb_stm32.png b/docs/kicad/pcb_stm32.png
diff --git a/docs/kicad/pcb_switcharray.png b/docs/kicad/pcb_switcharray.png
diff --git a/docs/kicad/pcb_switcharray_ordered.png b/docs/kicad/pcb_switcharray_ordered.png
diff --git a/docs/kicad/pcb_switchcell.png b/docs/kicad/pcb_switchcell.png
diff --git a/docs/kicad/pcb_switchcell_anchor.png b/docs/kicad/pcb_switchcell_anchor.png
diff --git a/docs/kicad/pcb_switchcell_group.png b/docs/kicad/pcb_switchcell_group.png
diff --git a/docs/kicad/pcb_switchmatrix_replicated.png b/docs/kicad/pcb_switchmatrix_replicated.png
diff --git a/docs/kicad/pcm_keyswitch_library.png b/docs/kicad/pcm_keyswitch_library.png
diff --git a/docs/kicad/pcm_sublayout.png b/docs/kicad/pcm_sublayout.png
diff --git a/docs/kicad/sublayout_selected.png b/docs/kicad/sublayout_selected.png
diff --git a/docs/kicad/sublayout_stm32.png b/docs/kicad/sublayout_stm32.png
diff --git a/docs/kicad_blinky.png b/docs/kicad_blinky.png
diff --git a/docs/kicad_switchmatrix.png b/docs/kicad_switchmatrix.png
diff --git a/docs/kicad_switchmatrix_discrete.png b/docs/kicad_switchmatrix_discrete.png
diff --git a/docs/kicad_switchmatrix_refined.png b/docs/kicad_switchmatrix_refined.png
diff --git a/edg/BoardTop.py b/edg/BoardTop.py
@@ -99,6 +99,7 @@ def refinements(self) -> Refinements:
                 (Diode, JlcDiode),
                 (Bjt, JlcBjt),
                 (Fet, JlcFet),
+                (LinearRegulator, Ams1117),
                 (Antenna, JlcAntenna),
                 (Fpc050Bottom, Afc01),
                 (Fpc050Top, Afc07Top),

diff --git a/edg/abstract_parts/Neopixel.py b/edg/abstract_parts/Neopixel.py
@@ -1,3 +1,5 @@
+from deprecated import deprecated
+
 from ..electronics_interfaces import *
 
 
@@ -8,7 +10,11 @@ class Neopixel(Light, Block):
     def __init__(self) -> None:
         super().__init__()
         self.pwr = self.Port(VoltageSink.empty(), [Power])
-        self.vdd = self.pwr  # deprecated alias
         self.gnd = self.Port(Ground.empty(), [Common])
         self.din = self.Port(DigitalSink.empty(), [Input])
         self.dout = self.Port(DigitalSource.empty(), optional=True)
+
+    @property
+    @deprecated(f"use pwr")
+    def vdd(self) -> VoltageSink:
+        return self.pwr
diff --git a/edg/circuits/BootstrapCapacitor.py b/edg/circuits/BootstrapCapacitor.py
@@ -2,7 +2,7 @@
 from ..abstract_parts import *
 
 
-class BootstrapCapacitor(Block):
+class BootstrapCapacitor(InternalBlock, Block):
     """A Capacitor wrapper for bootstrap capacitors, with a negative VoltageSink and a positive VoltageSource.
     This is meant to be used only with bootstrap pins on power conversion chips, that source some voltage and sink the
     boosted voltage. This is not meant to be general-purpose and will not function standalone.

diff --git a/edg/circuits/PowerCircuits.py b/edg/circuits/PowerCircuits.py
@@ -139,7 +139,7 @@ def generate(self) -> None:
             self.connect(self.reset, self.driver.with_mixin(Resettable()).reset)
 
 
-class RampLimiter(KiCadSchematicBlock):
+class RampLimiter(PowerConditioner, KiCadSchematicBlock):
     """PMOS-based ramp limiter that roughly targets a constant-dV/dt ramp.
     The cgd should be specified to swamp (10x+) the parasitic Cgd of the FET to get more controlled parameters.
     The target ramp rate is in volts/second, and for a capacitive load this can be calculated from a target current with

diff --git a/edg/circuits/SwitchMatrix.py b/edg/circuits/SwitchMatrix.py
@@ -77,7 +77,7 @@ def contents(self) -> None:
 
 
 @abstract_block_default(lambda: SwitchDiodeMatrix)
-class SwitchMatrix(InternalBlock, Block):
+class SwitchMatrix(HumanInterface, Block):
 
     def __init__(self, ncols: IntLike, nrows: IntLike, voltage_drop: RangeLike = (0, 0.7) * Volt):
         super().__init__()
@@ -90,7 +90,7 @@ def __init__(self, ncols: IntLike, nrows: IntLike, voltage_drop: RangeLike = (0,
         self.cols = self.Port(Vector(DigitalSource.empty()))
 
 
-class SwitchDiodeMatrix(SwitchMatrix, HumanInterface, GeneratorBlock, SvgPcbTemplateBlock):
+class SwitchDiodeMatrix(SwitchMatrix, GeneratorBlock, SvgPcbTemplateBlock):
     """A switch matrix, such as for a keyboard, that generates (nrows * ncols) switches while only
     using max(nrows, ncols) IOs.
 
@@ -249,7 +249,7 @@ def __init__(self, *args: Any, npx_order: StringLike = "row_snake", **kwargs: An
         self.npx_gnd = self.Port(Ground.empty())
 
 
-class SwitchDiodeMatrixNeopixels(SwitchMatrixNeopixels, SwitchDiodeMatrix, HumanInterface, GeneratorBlock):
+class SwitchDiodeMatrixNeopixels(SwitchMatrixNeopixels, SwitchDiodeMatrix, GeneratorBlock):
     """SwitchMatrix implementation with neopixel chain."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

diff --git a/edg/circuits/VoltageComparator.py b/edg/circuits/VoltageComparator.py
@@ -4,7 +4,7 @@
 from .ResistiveDivider import VoltageDivider, FeedbackVoltageDivider
 
 
-class VoltageComparator(GeneratorBlock):
+class VoltageComparator(Analog, GeneratorBlock):
     """A comparator subcircuit that compares an input voltage rail against some reference, either
     internally generated from the power lines or an external analog signals.
     Accounts for tolerance stackup on the reference input - so make sure the trip

diff --git a/edg/electronics_interfaces/CircuitPackingBlock.py b/edg/electronics_interfaces/CircuitPackingBlock.py
@@ -15,7 +15,7 @@ def packed(self, elts: BasePort, merged: BasePort) -> None:
         self.nets_packed = self.Metadata({"src": self._ports.name_of(elts), "dst": self._ports.name_of(merged)})
 
 
-class PackedPassive(GeneratorBlock):
+class PackedPassive(InternalSubcircuit, GeneratorBlock):
     """A pseudoblock that asserts all elts are connected to the same net, then connects them to merged."""
 
     def __init__(self) -> None:
@@ -36,7 +36,7 @@ def generate(self) -> None:
         )
 
 
-class PackedGround(GeneratorBlock):
+class PackedGround(InternalSubcircuit, GeneratorBlock):
     """Takes in several Ground connections that are of the same net (asserted in netlister),
     and provides a single Ground."""
 
@@ -59,7 +59,7 @@ def generate(self) -> None:
         self.assign(self.gnd_out.voltage, self.gnd_ins.hull(lambda x: x.link().voltage))
 
 
-class PackedVoltageSource(GeneratorBlock):
+class PackedVoltageSource(InternalSubcircuit, GeneratorBlock):
     """Takes in several VoltageSink connections that are of the same net (asserted in netlister),
     and provides a single VoltageSource. Distributes the current draw from the VoltageSource
     equally among the inputs."""

diff --git a/edg/electronics_model/SubboardBlock.py b/edg/electronics_model/SubboardBlock.py
@@ -5,6 +5,7 @@
 from ..core.Core import Refable
 from ..core.HdlUserExceptions import UnconnectableError
 from .. import edgir
+from .Categories import DiscreteComponent
 
 
 @non_library
@@ -68,6 +69,7 @@ def _populate_def_proto_hierarchy(self, pb: edgir.HierarchyBlock, ref_map: Refab
                 constraint_pb.exported.tap = True
 
 
+@non_library
 class SubboardBlock(HasSubboardBlockApi, Block):
     """A block that is a sub-board, where all its blocks not marked external are part of a different board.
     Provides the export_tap construct to tack connectors onto ports without breaking modeling.
@@ -81,6 +83,7 @@ def __init__(self) -> None:
         self.fp_subboard = self.Metadata("A")  # dummy distinct value
 
 
+@non_library
 class WrapperSubboardBlock(SubboardBlock):
     """A wrapper block where the internal blocks are skipped for netlisting and used for modeling only.
     Useful for eg, dev boards that only generate a connector or socket but re-use modeling from the raw subcircuit."""
@@ -90,7 +93,8 @@ def __init__(self) -> None:
         self.fp_subblocks_ignored = self.Metadata("B")  # dummy distinct value
 
 
-class SubboardConnectorPair(HasSubboardBlockApi, Block):
+@abstract_block
+class SubboardConnectorPair(DiscreteComponent, HasSubboardBlockApi, Block):
     """A block meant for a connector pair, one in the exterior and one in the interior, of a SubboardBlock.
     When in a SubboardBlock scope and marked external, this inherits the parent and self board scope of its container,
     so inner Blocks marked external are part of the SubboardBlock's parent scope, while internal Blocks

diff --git a/edg/parts/analog/opamp/Ina826.py b/edg/parts/analog/opamp/Ina826.py
@@ -70,7 +70,7 @@ def contents(self) -> None:
         self.assign(self.actual_basic_part, False)
 
 
-class Ina826(KiCadImportableBlock, GeneratorBlock):
+class Ina826(Sensor, KiCadImportableBlock, GeneratorBlock):
     """Cost-effective instrumentation amplifier in SOIC-8, with gain 1-1000 set by single resistor.
     TODO: DiffAmp / InAmp abstract class, which supports KiCadImportableBlock
     """

diff --git a/edg/parts/human_interface/Neopixel.py b/edg/parts/human_interface/Neopixel.py
@@ -21,7 +21,7 @@ def __init__(self) -> None:
         self.din.init_from(
             DigitalSink.from_supply(
                 self.gnd,
-                self.vdd,
+                self.pwr,
                 voltage_limit_tolerance=(-0.3, 0.7),
                 input_threshold_abs=(0.7, 2.7),
                 # note that a more restrictive input_threshold_abs of (1.5, 2.3) was used previously

diff --git a/edg/parts/interface/Rf_Sx1262.py b/edg/parts/interface/Rf_Sx1262.py
@@ -64,7 +64,7 @@ def contents(self) -> None:
         self.assign(self.actual_basic_part, False)
 
 
-class Pe4259(Block):
+class Pe4259(InternalSubcircuit, Block):
     """RF switch between 10 MHz to 3000 MHz, 1.8-3.3v input.
     Requires all RF pins be held at 0v or are DC-blocked with a series cap.
     TODO: perhaps a RfSwitch base class? maybe some relation to AnalogSwitch? (though not valid at DC)

diff --git a/edg/parts/microcontroller/Stm32f103.py b/edg/parts/microcontroller/Stm32f103.py
@@ -1,5 +1,6 @@
 from typing import *
 
+from deprecated import deprecated
 from typing_extensions import override
 
 from ...circuits import *
@@ -255,7 +256,7 @@ def __init__(self, resistance: RangeLike):
         self.connect(self.usb.dp, self.dp.b)
 
 
-class Stm32f103_48(
+class Stm32f103(
     Resettable,
     IoControllerI2cTarget,
     IoControllerCan,
@@ -323,3 +324,8 @@ def _crystal_required(self) -> bool:  # crystal needed for CAN or USB b/c tighte
             or len(self.get(self.usb.requested())) > 0
             or super()._crystal_required()
         )
+
+
+@deprecated("Use Stm32f103 instead of Stm32f103_48")
+class Stm32f103_48(Stm32f103):
+    pass
diff --git a/edg/parts/microcontroller/__init__.py b/edg/parts/microcontroller/__init__.py
@@ -1,7 +1,7 @@
 from .Ch32v003 import Ch32v003, Ch32vSdiHeader, Ch32vSdiHeader254, Ch32vSdiTc2030
 from .Ch32v203 import Ch32v203, Ch32vSdi2Header, Ch32vSdi2Header254, Ch32vSdi2Tc2030
 from .Lpc1549 import Lpc1549_48, Lpc1549_64
-from .Stm32f103 import Stm32f103_48
+from .Stm32f103 import Stm32f103, Stm32f103_48
 from .Stm32f303 import Nucleo_F303k8
 from .Stm32g031 import Stm32g031_G
 from .Stm32g431 import Stm32g431kb

diff --git a/edg/parts/power/FuelGauge_Max17048.py b/edg/parts/power/FuelGauge_Max17048.py
@@ -53,7 +53,7 @@ def contents(self) -> None:
         self.assign(self.actual_basic_part, False)
 
 
-class Max17048(DefaultExportBlock):
+class Max17048(Sensor, DefaultExportBlock):
     """1-Cell Li-Ion voltage based fuel gauge. Senses its pwr as the battery voltage."""
 
     def __init__(self) -> None:

diff --git a/edg/parts/power/motor/StepperDriver_A4988.py b/edg/parts/power/motor/StepperDriver_A4988.py
@@ -111,7 +111,7 @@ def contents(self) -> None:
         self.assign(self.lcsc_part, "C38437")
 
 
-class A4988(GeneratorBlock):
+class A4988(MotorDriver, GeneratorBlock):
     """Bipolar stepper motor driver with microstepping (1:2/4/8/16) and current limiting. 8-35V input, up to 2A."""
 
     def __init__(
@@ -302,7 +302,7 @@ def generate(self) -> None:
         )
 
 
-class PololuA4988(BrushedMotorDriver, WrapperSubboardBlock):
+class PololuA4988(MotorDriver, WrapperSubboardBlock):
     """Pololu breakout board for the A4988 stepper driver. Adjustable current limit with onboard trimpot."""
 
     def __init__(self, step_resolution: IntLike = 16):

diff --git a/edg/vendor_parts/TactileSwitches.py → edg/vendor_parts/Switches.py b/edg/vendor_parts/TactileSwitches.py → edg/vendor_parts/Switches.py
@@ -40,11 +40,8 @@ def contents(self) -> None:
 
 class KailhSocket(MechanicalKeyswitch, FootprintBlock):
     """Kailh mechanical keyboard hotswap socket.
-    Requires an external library, Keyswitch Kicad Library, can be installed from the
-    KiCad Plugin and Content Manager, or from GitHub https://github.com/perigoso/keyswitch-kicad-library
-    Even after the content manager install, it must also be manually added to the footprint table:
-    Name: Switch_Keyboard_Hotswap_Kailh
-    Location: ${KICAD6_3RD_PARTY}/footprints/com_github_perigoso_keyswitch-kicad-library/Switch_Keyboard_Hotswap_Kailh.pretty
+    Requires an external library, Keyswitch Kicad Library, available on the KiCad Plugin and Content Manager (PCM).
+    This footprint uses the path when installed via the PCM.
     """
 
     @override
@@ -53,7 +50,7 @@ def contents(self) -> None:
 
         self.footprint(
             "SW",
-            "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX",
+            "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX",
             {
                 "1": self.sw,
                 "2": self.com,

diff --git a/edg/vendor_parts/__init__.py b/edg/vendor_parts/__init__.py
@@ -3,7 +3,7 @@
 from . import jlcparts
 from .generic import *
 
-from .TactileSwitches import SmtSwitch, SmtSwitchRa, KailhSocket
+from .Switches import SmtSwitch, SmtSwitchRa, KailhSocket
 from .Leds import SmtLed, ThtLed, Smt0606RgbLed, Smt0404RgbLed, ThtRgbLed
 
 from .CeramicResonator_Cstne import Cstne

diff --git a/examples/DeskController/DeskController.net.ref b/examples/DeskController/DeskController.net.ref
@@ -266,7 +266,7 @@
   (tstamps "00640064"))
 (comp (ref "DSW1")
   (value "sw.sw[0,0].sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value "sw[0,0]"))
   (property (name "Sheetfile") (value "edg.circuits.SwitchMatrix.DiodeSwitchCell"))
   (property (name "edg_path") (value "sw.sw[0,0].sw"))
@@ -290,7 +290,7 @@
   (tstamps "00650065"))
 (comp (ref "DSW2")
   (value "sw.sw[1,0].sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value "sw[1,0]"))
   (property (name "Sheetfile") (value "edg.circuits.SwitchMatrix.DiodeSwitchCell"))
   (property (name "edg_path") (value "sw.sw[1,0].sw"))
@@ -314,7 +314,7 @@
   (tstamps "00650065"))
 (comp (ref "DSW3")
   (value "sw.sw[0,1].sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value "sw[0,1]"))
   (property (name "Sheetfile") (value "edg.circuits.SwitchMatrix.DiodeSwitchCell"))
   (property (name "edg_path") (value "sw.sw[0,1].sw"))
@@ -338,7 +338,7 @@
   (tstamps "00650065"))
 (comp (ref "DSW4")
   (value "sw.sw[1,1].sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value "sw[1,1]"))
   (property (name "Sheetfile") (value "edg.circuits.SwitchMatrix.DiodeSwitchCell"))
   (property (name "edg_path") (value "sw.sw[1,1].sw"))
@@ -362,7 +362,7 @@
   (tstamps "00650065"))
 (comp (ref "DSW5")
   (value "sw.sw[0,2].sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value "sw[0,2]"))
   (property (name "Sheetfile") (value "edg.circuits.SwitchMatrix.DiodeSwitchCell"))
   (property (name "edg_path") (value "sw.sw[0,2].sw"))
@@ -386,7 +386,7 @@
   (tstamps "00650065"))
 (comp (ref "DSW6")
   (value "sw.sw[1,2].sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value "sw[1,2]"))
   (property (name "Sheetfile") (value "edg.circuits.SwitchMatrix.DiodeSwitchCell"))
   (property (name "edg_path") (value "sw.sw[1,2].sw"))

diff --git a/examples/JacdacKeyswitch/JacdacKeyswitch.net.ref b/examples/JacdacKeyswitch/JacdacKeyswitch.net.ref
@@ -326,7 +326,7 @@
   (tstamps "02ae014f"))
 (comp (ref "SW1")
   (value "sw")
-  (footprint "Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
+  (footprint "PCM_Switch_Keyboard_Hotswap_Kailh:SW_Hotswap_Kailh_MX")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
   (property (name "edg_path") (value "sw.package"))