Merge pull request #837 from brentru/fix-spi-generic-board

[Adafruit_Blinka-hackapet.git] / src / board.py

diff --git a/src/board.py b/src/board.py
index 479e06e06c597e8f3c1eae96f8dd2a414a1e2a3c..62af7637fb58eb6e136a7e04ef3e0e69cf7d0935 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -17,7 +17,6 @@ __blinka__ = True
 
 
 import sys
 
 
 import sys

-

 import adafruit_platformdetect.constants.boards as ap_board
 from adafruit_blinka.agnostic import board_id, detector
 
 import adafruit_platformdetect.constants.boards as ap_board
 from adafruit_blinka.agnostic import board_id, detector
 


@@ -27,6 +26,9 @@ from adafruit_blinka.agnostic import board_id, detector
 if board_id == ap_board.FEATHER_HUZZAH:
     from adafruit_blinka.board.feather_huzzah import *
 
 if board_id == ap_board.FEATHER_HUZZAH:
     from adafruit_blinka.board.feather_huzzah import *
 

+elif board_id == ap_board.OLIMEX_LIME2:
+    from adafruit_blinka.board.OLIMEX_LIME2 import *
+

 elif board_id == ap_board.NODEMCU:
     from adafruit_blinka.board.nodemcu import *
 
 elif board_id == ap_board.NODEMCU:
     from adafruit_blinka.board.nodemcu import *
 


@@ -39,9 +41,12 @@ elif board_id == ap_board.RASPBERRY_PI_PICO:
 elif (
     detector.board.RASPBERRY_PI_4B
     or detector.board.RASPBERRY_PI_CM4
 elif (
     detector.board.RASPBERRY_PI_4B
     or detector.board.RASPBERRY_PI_CM4

+    or detector.board.RASPBERRY_PI_CM4S

     or detector.board.RASPBERRY_PI_400
 ):
     from adafruit_blinka.board.raspberrypi.raspi_4b import *
     or detector.board.RASPBERRY_PI_400
 ):
     from adafruit_blinka.board.raspberrypi.raspi_4b import *

+elif detector.board.RASPBERRY_PI_5:
+    from adafruit_blinka.board.raspberrypi.raspi_5b import *

 
 elif detector.board.any_raspberry_pi_40_pin:
     from adafruit_blinka.board.raspberrypi.raspi_40pin import *
 
 elif detector.board.any_raspberry_pi_40_pin:
     from adafruit_blinka.board.raspberrypi.raspi_40pin import *


@@ -61,6 +66,9 @@ elif board_id == ap_board.BEAGLEBONE:
 elif board_id == ap_board.BEAGLEBONE_BLACK:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
 
 elif board_id == ap_board.BEAGLEBONE_BLACK:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
 

+elif board_id == ap_board.BEAGLEBONE_BLUE:
+    from adafruit_blinka.board.beagleboard.beaglebone_blue import *
+

 elif board_id == ap_board.BEAGLEBONE_GREEN:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
 
 elif board_id == ap_board.BEAGLEBONE_GREEN:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
 


@@ -130,6 +138,9 @@ elif board_id == ap_board.ORANGE_PI_4_LTS:
 elif board_id == ap_board.ORANGE_PI_5:
     from adafruit_blinka.board.orangepi.orangepi5 import *
 
 elif board_id == ap_board.ORANGE_PI_5:
     from adafruit_blinka.board.orangepi.orangepi5 import *
 

+elif board_id == ap_board.ORANGE_PI_5_PLUS:
+    from adafruit_blinka.board.orangepi.orangepi5plus import *
+

 elif board_id == ap_board.BANANA_PI_M2_ZERO:
     from adafruit_blinka.board.bananapi.bpim2zero import *
 
 elif board_id == ap_board.BANANA_PI_M2_ZERO:
     from adafruit_blinka.board.bananapi.bpim2zero import *
 


@@ -139,6 +150,9 @@ elif board_id == ap_board.BANANA_PI_M2_PLUS:
 elif board_id == ap_board.BANANA_PI_M5:
     from adafruit_blinka.board.bananapi.bpim5 import *
 
 elif board_id == ap_board.BANANA_PI_M5:
     from adafruit_blinka.board.bananapi.bpim5 import *
 

+elif board_id == ap_board.LEMAKER_BANANA_PRO:
+    from adafruit_blinka.board.lemaker.bananapro import *
+

 elif board_id == ap_board.GIANT_BOARD:
     from adafruit_blinka.board.giantboard import *
 
 elif board_id == ap_board.GIANT_BOARD:
     from adafruit_blinka.board.giantboard import *
 


