Merge pull request #358 from nopnop2002/main

Added LUCKFOX_PICO/LUCKFOX_PICO_PLUS
adafruit · Jun 3, 2024 · 1ab27ec · 1ab27ec
2 parents 07f06c6 + 4c5a5da
commit 1ab27ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py
@@ -828,6 +828,10 @@ def _rv1103_id(self) -> Optional[str]:
         board = None
         if board_value and "Luckfox Pico Mini" in board_value:
             board = boards.LUCKFOX_PICO_MINI
+        elif board_value and "Luckfox Pico Plus" in board_value:
+            board = boards.LUCKFOX_PICO_PLUS
+        elif board_value and "Luckfox Pico" in board_value:
+            board = boards.LUCKFOX_PICO
         return board
 
     def _rv1106_id(self) -> Optional[str]:

diff --git a/adafruit_platformdetect/chip.py b/adafruit_platformdetect/chip.py
@@ -254,12 +254,12 @@ def _linux_id(self) -> Optional[str]:
         if self.detector.check_dt_compatible_value("rockchip,rk3588"):
             return chips.RK3588
 
-        if self.detector.check_dt_compatible_value("rockchip,rv1103"):
-            return chips.RV1103
-
         if self.detector.check_dt_compatible_value("rockchip,rv1106"):
             return chips.RV1106
 
+        if self.detector.check_dt_compatible_value("rockchip,rv1103"):
+            return chips.RV1103
+
         if self.detector.check_dt_compatible_value("amlogic,a311d"):
             return chips.A311D
 

diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py
@@ -231,8 +231,10 @@
 _KHADAS_40_PIN_IDS = (KHADAS_VIM3,)
 
 # Luckfox Pico boards
+LUCKFOX_PICO = "LUCKFOX_PICO"
 LUCKFOX_PICO_MAX = "LUCKFOX_PICO_MAX"
 LUCKFOX_PICO_MINI = "LUCKFOX_PICO_MINI"
+LUCKFOX_PICO_PLUS = "LUCKFOX_PICO_PLUS"
 
 # Asus Tinkerboard
 _ASUS_TINKER_BOARD_IDS = (
@@ -597,8 +599,10 @@
 
 # Luckfox
 _LUCKFOX_IDS = (
+    LUCKFOX_PICO,
     LUCKFOX_PICO_MAX,
     LUCKFOX_PICO_MINI,
+    LUCKFOX_PICO_PLUS,
 )
 
 # Agnostic board