From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 26 Feb 2024 18:06:47 +0000 (-0800)
Subject: Merge branch 'main' into main
X-Git-Tag: 8.33.0~1^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/b5d02b750a519072fb5ca6162622fc3a5911445c

Merge branch 'main' into main
---

b5d02b750a519072fb5ca6162622fc3a5911445c
diff --cc src/board.py
index baa15e6,2c56926..ca7c683
--- a/src/board.py
+++ b/src/board.py
@@@ -367,9 -373,9 +373,12 @@@ elif board_id == ap_board.REPKA_PI_4_H6
  elif board_id == ap_board.GENERIC_LINUX_PC:
      from adafruit_blinka.board.generic_linux_pc import *
  
+ elif board_id == ap_board.LICHEEPI_4A:
+     from adafruit_blinka.board.licheepi_4a import *
+ 
 +elif board_id == ap_board.MILKV_DUO:
 +    from adafruit_blinka.board.milkv_duo import *
 +
  elif "sphinx" in sys.modules:
      pass
  
diff --cc src/microcontroller/__init__.py
index 7ef7bab,1667986..2c51e3b
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -144,8 -144,8 +144,10 @@@ elif chip_id == ap_chip.RP2040_U2IF
      from adafruit_blinka.microcontroller.rp2040_u2if import *
  elif chip_id == ap_chip.D1_RISCV:
      from adafruit_blinka.microcontroller.allwinner.D1 import *
 +elif chip_id == ap_chip.CV1800B:
 +    from adafruit_blinka.microcontroller.cv1800b import *
+ elif chip_id == ap_chip.TH1520:
+     from adafruit_blinka.microcontroller.thead.th1520 import *
  elif chip_id == ap_chip.GENERIC_X86:
      print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")
  elif chip_id is None:
diff --cc src/microcontroller/pin.py
index 3e4e731,f0da319..c499364
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -133,8 -139,8 +139,10 @@@ elif chip_id == ap_chip.RP2040_U2IF
      from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
  elif chip_id == ap_chip.D1_RISCV:
      from adafruit_blinka.microcontroller.allwinner.D1.pin import *
 +elif chip_id == ap_chip.CV1800B:
 +    from adafruit_blinka.microcontroller.cv1800b.pin import *
+ elif chip_id == ap_chip.TH1520:
+     from adafruit_blinka.microcontroller.thead.th1520.pin import *
  elif "sphinx" in sys.modules:
      # pylint: disable=unused-import
      from adafruit_blinka.microcontroller.generic_micropython import Pin