From: yeyeto2788 <juanernestobiondi@gmail.com>
Date: Mon, 20 Jan 2020 20:13:40 +0000 (+0100)
Subject: Merge https://github.com/adafruit/Adafruit_Blinka into module_refactor
X-Git-Tag: 3.6.0^2~6
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/cffea8ba1dea351fcd6fdd56461a059159a96740?hp=-c

Merge https://github.com/adafruit/Adafruit_Blinka into module_refactor
---

cffea8ba1dea351fcd6fdd56461a059159a96740
diff --combined src/board.py
index 41a2837,5f9ce33..3ead989
--- a/src/board.py
+++ b/src/board.py
@@@ -30,7 -30,7 +30,7 @@@ See `CircuitPython:board` in CircuitPyt
  import sys
  
  from adafruit_blinka.agnostic import board_id, detector
 -import adafruit_platformdetect.board as ap_board
 +import adafruit_platformdetect.constants.boards as ap_board
  
  # pylint: disable=wildcard-import,unused-wildcard-import,ungrouped-imports
  
@@@ -76,6 -76,18 +76,18 @@@ elif board_id == ap_board.ORANGE_PI_R1
  elif board_id == ap_board.ORANGE_PI_ZERO:
      from adafruit_blinka.board.orangepizero import *
  
+ elif board_id == ap_board.ORANGE_PI_ONE:
+     from adafruit_blinka.board.orangepipc import *
+ 
+ elif board_id == ap_board.ORANGE_PI_PC_PLUS:
+     from adafruit_blinka.board.orangepipc import *
+ 
+ elif board_id == ap_board.ORANGE_PI_LITE:
+     from adafruit_blinka.board.orangepipc import *
+ 
+ elif board_id == ap_board.ORANGE_PI_PLUS_2E:
+     from adafruit_blinka.board.orangepipc import *
+ 
  elif board_id == ap_board.GIANT_BOARD:
      from adafruit_blinka.board.giantboard import *
  
@@@ -115,9 -127,6 +127,9 @@@ elif board_id == ap_board.MICROCHIP_MCP
  elif board_id == ap_board.PINE64:
      from adafruit_blinka.board.pine64 import *
  
 +elif board_id == ap_board.ONION_OMEGA:
 +    from adafruit_blinka.board.onion_omega import *
 +
  elif "sphinx" in sys.modules:
      pass