@@ -163,6 +177,9 @@ elif board_id == ap_board.JETSON_NX:
 elif board_id == ap_board.JETSON_AGX_ORIN:
     from adafruit_blinka.board.nvidia.jetson_orin import *
 
 elif board_id == ap_board.JETSON_AGX_ORIN:
     from adafruit_blinka.board.nvidia.jetson_orin import *
 

+elif board_id in (ap_board.JETSON_ORIN_NX, ap_board.JETSON_ORIN_NANO):
+    from adafruit_blinka.board.nvidia.jetson_orin_nx import *
+

 elif board_id == ap_board.CLARA_AGX_XAVIER:
     from adafruit_blinka.board.nvidia.clara_agx_xavier import *
 
 elif board_id == ap_board.CLARA_AGX_XAVIER:
     from adafruit_blinka.board.nvidia.clara_agx_xavier import *
 


@@ -184,6 +201,9 @@ elif board_id == ap_board.ODROID_N2:
 elif board_id == ap_board.ODROID_M1:
     from adafruit_blinka.board.hardkernel.odroidm1 import *
 
 elif board_id == ap_board.ODROID_M1:
     from adafruit_blinka.board.hardkernel.odroidm1 import *
 

+elif board_id == ap_board.ODROID_M1S:
+    from adafruit_blinka.board.hardkernel.odroidm1s import *
+

 elif board_id == ap_board.KHADAS_VIM3:
     from adafruit_blinka.board.khadas.khadasvim3 import *
 
 elif board_id == ap_board.KHADAS_VIM3:
     from adafruit_blinka.board.khadas.khadasvim3 import *
 


@@ -212,11 +232,20 @@ elif board_id == ap_board.SIFIVE_UNLEASHED:
     from adafruit_blinka.board.hifive_unleashed import *
 
 elif board_id == ap_board.PINE64:
     from adafruit_blinka.board.hifive_unleashed import *
 
 elif board_id == ap_board.PINE64:

-    from adafruit_blinka.board.pine64 import *
+    from adafruit_blinka.board.pine64.pine64 import *

 
 elif board_id == ap_board.PINEH64:
     from adafruit_blinka.board.pineH64 import *
 
 
 elif board_id == ap_board.PINEH64:
     from adafruit_blinka.board.pineH64 import *
 

+elif board_id == ap_board.QUARTZ64_A:
+    from adafruit_blinka.board.pine64.quartz64_a import *
+
+elif board_id == ap_board.PCDUINO2:
+    from adafruit_blinka.board.linksprite.pcduino2 import *
+
+elif board_id == ap_board.PCDUINO3:
+    from adafruit_blinka.board.linksprite.pcduino3 import *
+

 elif board_id == ap_board.SOPINE:
     from adafruit_blinka.board.soPine import *
 
 elif board_id == ap_board.SOPINE:
     from adafruit_blinka.board.soPine import *
 


@@ -232,9 +261,15 @@ elif board_id == ap_board.RADXA_CM3:
 elif board_id == ap_board.ROCK_PI_3A:
     from adafruit_blinka.board.radxa.rockpi3a import *
 
 elif board_id == ap_board.ROCK_PI_3A:
     from adafruit_blinka.board.radxa.rockpi3a import *
 

+elif board_id == ap_board.ROCK_PI_3C:
+    from adafruit_blinka.board.radxa.rockpi3c import *
+

 elif board_id == ap_board.RADXA_ZERO:
     from adafruit_blinka.board.radxa.radxazero import *
 
 elif board_id == ap_board.RADXA_ZERO:
     from adafruit_blinka.board.radxa.radxazero import *
 

+elif board_id == ap_board.RADXA_ZERO3:
+    from adafruit_blinka.board.radxa.radxazero3 import *
+

 elif board_id == ap_board.ROCK_PI_S:
     from adafruit_blinka.board.radxa.rockpis import *
 
 elif board_id == ap_board.ROCK_PI_S:
     from adafruit_blinka.board.radxa.rockpis import *
 


@@ -242,7 +277,10 @@ elif board_id == ap_board.ROCK_PI_4:
     from adafruit_blinka.board.radxa.rockpi4 import *
 
 elif board_id == ap_board.ROCK_PI_4_C_PLUS:
     from adafruit_blinka.board.radxa.rockpi4 import *
 
 elif board_id == ap_board.ROCK_PI_4_C_PLUS:

