Merge branch 'master' into smuv3.2

Author: ducky64

edg/parts/Lcd_Er_Tft1_28_3.py

@@ -0,0 +1,104 @@
+from .PassiveConnector_Fpc import Fpc050Bottom
+from ..abstract_parts import *
+
+
+class Er_Tft_128_3_Outline(InternalSubcircuit, FootprintBlock):
+    """Footprint for TFT panel outline"""
+
+    def contents(self) -> None:
+        super().contents()
+        self.footprint('U', 'edg:Lcd_Er_Tft1_28_3_Outline', {},
+                       'EastRising', 'ER-TFT1.28-3',
+                       datasheet='https://www.buydisplay.com/download/manual/ER-TFT1.28-3_Datasheet.pdf')
+
+
+class Er_Tft_128_3_Device(InternalSubcircuit, Nonstrict3v3Compatible, Block):
+    """15-pin FPC connector for the ER-TFT1.28-3 device"""
+
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.conn = self.Block(Fpc050Bottom(length=15)) # Pin numbering in the doc is flipped in the footprint
+
+        # Power pins
+        self.vdd = self.Export(self.conn.pins.request('12').adapt_to(VoltageSink(
+            voltage_limits=self.nonstrict_3v3_compatible.then_else(
+                (2.5, 3.6) * Volt,  # abs max is 4.6v
+                (2.5, 3.3) * Volt),
+        )))
+
+        self.gnd = self.Export(self.conn.pins.request('15').adapt_to(Ground()))
+        # Backlight control
+        self.ledk = self.Export(self.conn.pins.request('14'))
+        self.leda = self.Export(self.conn.pins.request('13'))
+
+        dio_model = DigitalBidir.from_supply(
+            self.gnd, self.vdd,
+            voltage_limit_tolerance=(-0.3, 0.3)*Volt,
+            input_threshold_factor=(0.3, 0.7)
+        )
+
+        self.rs = self.Export(self.conn.pins.request('11').adapt_to(DigitalSink.from_bidir(dio_model)))
+
+        # Control pins
+        self.spi = self.Port(SpiPeripheral.empty())
+        self.cs = self.Export(self.conn.pins.request('10').adapt_to(DigitalSink.from_bidir(dio_model)))
+        self.connect(self.spi.sck, self.conn.pins.request('9').adapt_to(DigitalSink.from_bidir(dio_model)))
+        self.connect(self.spi.mosi, self.conn.pins.request('8').adapt_to(DigitalSink.from_bidir(dio_model)))
+
+        self.miso_nc = self.Block(DigitalBidirNotConnected())
+        self.connect(self.spi.miso, self.miso_nc.port)
+
+        self.rst = self.Export(self.conn.pins.request('7').adapt_to(DigitalSink.from_bidir(dio_model)))
+
+        # Capacitive Touch Panel (CTP)
+        self.ctp_i2c = self.Port(I2cTarget(DigitalBidir.empty(), addresses=[0x15]),)
+
+        self.ctp_vdd = self.Export(self.conn.pins.request('6').adapt_to(VoltageSink(
+            voltage_limits=(2.7, 3.6) * Volt,
+            current_draw=(5 * uAmp, 2.5 * mAmp)
+        )))
+
+        self.connect(self.gnd, self.conn.pins.request('5').adapt_to(Ground()))
+
+        self.ctp_rst = self.Export(self.conn.pins.request('4').adapt_to(DigitalSink.from_bidir(dio_model)))
+        self.ctp_int = self.Export(self.conn.pins.request('3').adapt_to(DigitalSink.from_bidir(dio_model)))
+        self.connect(self.ctp_i2c.sda, self.conn.pins.request('2').adapt_to(dio_model))
+        self.connect(self.ctp_i2c.scl, self.conn.pins.request('1').adapt_to(DigitalSink.from_bidir(dio_model)))
+
+
+class Er_Tft_128_3(Lcd, Resettable, Block):
+    """GC9A01-based 1.28" 240x240 TFT, with optional CST816S-based capacitive touch panel."""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.ic = self.Block(Er_Tft_128_3_Device())
+        self.gnd = self.Export(self.ic.gnd, [Common])
+        self.pwr = self.Export(self.ic.vdd, [Power])
+        self.spi = self.Export(self.ic.spi)
+        self.cs = self.Export(self.ic.cs)
+        self.dc = self.Export(self.ic.rs)
+        # touch interface
+        self.ctp_i2c = self.Export(self.ic.ctp_i2c, optional=True, doc='Touch panel interface i2c')
+        self.ctp_rst = self.Export(self.ic.ctp_rst, optional=True, doc='Touch panel interface')
+        self.ctp_int = self.Export(self.ic.ctp_int, optional=True, doc='Touch panel interface')
+
+    def contents(self):
+        super().contents()
+        self.connect(self.reset, self.ic.rst)
+        self.require(self.reset.is_connected())
+
+        self.lcd = self.Block(Er_Tft_128_3_Outline())  # for ic outline
+
+        self.connect(self.ic.ledk.adapt_to(Ground()), self.gnd)
+        forward_current = (24, 30)*mAmp
+        forward_voltage = 2.9*Volt
+        self.led_res = self.Block(Resistor(
+            resistance=((self.pwr.link().voltage.upper() - forward_voltage) / forward_current.upper(),
+                        (self.pwr.link().voltage.lower() - forward_voltage) / forward_current.lower())))
+        self.connect(self.led_res.a.adapt_to(VoltageSink(current_draw=forward_current)), self.pwr)
+        self.connect(self.led_res.b, self.ic.leda)
+        self.connect(self.pwr, self.ic.ctp_vdd)
+        self.require(self.ctp_i2c.is_connected() == self.ctp_rst.is_connected())
+        self.require(self.ctp_i2c.is_connected() == self.ctp_int.is_connected())
+

edg/parts/Lsm6dsv16x.py

@@ -0,0 +1,83 @@
+from .JlcPart import JlcPart
+from ..abstract_parts import *
+
+
+class Lsm6dsv16x_Device(InternalSubcircuit, FootprintBlock, JlcPart):
+    def __init__(self) -> None:
+        super().__init__()
+        self.vdd = self.Port(VoltageSink(
+            voltage_limits=(1.71, 3.6) * Volt,
+            current_draw=(2.6 * uAmp, 0.65 * mAmp)  # Values for low-power and high-performance modes
+        ))
+        self.vddio = self.Port(VoltageSink(
+            voltage_limits=(1.08, 3.6) * Volt  # Extended range
+        ))
+        self.gnd = self.Port(Ground())
+
+        dio_model = DigitalBidir.from_supply(
+            self.gnd, self.vddio,
+            voltage_limit_abs=(-0.3 * Volt, self.vddio.voltage_limits.upper() + 0.3),
+            # datasheet states abs volt to be [0.3, VDD_IO+0.3], likely a typo
+            current_limits=(-4, 4) * mAmp,
+            input_threshold_factor=(0.3, 0.7)
+        )
+        self.i2c = self.Port(I2cTarget(dio_model))
+
+        dout_model = DigitalSource.low_from_supply(self.gnd)
+        self.int1 = self.Port(dout_model, optional=True)
+        self.int2 = self.Port(dout_model, optional=True)
+
+        self.qvar1 = self.Port(Passive(), optional=True)
+        self.qvar2 = self.Port(Passive(), optional=True)
+
+    def contents(self) -> None:
+        self.footprint(
+            'U', 'Package_LGA:Bosch_LGA-14_3x2.5mm_P0.5mm',
+            {
+                '1': self.gnd,  # sa0
+                '2': self.qvar1,  # not used in mode 1
+                '3': self.qvar2,  # not used in mode 1
+                '4': self.int1,
+                '5': self.vddio,
+                '6': self.gnd,
+                '7': self.gnd,
+                '8': self.vdd,
+                '9': self.int2,
+                # '10': self.nc,  # leave unconnected
+                # '11': self.nc,  # leave unconnected
+                '12': self.vddio,  # cs pin
+                '13': self.i2c.scl,
+                '14': self.i2c.sda,
+            },
+            mfr='STMicroelectronics', part='LSM6DSV16X',
+            datasheet='https://www.st.com/resource/en/datasheet/lsm6dsv16x.pdf'
+        )
+        self.assign(self.lcsc_part, 'C5267406')
+        self.assign(self.actual_basic_part, False)
+
+
+class Lsm6dsv16x(Accelerometer, Gyroscope, DefaultExportBlock):
+    """Integrated High-edn smartphone 3d accelerometer (ranging over +/- 2/4/8/16 g) and 3d gyroscope
+    (ranging over +/- 125/250/500/1000/2000 dps). Onboard sensor fusion for quaternion calculation.
+    Supports external qvar for tap detections, etc."""
+
+    def __init__(self):
+        super().__init__()
+        self.ic = self.Block(Lsm6dsv16x_Device())
+        self.gnd = self.Export(self.ic.gnd, [Common])
+        self.pwr = self.Export(self.ic.vdd, [Power])
+        self.pwr_io = self.Export(self.ic.vddio, default=self.pwr, doc="IO supply voltage")
+
+        self.i2c = self.Export(self.ic.i2c)
+        self.int1 = self.Export(self.ic.int1, optional=True,
+                                doc="Programmable interrupt. This can be configured as push-pull / open-drain.")
+        self.int2 = self.Export(self.ic.int2, optional=True,
+                                doc="Programmable interrupt. This can be configured as push-pull / open-drain.")
+
+        self.qvar1 = self.Export(self.ic.qvar1, optional=True, doc="qvar input pin 1")
+        self.qvar2 = self.Export(self.ic.qvar2, optional=True, doc="qvar input pin 2")
+
+    def contents(self):
+        super().contents()
+        self.vdd_cap = self.Block(DecouplingCapacitor(100 * nFarad(tol=0.2))).connected(self.gnd, self.ic.vdd)
+        self.vddio_cap = self.Block(DecouplingCapacitor(100 * nFarad(tol=0.2))).connected(self.gnd, self.ic.vddio)

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."""

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

edg/parts/__init__.py

@@ -116,6 +116,7 @@
 from .Neopixel import Neopixel, Ws2812b, Sk6812Mini_E, Sk6805_Ec15, Sk6812_Side_A, NeopixelArray, NeopixelArrayCircular
 from .Lcd_Qt096t_if09 import Qt096t_if09
 from .Lcd_Ch280qv10_Ct import Ch280qv10_Ct
+from .Lcd_Er_Tft1_28_3 import Er_Tft_128_3
 from .Oled_Er_Oled_091_3 import Er_Oled_091_3
 from .Oled_Er_Oled_096_1_1 import Er_Oled_096_1_1
 from .Oled_Er_Oled_096_1c import Er_Oled_096_1c
@@ -161,6 +162,7 @@
 from .StepperDriver_A4988 import A4988, PololuA4988
 
 from .Imu_Lsm6ds3trc import Lsm6ds3trc
+from .Lsm6dsv16x import Lsm6dsv16x
 from .Mag_Qmc5883l import Qmc5883l
 from .EnvironmentalSensor_Sensirion import Shtc3
 from .EnvironmentalSensor_Bme680 import Bme680

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))))
+)