From: Enrico <etrevismail@gmail.com>
Date: Mon, 30 Jan 2023 19:30:13 +0000 (+0100)
Subject: Merge branch 'adafruit:main' into main
X-Git-Tag: 8.14.0^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/58e7d9cd5ab5fd8191f3769a0539cc45a2e25e80?hp=-c

Merge branch 'adafruit:main' into main
---

58e7d9cd5ab5fd8191f3769a0539cc45a2e25e80
diff --combined src/board.py
index bd93eb5,4ff79e1..a1e800c
--- a/src/board.py
+++ b/src/board.py
@@@ -229,9 -229,6 +229,9 @@@ elif board_id == ap_board.ONION_OMEGA2
  elif board_id == ap_board.RADXA_CM3:
      from adafruit_blinka.board.radxa.radxacm3 import *
  
 +elif board_id == ap_board.ROCK_PI_3A:
 +    from adafruit_blinka.board.radxa.rockpi3a import *
 +
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
@@@ -310,9 -307,15 +310,15 @@@ elif board_id == ap_board.LICHEE_RV
  elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV:
      from adafruit_blinka.board.siemens.siemens_iot2050 import *
  
+ elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_BASIC:
+     from adafruit_blinka.board.siemens.siemens_iot2050 import *
+ 
  elif board_id == ap_board.AML_S905X_CC:
      from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
  
+ elif board_id == ap_board.GENERIC_LINUX_PC:
+     from adafruit_blinka.board.generic_linux_pc import *
+ 
  elif "sphinx" in sys.modules:
      pass