-    from adafruit_blinka.board.radxa.rockpi4cplus import *
+    from adafruit_blinka.board.radxa.rockpi4 import *
+
+elif board_id == ap_board.ROCK_PI_4_SE:
+    from adafruit_blinka.board.radxa.rockpi4 import *

 
 elif board_id == ap_board.ROCK_PI_5:
     from adafruit_blinka.board.radxa.rock5 import *
 
 elif board_id == ap_board.ROCK_PI_5:
     from adafruit_blinka.board.radxa.rock5 import *


@@ -280,6 +318,9 @@ elif board_id == ap_board.LUBANCAT1:
 elif board_id == ap_board.LUBANCAT2:
     from adafruit_blinka.board.lubancat.lubancat2 import *
 
 elif board_id == ap_board.LUBANCAT2:
     from adafruit_blinka.board.lubancat.lubancat2 import *
 

+elif board_id == ap_board.LUBANCAT4:
+    from adafruit_blinka.board.lubancat.lubancat4 import *
+

 elif board_id == ap_board.NANOPI_NEO_AIR:
     from adafruit_blinka.board.nanopi.neoair import *
 
 elif board_id == ap_board.NANOPI_NEO_AIR:
     from adafruit_blinka.board.nanopi.neoair import *
 


@@ -295,6 +336,15 @@ elif board_id == ap_board.PICO_U2IF:
 elif board_id == ap_board.FEATHER_U2IF:
     from adafruit_blinka.board.feather_u2if import *
 
 elif board_id == ap_board.FEATHER_U2IF:
     from adafruit_blinka.board.feather_u2if import *
 

+elif board_id == ap_board.FEATHER_CAN_U2IF:
+    from adafruit_blinka.board.feather_can_u2if import *
+
+elif board_id == ap_board.FEATHER_EPD_U2IF:
+    from adafruit_blinka.board.feather_epd_u2if import *
+
+elif board_id == ap_board.FEATHER_RFM_U2IF:
+    from adafruit_blinka.board.feather_rfm_u2if import *
+

 elif board_id == ap_board.QTPY_U2IF:
     from adafruit_blinka.board.qtpy_u2if import *
 
 elif board_id == ap_board.QTPY_U2IF:
     from adafruit_blinka.board.qtpy_u2if import *
 


@@ -307,6 +357,9 @@ elif board_id == ap_board.MACROPAD_U2IF:
 elif board_id == ap_board.QT2040_TRINKEY_U2IF:
     from adafruit_blinka.board.qt2040_trinkey_u2if import *
 
 elif board_id == ap_board.QT2040_TRINKEY_U2IF:
     from adafruit_blinka.board.qt2040_trinkey_u2if import *
 

+elif board_id == ap_board.KB2040_U2IF:
+    from adafruit_blinka.board.kb2040_u2if import *
+

 elif board_id == ap_board.LICHEE_RV:
     from adafruit_blinka.board.lichee_rv import *
 
 elif board_id == ap_board.LICHEE_RV:
     from adafruit_blinka.board.lichee_rv import *
 


@@ -322,9 +375,27 @@ 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.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.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 board_id == ap_board.WALNUT_PI_1B:
+    from adafruit_blinka.board.walnutpi.walnutpi1b import *
+
+elif board_id == ap_board.OS_AGNOSTIC_BOARD:
+    from adafruit_blinka.board.generic_agnostic_board import *
+

 elif "sphinx" in sys.modules:
     pass
 
 elif "sphinx" in sys.modules:
     pass
 


@@ -334,15 +405,20 @@ elif board_id is None:
 
     package = str(pkg_resources.get_distribution("adafruit_platformdetect")).split()
     raise NotImplementedError(
 
     package = str(pkg_resources.get_distribution("adafruit_platformdetect")).split()
     raise NotImplementedError(

-        "{1} version {2} was unable to identify the board and/or microcontroller running "
-        "the {0} platform. Please be sure you have the latest packages running: 'pip3 install "
-        "--upgrade adafruit-blinka adafruit-platformdetect'".format(
-            platform.system(), package[0], package[1]
-        )
+        f"""
+        {package[0]} version {package[1]} was unable to identify the board and/or
+        microcontroller running the {platform.system()} platform. Please be sure you
+        have the latest packages by running:
+        'pip3 install --upgrade adafruit-blinka adafruit-platformdetect'
+
+        If you are running the latest package, your board may not yet be supported. Please
+        open a New Issue on GitHub at https://github.com/adafruit/Adafruit_Blinka/issues and
+        select New Board Request.
+        """

     )
 
 else:
     )
 
 else:

-    raise NotImplementedError("Board not supported {}".format(board_id))
+    raise NotImplementedError(f"Board not supported {board_id}.")

 
 if "SCL" in locals() and "SDA" in locals():
 
 
 if "SCL" in locals() and "SDA" in locals():