Require ESP auto-program pins used, move to STM32L432-C (#398)

ducky64 · web-flow · commit 34f0e3bbac75 · 2025-03-23T12:33:53.000-07:00
Requires ESP auto-program pins used on an auto-program connector, but also allows bypassing the check with a refinement. Resolves #301, moving STM32L432 to higher-memory -C variant. Also adds a test output.
diff --git a/edg/parts/Microcontroller_Esp.py b/edg/parts/Microcontroller_Esp.py
@@ -19,13 +19,25 @@ def __init__(self) -> None:
 
 
 class EspProgrammingAutoReset(BlockInterfaceMixin[EspProgrammingHeader]):
-  """Mixin for ESP programming header with auto-reset and auto-boot pins"""
-  def __init__(self, *args, **kwargs) -> None:
+  """Mixin for ESP programming header with auto-reset and auto-boot pins.
+  By default, these are required to be connected (since it doesn't make sense to instantiate
+  this without connecting the additional pins to the micro), but can be disabled with parameters."""
+  @init_in_parent
+  def __init__(self, *args, require_auto_reset: BoolLike = True, **kwargs) -> None:
     super().__init__(*args, **kwargs)
 
     self.en = self.Port(DigitalSource.empty(), optional=True)  # effectively a reset pin
     self.boot = self.Port(DigitalSource.empty(), optional=True)  # IO0 on ESP32, IO9 on ESP32C3
 
+    self.require_auto_reset = self.ArgParameter(require_auto_reset)
+
+  def contents(self) -> None:
+    super().contents()
+    self.require(self.require_auto_reset.implies(self.en.is_connected() & self.boot.is_connected()),
+                 "auto-reset programming header without auto-reset pins connected, "
+                 "either connect by setting programming='uart-auto' or 'uart-auto-button' on the microcontroller "
+                 "or set require_auto_reset=False to disable this check")
+
 
 class EspProgrammingPinHeader254(EspProgrammingHeader):
   """Programming header for ESP series micros using 2.54mm headers, matching the pinning in the reference schematics."""
diff --git a/edg/parts/Microcontroller_Stm32l432.py b/edg/parts/Microcontroller_Stm32l432.py
@@ -210,7 +210,7 @@ class Stm32l432k_Device(Stm32l432Base_Device):
     }
     PACKAGE = 'Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm'
     PART = 'STM32L432Kxxx'
-    LCSC_PART = 'C94784'  # KBU6 variant
+    LCSC_PART = 'C1337280'  # KCU6 variant, maximum memory variant
 
 
 @abstract_block
