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?hp=-c

Merge branch 'main' into main
---

b5d02b750a519072fb5ca6162622fc3a5911445c
diff --combined src/board.py
index baa15e6,2c56926..ca7c683
--- a/src/board.py
+++ b/src/board.py
@@@ -364,12 -364,18 +364,21 @@@ elif board_id == ap_board.AML_S905X_CC
  elif board_id == ap_board.ROC_RK3328_CC:
      from adafruit_blinka.board.librecomputer.roc_rk3328_cc import *
  
+ elif board_id == ap_board.REPKA_PI_3_H5:
+     from adafruit_blinka.board.repkapi.repka_pi_3 import *
+ 
+ elif board_id == ap_board.REPKA_PI_4_H6:
+     from adafruit_blinka.board.repkapi.repka_pi_4 import *
+ 
  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 --combined src/digitalio.py
index 0778614,e792630..640a8cf
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@@ -115,6 -115,8 +115,8 @@@ elif detector.chip.H616
      from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin
  elif detector.chip.D1_RISCV:
      from adafruit_blinka.microcontroller.allwinner.D1.pin import Pin
+ elif detector.chip.TH1520:
+     from adafruit_blinka.microcontroller.thead.th1520.pin import Pin
  # Special Case Boards
  elif detector.board.ftdi_ft232h:
      from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
@@@ -133,8 -135,6 +135,8 @@@ elif detector.chip.STM32F405
      from machine import Pin
  elif detector.chip.RP2040:
      from machine import Pin
 +elif detector.chip.CV1800B:
 +    from adafruit_blinka.microcontroller.cv1800b.pin import Pin
  
  from adafruit_blinka import Enum, ContextManaged
  
diff --combined 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 --combined src/microcontroller/pin.py
index 3e4e731,f0da319..c499364
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -4,7 -4,7 +4,7 @@@
  """Pins named after their chip name."""
  
  import sys
- from adafruit_platformdetect.constants import chips as ap_chip
+ from adafruit_platformdetect.constants import chips as ap_chip, boards as ap_boards
  from adafruit_blinka.agnostic import board_id, chip_id
  
  # We intentionally are patching into this namespace so skip the wildcard check.
@@@ -45,11 -45,17 +45,17 @@@ elif chip_id == ap_chip.SUN8I
  elif chip_id == ap_chip.H3:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import *
  elif chip_id == ap_chip.H5:
-     from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+     if board_id == ap_boards.REPKA_PI_3_H5:
+         from adafruit_blinka.board.repkapi.repka_pi_3 import *
+     else:
+         from adafruit_blinka.microcontroller.allwinner.h5.pin import *
  elif chip_id == ap_chip.H6:
      from adafruit_blinka.microcontroller.allwinner.h6.pin import *
  elif chip_id == ap_chip.H616:
-     from adafruit_blinka.microcontroller.allwinner.h616.pin import *
+     if board_id == ap_boards.REPKA_PI_4_H6:
+         from adafruit_blinka.board.repkapi.repka_pi_4 import *
+     else:
+         from adafruit_blinka.microcontroller.allwinner.h616.pin import *
  elif chip_id == ap_chip.SAMA5:
      from adafruit_blinka.microcontroller.sama5.pin import *
  elif chip_id == ap_chip.T210:
@@@ -113,7 -119,7 +119,7 @@@ elif chip_id == ap_chip.RK3328
  elif chip_id == ap_chip.RK3566:
      from adafruit_blinka.microcontroller.rockchip.rk3566.pin import *
  elif chip_id == ap_chip.RK3568:
-     if board_id in ("ODROID_M1"):
+     if board_id in (ap_boards.ODROID_M1,):
          from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import *
      else:
          from adafruit_blinka.microcontroller.rockchip.rk3568.pin import *
@@@ -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