From b5595e870d9b580110c64e221de9bcda4e9a2e9d Mon Sep 17 00:00:00 2001 From: Olivier Date: Sun, 21 May 2017 22:22:01 +0200 Subject: [PATCH] Teensy3: Define default radio pins (#857) --- drivers/RF24/RF24.h | 4 +++- drivers/RFM69/new/RFM69_new.cpp | 2 -- drivers/RFM69/new/RFM69_new.h | 5 ++++- drivers/RFM69/old/RFM69_old.h | 5 ++++- drivers/RFM95/RFM95.h | 5 ++++- hal/architecture/MyHwTeensy3.h | 8 ++++++++ 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/RF24/RF24.h b/drivers/RF24/RF24.h index 7176c37..5266de3 100644 --- a/drivers/RF24/RF24.h +++ b/drivers/RF24/RF24.h @@ -1,4 +1,4 @@ -/* +/* * The MySensors Arduino library handles the wireless radio link and protocol * between your home built sensors/actuators and HA controller of choice. * The sensors forms a self healing radio network with optional repeaters. Each @@ -75,6 +75,8 @@ //#define DEFAULT_RF24_CS_PIN (24) //!< DEFAULT_RF24_CS_PIN #elif defined(ARDUINO_ARCH_STM32F1) #define DEFAULT_RF24_CE_PIN (PB0) //!< DEFAULT_RF24_CE_PIN +#elif defined(TEENSYDUINO) +#define DEFAULT_RF24_CE_PIN (9) //!< DEFAULT_RF24_CE_PIN #else #define DEFAULT_RF24_CE_PIN (9) //!< DEFAULT_RF24_CE_PIN #endif diff --git a/drivers/RFM69/new/RFM69_new.cpp b/drivers/RFM69/new/RFM69_new.cpp index be30cc5..0ba82a1 100644 --- a/drivers/RFM69/new/RFM69_new.cpp +++ b/drivers/RFM69/new/RFM69_new.cpp @@ -273,10 +273,8 @@ LOCAL void RFM69_interruptHandler(void) if (regIrqFlags2 & RFM69_IRQFLAGS2_FIFOLEVEL) { RFM69_prepareSPITransaction(); RFM69_csn(LOW); - #ifdef LINUX_SPI_BCM char data[RFM69_MAX_PACKET_LEN + 1]; // max packet len + 1 byte for the command - data[0] = RFM69_REG_FIFO & RFM69_READ_REGISTER; SPI.transfern(data, 3); diff --git a/drivers/RFM69/new/RFM69_new.h b/drivers/RFM69/new/RFM69_new.h index 2d9ed39..5118b93 100644 --- a/drivers/RFM69/new/RFM69_new.h +++ b/drivers/RFM69/new/RFM69_new.h @@ -1,4 +1,4 @@ -/* +/* * The MySensors Arduino library handles the wireless radio link and protocol * between your home built sensors/actuators and HA controller of choice. * The sensors forms a self healing radio network with optional repeaters. Each @@ -87,6 +87,9 @@ #elif defined(ARDUINO_ARCH_STM32F1) #define DEFAULT_RFM69_IRQ_PIN (PA3) //!< DEFAULT_RFM69_IRQ_PIN #define DEFAULT_RFM69_IRQ_NUM DEFAULT_RFM69_IRQ_PIN //!< DEFAULT_RFM69_IRQ_NUM +#elif defined(TEENSYDUINO) +#define DEFAULT_RFM69_IRQ_PIN (8) //!< DEFAULT_RFM69_IRQ_PIN +#define DEFAULT_RFM69_IRQ_NUM digitalPinToInterrupt(DEFAULT_RFM69_IRQ_PIN) //!< DEFAULT_RFM69_IRQ_NUM #else #define DEFAULT_RFM69_IRQ_PIN (2) //!< DEFAULT_RFM69_IRQ_PIN #define DEFAULT_RFM69_IRQ_NUM (2) //!< DEFAULT_RFM69_IRQ_NUM diff --git a/drivers/RFM69/old/RFM69_old.h b/drivers/RFM69/old/RFM69_old.h index ec07942..3129b65 100644 --- a/drivers/RFM69/old/RFM69_old.h +++ b/drivers/RFM69/old/RFM69_old.h @@ -1,4 +1,4 @@ -// ********************************************************************************** +// ********************************************************************************** // Driver definition for HopeRF RFM69W/RFM69HW/RFM69CW/RFM69HCW, Semtech SX1231/1231H // ********************************************************************************** // Copyright Felix Rusu (2014), felix@lowpowerlab.com @@ -56,6 +56,9 @@ #elif defined(ARDUINO_ARCH_STM32F1) #define DEFAULT_RFM69_IRQ_PIN (PA3) //!< DEFAULT_RFM69_IRQ_PIN #define DEFAULT_RFM69_IRQ_NUM DEFAULT_RFM69_IRQ_PIN //!< DEFAULT_RFM69_IRQ_NUM +#elif defined(TEENSYDUINO) +#define DEFAULT_RFM69_IRQ_PIN (8) //!< DEFAULT_RFM69_IRQ_PIN +#define DEFAULT_RFM69_IRQ_NUM digitalPinToInterrupt(DEFAULT_RFM69_IRQ_PIN) //!< DEFAULT_RFM69_IRQ_NUM #else #define DEFAULT_RFM69_IRQ_PIN (2) //!< DEFAULT_RFM69_IRQ_PIN #define DEFAULT_RFM69_IRQ_NUM (2) //!< DEFAULT_RFM69_IRQ_NUM diff --git a/drivers/RFM95/RFM95.h b/drivers/RFM95/RFM95.h index beab51b..7b6e43a 100644 --- a/drivers/RFM95/RFM95.h +++ b/drivers/RFM95/RFM95.h @@ -1,4 +1,4 @@ -/* +/* * The MySensors Arduino library handles the wireless radio link and protocol * between your home built sensors/actuators and HA controller of choice. * The sensors forms a self healing radio network with optional repeaters. Each @@ -100,6 +100,9 @@ #elif defined(ARDUINO_ARCH_STM32F1) #define DEFAULT_RFM95_IRQ_PIN (PA3) //!< DEFAULT_RFM95_IRQ_PIN #define DEFAULT_RFM95_IRQ_NUM DEFAULT_RFM95_IRQ_PIN //!< DEFAULT_RFM95_IRQ_NUM +#elif defined(TEENSYDUINO) +#define DEFAULT_RFM95_IRQ_PIN (8) //!< DEFAULT_RFM95_IRQ_PIN +#define DEFAULT_RFM95_IRQ_NUM digitalPinToInterrupt(DEFAULT_RFM95_IRQ_PIN) //!< DEFAULT_RFM95_IRQ_NUM #else #define DEFAULT_RFM95_IRQ_PIN (2) //!< DEFAULT_RFM95_IRQ_PIN #define DEFAULT_RFM95_IRQ_NUM DEFAULT_RFM95_IRQ_PIN //!< DEFAULT_RFM95_IRQ_NUM diff --git a/hal/architecture/MyHwTeensy3.h b/hal/architecture/MyHwTeensy3.h index 59e31b7..c8bd02f 100644 --- a/hal/architecture/MyHwTeensy3.h +++ b/hal/architecture/MyHwTeensy3.h @@ -15,6 +15,14 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. +* +* Radio wiring Teensy3.x: RF24, RFM69, RFM95: +* MISO 12 +* MOSI 11 +* SCK 13 +* CSN 10 +* CE 9 (RF24) +* IRQ 8 (opt. RF24, RFM69, RFM95) */ #ifndef MyHwTeensy3_h