diff --git a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net
@@ -0,0 +1,106 @@
+(export (version D)
+(components
+(comp (ref "bat.cell[0]")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[0]"))
+  (property (name "edg_short_path") (value "bat.cell[0]"))
+  (property (name "edg_refdes") (value "U1"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0ab40289"))
+(comp (ref "bat.cell[1]")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[1]"))
+  (property (name "edg_short_path") (value "bat.cell[1]"))
+  (property (name "edg_refdes") (value "U2"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0ab6028a"))
+(comp (ref "bat.cell[2]")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[2]"))
+  (property (name "edg_short_path") (value "bat.cell[2]"))
+  (property (name "edg_refdes") (value "U3"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0ab8028b"))
+(comp (ref "bat.cell[3]")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[3]"))
+  (property (name "edg_short_path") (value "bat.cell[3]"))
+  (property (name "edg_refdes") (value "U4"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0aba028c"))
+(comp (ref "mcu")
+  (value "XIAO RP2040")
+  (footprint "Seeed Studio XIAO Series Library:XIAO-Generic-Hybrid-14P-2.54-21X17.8MM")
+  (property (name "Sheetname") (value ""))
+  (property (name "Sheetfile") (value ""))
+  (property (name "edg_path") (value "mcu"))
+  (property (name "edg_short_path") (value "mcu"))
+  (property (name "edg_refdes") (value "U5"))
+  (property (name "edg_part") (value "XIAO RP2040"))
+  (sheetpath (names "/") (tstamps "/"))
+  (tstamps "02850146"))
+(comp (ref "led.package")
+  (value "Red 615~630nm 1.9~2.2V 0603 Light Emitting Diodes (LED) RoHS")
+  (footprint "LED_SMD:LED_0603_1608Metric")
+  (property (name "Sheetname") (value "led"))
+  (property (name "Sheetfile") (value "edg.abstract_parts.AbstractLed.IndicatorLed"))
+  (property (name "edg_path") (value "led.package"))
+  (property (name "edg_short_path") (value "led.package"))
+  (property (name "edg_refdes") (value "D1"))
+  (property (name "edg_part") (value "KT-0603R (Hubei KENTO Elec)"))
+  (sheetpath (names "/led/") (tstamps "/02750136/"))
+  (tstamps "0b4e02cd"))
+(comp (ref "led.res")
+  (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 1kΩ 0603 Chip Resistor - Surface Mount ROHS")
+  (footprint "Resistor_SMD:R_0603_1608Metric")
+  (property (name "Sheetname") (value "led"))
+  (property (name "Sheetfile") (value "edg.abstract_parts.AbstractLed.IndicatorLed"))
+  (property (name "edg_path") (value "led.res"))
+  (property (name "edg_short_path") (value "led.res"))
+  (property (name "edg_refdes") (value "R1"))
+  (property (name "edg_part") (value "0603WAF1001T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (sheetpath (names "/led/") (tstamps "/02750136/"))
+  (tstamps "0296014b")))
+(nets
+(net (code 1) (name "mcu.pwr_vin")
+  (node (ref bat.cell[3]) (pin 1)))
+(net (code 2) (name "mcu.gnd")
+  (node (ref mcu) (pin 13))
+  (node (ref bat.cell[0]) (pin 2))
+  (node (ref led.res) (pin 2)))
+(net (code 3) (name "led.signal")
+  (node (ref mcu) (pin 7))
+  (node (ref led.package) (pin 2)))
+(net (code 4) (name "bat.cell[0].pwr")
+  (node (ref bat.cell[0]) (pin 1))
+  (node (ref bat.cell[1]) (pin 2)))
+(net (code 5) (name "bat.cell[1].pwr")
+  (node (ref bat.cell[1]) (pin 1))
+  (node (ref bat.cell[2]) (pin 2)))
+(net (code 6) (name "bat.cell[2].pwr")
+  (node (ref bat.cell[2]) (pin 1))
+  (node (ref bat.cell[3]) (pin 2)))
+(net (code 7) (name "mcu.pwr_out")
+  (node (ref mcu) (pin 12)))
+(net (code 8) (name "mcu.vusb_out")
+  (node (ref mcu) (pin 14)))
+(net (code 9) (name "led.res.a")
+  (node (ref led.res) (pin 1))
+  (node (ref led.package) (pin 1))))
+)
diff --git a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.ref.net b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.ref.net
@@ -0,0 +1,106 @@
+(export (version D)
+(components
+(comp (ref "U1")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[0]"))
+  (property (name "edg_short_path") (value "bat.cell[0]"))
+  (property (name "edg_refdes") (value "U1"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0ab40289"))
+(comp (ref "U2")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[1]"))
+  (property (name "edg_short_path") (value "bat.cell[1]"))
+  (property (name "edg_refdes") (value "U2"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0ab6028a"))
+(comp (ref "U3")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[2]"))
+  (property (name "edg_short_path") (value "bat.cell[2]"))
+  (property (name "edg_refdes") (value "U3"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0ab8028b"))
+(comp (ref "U4")
+  (value "2460")
+  (footprint "Battery:BatteryHolder_Keystone_2460_1xAA")
+  (property (name "Sheetname") (value "bat"))
+  (property (name "Sheetfile") (value "edg.parts.Batteries.AaBatteryStack"))
+  (property (name "edg_path") (value "bat.cell[3]"))
+  (property (name "edg_short_path") (value "bat.cell[3]"))
+  (property (name "edg_refdes") (value "U4"))
+  (property (name "edg_part") (value "2460 (Keystone)"))
+  (sheetpath (names "/bat/") (tstamps "/025f0138/"))
+  (tstamps "0aba028c"))
+(comp (ref "U5")
+  (value "XIAO RP2040")
+  (footprint "Seeed Studio XIAO Series Library:XIAO-Generic-Hybrid-14P-2.54-21X17.8MM")
+  (property (name "Sheetname") (value ""))
+  (property (name "Sheetfile") (value ""))
+  (property (name "edg_path") (value "mcu"))
+  (property (name "edg_short_path") (value "mcu"))
+  (property (name "edg_refdes") (value "U5"))
+  (property (name "edg_part") (value "XIAO RP2040"))
+  (sheetpath (names "/") (tstamps "/"))
+  (tstamps "02850146"))
+(comp (ref "D1")
+  (value "Red 615~630nm 1.9~2.2V 0603 Light Emitting Diodes (LED) RoHS")
+  (footprint "LED_SMD:LED_0603_1608Metric")
+  (property (name "Sheetname") (value "led"))
+  (property (name "Sheetfile") (value "edg.abstract_parts.AbstractLed.IndicatorLed"))
+  (property (name "edg_path") (value "led.package"))
+  (property (name "edg_short_path") (value "led.package"))
+  (property (name "edg_refdes") (value "D1"))
+  (property (name "edg_part") (value "KT-0603R (Hubei KENTO Elec)"))
+  (sheetpath (names "/led/") (tstamps "/02750136/"))
+  (tstamps "0b4e02cd"))
+(comp (ref "R1")
+  (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 1kΩ 0603 Chip Resistor - Surface Mount ROHS")
+  (footprint "Resistor_SMD:R_0603_1608Metric")
+  (property (name "Sheetname") (value "led"))
+  (property (name "Sheetfile") (value "edg.abstract_parts.AbstractLed.IndicatorLed"))
+  (property (name "edg_path") (value "led.res"))
+  (property (name "edg_short_path") (value "led.res"))
+  (property (name "edg_refdes") (value "R1"))
+  (property (name "edg_part") (value "0603WAF1001T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (sheetpath (names "/led/") (tstamps "/02750136/"))
+  (tstamps "0296014b")))
+(nets
+(net (code 1) (name "mcu.pwr_vin")
+  (node (ref U4) (pin 1)))
+(net (code 2) (name "mcu.gnd")
+  (node (ref U5) (pin 13))
+  (node (ref U1) (pin 2))
+  (node (ref R1) (pin 2)))
+(net (code 3) (name "led.signal")
+  (node (ref U5) (pin 7))
+  (node (ref D1) (pin 2)))
+(net (code 4) (name "bat.cell[0].pwr")
+  (node (ref U1) (pin 1))
+  (node (ref U2) (pin 2)))
+(net (code 5) (name "bat.cell[1].pwr")
+  (node (ref U2) (pin 1))
+  (node (ref U3) (pin 2)))
+(net (code 6) (name "bat.cell[2].pwr")
+  (node (ref U3) (pin 1))
+  (node (ref U4) (pin 2)))
+(net (code 7) (name "mcu.pwr_out")
+  (node (ref U5) (pin 12)))
+(net (code 8) (name "mcu.vusb_out")
+  (node (ref U5) (pin 14)))
+(net (code 9) (name "led.res.a")
+  (node (ref R1) (pin 1))
+  (node (ref D1) (pin 1))))
+)

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ class Stm32l432k_Device(Stm32l432Base_Device):`
`210`	`210`	`}`
`211`	`211`	`PACKAGE = 'Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm'`
`212`	`212`	`PART = 'STM32L432Kxxx'`
`213`		`- LCSC_PART = 'C94784' # KBU6 variant`
	`213`	`+ LCSC_PART = 'C1337280' # KCU6 variant, maximum memory variant`
`214`	`214`
`215`	`215`
`216`	`216`	`@abstract_block`