Merge branch 'master' into genericdevice

This commit is contained in:
Limor "Ladyada" Fried 2025-01-08 10:13:44 -05:00 committed by GitHub
commit ff26e5a112
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions

View File

@ -58,6 +58,11 @@ typedef BitOrder BusIOBitOrder;
// typedef uint32_t BusIO_PortMask; // typedef uint32_t BusIO_PortMask;
//#define BUSIO_USE_FAST_PINIO //#define BUSIO_USE_FAST_PINIO
#elif defined(__MBED__) || defined(__ZEPHYR__)
// Boards based on RTOS cores like mbed or Zephyr are not going to expose the
// low level registers needed for fast pin manipulation
#undef BUSIO_USE_FAST_PINIO
#elif defined(ARDUINO_ARCH_XMC) #elif defined(ARDUINO_ARCH_XMC)
#undef BUSIO_USE_FAST_PINIO #undef BUSIO_USE_FAST_PINIO
@ -73,9 +78,8 @@ typedef uint32_t BusIO_PortMask;
#define BUSIO_USE_FAST_PINIO #define BUSIO_USE_FAST_PINIO
#elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) && \ #elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) && \
!defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) && \ !defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_SILABS) && \
!defined(ARDUINO_SILABS) && !defined(ARDUINO_UNOR4_MINIMA) && \ !defined(ARDUINO_UNOR4_MINIMA) && !defined(ARDUINO_UNOR4_WIFI)
!defined(ARDUINO_UNOR4_WIFI)
typedef volatile uint32_t BusIO_PortReg; typedef volatile uint32_t BusIO_PortReg;
typedef uint32_t BusIO_PortMask; typedef uint32_t BusIO_PortMask;
#if !defined(__ASR6501__) && !defined(__ASR6502__) #if !defined(__ASR6501__) && !defined(__ASR6502__)

View File

@ -6,6 +6,6 @@ cmake_minimum_required(VERSION 3.5)
idf_component_register(SRCS "Adafruit_I2CDevice.cpp" "Adafruit_BusIO_Register.cpp" "Adafruit_SPIDevice.cpp" idf_component_register(SRCS "Adafruit_I2CDevice.cpp" "Adafruit_BusIO_Register.cpp" "Adafruit_SPIDevice.cpp"
INCLUDE_DIRS "." INCLUDE_DIRS "."
REQUIRES arduino) REQUIRES arduino-esp32)
project(Adafruit_BusIO) project(Adafruit_BusIO)