]> Repositories - Adafruit_Blinka-hackapet.git/commitdiff
Merge branch 'main' into main
authorMelissa LeBlanc-Williams <melissa@adafruit.com>
Mon, 26 Feb 2024 18:06:47 +0000 (10:06 -0800)
committerGitHub <noreply@github.com>
Mon, 26 Feb 2024 18:06:47 +0000 (10:06 -0800)
1  2 
src/board.py
src/digitalio.py
src/microcontroller/__init__.py
src/microcontroller/pin.py

diff --cc src/board.py
index baa15e651d7700532c05fdf14957106b169c344c,2c569261a18679ccdda1cd076c1be361d5a4da71..ca7c683fa35254b0e3db10d1efa6bfe933e26bc2
@@@ -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
  
Simple merge
index 7ef7bab7722bee933550faf99e71a6ac3dd33e5d,1667986ab46c26ff2a7a1490bbb9cc512f9b1da0..2c51e3b06c205a5894ab0bf84d287b6de62961af
@@@ -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:
index 3e4e7313c224a7e2c5bb7e52bafe2ce3ea1ad194,f0da319416f91303402768d830390fcc6f3862de..c499364f77d669a3a03a2fa0cc3091abd1489f67
@@@ -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