From 14766382d35c38720a30ed315fd581e3cffb4cbc Mon Sep 17 00:00:00 2001 From: Marcelo Aquino Date: Tue, 16 May 2017 03:00:24 -0300 Subject: [PATCH] Linux: Default SPI driver set to SPIDEV (#847) --- MySensors.h | 4 ---- configure | 6 +++++- drivers/RFM69/new/RFM69_new.h | 2 +- drivers/RFM95/RFM95.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MySensors.h b/MySensors.h index e23ba02..c2cd2f1 100644 --- a/MySensors.h +++ b/MySensors.h @@ -334,10 +334,6 @@ MY_DEFAULT_RX_LED_PIN in your sketch instead to enable LEDs // Transport drivers #if defined(MY_RADIO_RF24) -#if defined(__linux__) && !(defined(LINUX_SPI_BCM) || defined(LINUX_SPI_SPIDEV)) -#error No support for nRF24 radio on this platform -#endif - #if defined(MY_RF24_ENABLE_ENCRYPTION) #include "drivers/AES/AES.cpp" #endif diff --git a/configure b/configure index f537ada..f112ec1 100755 --- a/configure +++ b/configure @@ -510,12 +510,16 @@ if [ -z "${SPI_DRIVER}" ]; then if [ -n "${SPI_DRIVER}" ]; then echo " [OK] SPI driver detected:${SPI_DRIVER}." else - echo " [WARNING] No supported SPI driver detected." + echo " [WARNING] No supported SPI driver detected. Using SPIDEV." + SPI_DRIVER=SPIDEV fi fi if [ -n "${SPI_DRIVER}" ]; then case ${SPI_DRIVER} in BCM) + if [[ $SOC != "BCM2835" && $SOC != "BCM2836" && $SOC != "BCM2837" ]]; then + die "BCM SPI driver is only supported for SOCs BCM2835, BCM2836 or BCM2837" 5 + fi CPPFLAGS="-DLINUX_SPI_BCM $CPPFLAGS" ;; SPIDEV) diff --git a/drivers/RFM69/new/RFM69_new.h b/drivers/RFM69/new/RFM69_new.h index 8ad14a2..2d9ed39 100644 --- a/drivers/RFM69/new/RFM69_new.h +++ b/drivers/RFM69/new/RFM69_new.h @@ -125,7 +125,7 @@ SoftSPI #else extern HardwareSPI SPI; //!< SPI diff --git a/drivers/RFM95/RFM95.h b/drivers/RFM95/RFM95.h index 951212e..beab51b 100644 --- a/drivers/RFM95/RFM95.h +++ b/drivers/RFM95/RFM95.h @@ -120,7 +120,7 @@ _SPI; #define _SPI SPI //!< SPI #endif #else -#if defined(__arm__) +#if defined(__arm__) || defined(__linux__) #include #else extern HardwareSPI SPI; //!< SPI