From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 4 Jan 2022 16:39:57 +0000 (-0800)
Subject: Merge pull request #531 from CesarChavezRico/main
X-Git-Tag: 6.18.0~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/2a489634c200962968a510785adae236877c7e5d?ds=inline;hp=-c

Merge pull request #531 from CesarChavezRico/main

Feat: Adding H3 NanoPi Neo
---

2a489634c200962968a510785adae236877c7e5d
diff --combined src/board.py
index 5cd55e1,d4f37ef..69bd3a7
--- a/src/board.py
+++ b/src/board.py
@@@ -136,9 -136,6 +136,9 @@@ elif board_id == ap_board.ORANGE_PI_ZER
  elif board_id == ap_board.ORANGE_PI_ZERO_2:
      from adafruit_blinka.board.orangepi.orangepizero2 import *
  
 +elif board_id == ap_board.ORANGE_PI_3:
 +    from adafruit_blinka.board.orangepi.orangepi3 import *
 +
  elif board_id == ap_board.BANANA_PI_M2_ZERO:
      from adafruit_blinka.board.bananapi.bpim2zero import *
  
@@@ -253,6 -250,9 +253,9 @@@ elif board_id == ap_board.NANOPI_NEO_AI
  elif board_id == ap_board.NANOPI_DUO2:
      from adafruit_blinka.board.nanopi.duo2 import *
  
+ elif board_id == ap_board.NANOPI_NEO:
+     from adafruit_blinka.board.nanopi.neo import *
+ 
  elif board_id == ap_board.PICO_U2IF:
      from adafruit_blinka.board.pico_u2if import *
  
diff --combined src/microcontroller/__init__.py
index e1fe7fc,886064e..74ccd63
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -107,6 -107,8 +107,8 @@@ elif chip_id == ap_chip.RK3399
      from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
  elif chip_id == ap_chip.RK3328:
      from adafruit_blinka.microcontroller.rockchip.rk3328.pin import *
+ 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 *
  elif chip_id == ap_chip.IMX8MX:
@@@ -135,8 -137,6 +137,8 @@@ elif chip_id == ap_chip.MT8167
      from adafruit_blinka.microcontroller.mt8167.pin import *
  elif chip_id == ap_chip.RP2040_U2IF:
      from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
 +elif chip_id == ap_chip.GENERIC_X86:
 +    print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")
  elif "sphinx" in sys.modules:
      pass
  else: