From: Melissa LeBlanc-Williams Date: Tue, 9 Mar 2021 18:19:34 +0000 (-0800) Subject: Merge pull request #429 from thomoray/add-rockpi4c-support X-Git-Tag: 6.4.0 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/e74f14561a7a76f22a72cbe00e3bb8c5e7b0b964?hp=266dfb26b9909f7be05b10fa717560941994d95e Merge pull request #429 from thomoray/add-rockpi4c-support Add rockpi4c support --- diff --git a/src/adafruit_blinka/board/orangepi/orangepizeroplus2h5.py b/src/adafruit_blinka/board/orangepi/orangepizeroplus2h5.py index 4e4934b..c82b692 100644 --- a/src/adafruit_blinka/board/orangepi/orangepizeroplus2h5.py +++ b/src/adafruit_blinka/board/orangepi/orangepizeroplus2h5.py @@ -14,6 +14,7 @@ PA0 = pin.PA0 UART2_TX = pin.PA0 PA3 = pin.PA3 UART2_CTS = pin.PA3 +PD11 = pin.PD11 PD14 = pin.PD14 PL0 = pin.PL0 PL1 = pin.PL1 diff --git a/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py index 598b6fa..5ab66e8 100644 --- a/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py +++ b/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py @@ -42,6 +42,7 @@ SPI0_CS = PC3 PC4 = Pin((1, 68)) PC7 = Pin((1, 71)) +PD11 = Pin((1, 107)) PD14 = Pin((1, 110)) PG6 = Pin((1, 198)) diff --git a/src/busio.py b/src/busio.py index 45d8770..6749459 100755 --- a/src/busio.py +++ b/src/busio.py @@ -204,8 +204,13 @@ class SPI(Lockable): elif detector.board.any_beaglebone: from adafruit_blinka.microcontroller.am335x.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - elif detector.board.any_orange_pi and detector.chip.id == ap_chip.SUN8I: - from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin + elif detector.board.any_orange_pi: + if detector.chip.id == ap_chip.SUN8I: + from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin + elif detector.chip.id == ap_chip.H5: + from adafruit_blinka.microcontroller.allwinner.h5.pin import Pin + elif detector.chip.id == ap_chip.H616: + from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.any_nanopi and detector.chip.id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index ba99896..abd5a10 100755 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -1,10 +1,17 @@ """Microcontroller pins""" +import time + from adafruit_platformdetect.constants import chips as ap_chip from adafruit_blinka import Enum from adafruit_blinka.agnostic import board_id, chip_id +def delay_us(delay): + """Sleep for delay usecs.""" + time.sleep(delay / 1e6) + + class Pin(Enum): """Reference Pin object"""