Add legacy config support

pull/12951/head
Marcelo Salazar 2020-05-13 20:15:56 +01:00
parent 149656447d
commit 307cc61b8c
2 changed files with 67 additions and 35 deletions

View File

@ -1423,10 +1423,10 @@ static bool rf_rx_filter(uint8_t *mac_header, uint8_t *mac_64bit_addr, uint8_t *
#if MBED_CONF_S2LP_PROVIDE_DEFAULT #if MBED_CONF_S2LP_PROVIDE_DEFAULT
NanostackRfPhy &NanostackRfPhy::get_default_instance() NanostackRfPhy &NanostackRfPhy::get_default_instance()
{ {
static NanostackRfPhys2lp rf_phy(MBED_CONF_S2LP_SPI_SDI, MBED_CONF_S2LP_SPI_SDO, MBED_CONF_S2LP_SPI_SCLK, MBED_CONF_S2LP_SPI_CS, MBED_CONF_S2LP_SPI_SDN static NanostackRfPhys2lp rf_phy(S2LP_SPI_SDI, S2LP_SPI_SDO, S2LP_SPI_SCLK, S2LP_SPI_CS, S2LP_SPI_SDN
, MBED_CONF_S2LP_SPI_GPIO0, MBED_CONF_S2LP_SPI_GPIO1, MBED_CONF_S2LP_SPI_GPIO2, MBED_CONF_S2LP_SPI_GPIO3 , S2LP_SPI_GPIO0, S2LP_SPI_GPIO1, S2LP_SPI_GPIO2, S2LP_SPI_GPIO3
#ifdef AT24MAC #ifdef AT24MAC
, MBED_CONF_S2LP_I2C_SDA, MBED_CONF_S2LP_I2C_SCL , S2LP_I2C_SDA, S2LP_I2C_SCL
#endif //AT24MAC #endif //AT24MAC
); );
return rf_phy; return rf_phy;

View File

@ -25,68 +25,100 @@
#include "InterruptIn.h" #include "InterruptIn.h"
#include "SPI.h" #include "SPI.h"
#if !defined(MBED_CONF_S2LP_SPI_SDI) #if defined(MBED_CONF_S2LP_SPI_SDI)
#define MBED_CONF_S2LP_SPI_SDI D11 #define S2LP_SPI_SDI MBED_CONF_S2LP_SPI_SDI
#else
#define S2LP_SPI_SDI D11
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_SDO) #if defined(MBED_CONF_S2LP_SPI_SDO)
#define MBED_CONF_S2LP_SPI_SDO D12 #define S2LP_SPI_SDO MBED_CONF_S2LP_SPI_SDO
#else
#define S2LP_SPI_SDO D12
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_SCLK) #if defined(MBED_CONF_S2LP_SPI_SCLK)
#define MBED_CONF_S2LP_SPI_SCLK D13 #define S2LP_SPI_SCLK MBED_CONF_S2LP_SPI_SCLK
#else
#define S2LP_SPI_SCLK D13
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_CS) #if defined(MBED_CONF_S2LP_SPI_CS)
#define MBED_CONF_S2LP_SPI_CS A1 #define S2LP_SPI_CS MBED_CONF_S2LP_SPI_CS
#else
#define S2LP_SPI_CS A1
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_SDN) #if defined(MBED_CONF_S2LP_SPI_SDN)
#define MBED_CONF_S2LP_SPI_SDN D7 #define S2LP_SPI_SDN MBED_CONF_S2LP_SPI_SDN
#else
#define S2LP_SPI_SDN D7
#endif #endif
#if !defined(MBED_CONF_S2LP_TEST_PIN_TX) #if defined(MBED_CONF_S2LP_TEST_PIN_TX)
#define MBED_CONF_S2LP_TEST_PIN_TX D6 #define S2LP_TEST_PIN_TX MBED_CONF_S2LP_TEST_PIN_TX
#else
#define S2LP_TEST_PIN_TX D6
#endif #endif
#if !defined(MBED_CONF_S2LP_TEST_PIN_RX) #if defined(MBED_CONF_S2LP_TEST_PIN_RX)
#define MBED_CONF_S2LP_TEST_PIN_RX D5 #define S2LP_TEST_PIN_RX MBED_CONF_S2LP_TEST_PIN_RX
#else
#define S2LP_TEST_PIN_RX D5
#endif #endif
#if !defined(TMBED_CONF_S2LP_TEST_PIN_CSMA) #if defined(TMBED_CONF_S2LP_TEST_PIN_CSMA)
#define MBED_CONF_S2LP_TEST_PIN_CSMA D4 #define S2LP_TEST_PIN_CSMA TMBED_CONF_S2LP_TEST_PIN_CSMA
#else
#define S2LP_TEST_PIN_CSMA D4
#endif #endif
#if !defined(MBED_CONF_S2LP_TEST_PIN_SPARE_1) #if defined(MBED_CONF_S2LP_TEST_PIN_SPARE_1)
#define MBED_CONF_S2LP_TEST_PIN_SPARE_1 D2 #define S2LP_TEST_PIN_SPARE_1 MBED_CONF_S2LP_TEST_PIN_SPARE_1
#else
#define S2LP_TEST_PIN_SPARE_1 D2
#endif #endif
#if !defined(MBED_CONF_S2LP_TEST_PIN_SPARE_2) #if defined(MBED_CONF_S2LP_TEST_PIN_SPARE_2)
#define MBED_CONF_S2LP_TEST_PIN_SPARE_2 D8 #define S2LP_TEST_PIN_SPARE_2 DMBED_CONF_S2LP_TEST_PIN_SPARE_2
#else
#define S2LP_TEST_PIN_SPARE_2 D8
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_GPIO0) #if defined(MBED_CONF_S2LP_SPI_GPIO0)
#define MBED_CONF_S2LP_SPI_GPIO0 A0 #define S2LP_SPI_GPIO0 MBED_CONF_S2LP_SPI_GPIO0
#else
#define S2LP_SPI_GPIO0 A0
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_GPIO1) #if defined(MBED_CONF_S2LP_SPI_GPIO1)
#define MBED_CONF_S2LP_SPI_GPIO1 A2 #define S2LP_SPI_GPIO1 MBED_CONF_S2LP_SPI_GPIO1
#else
#define S2LP_SPI_GPIO1 A2
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_GPIO2) #if defined(MBED_CONF_S2LP_SPI_GPIO2)
#define MBED_CONF_S2LP_SPI_GPIO2 A3 #define S2LP_SPI_GPIO2 MBED_CONF_S2LP_SPI_GPIO2
#else
#define S2LP_SPI_GPIO2 A3
#endif #endif
#if !defined(MBED_CONF_S2LP_SPI_GPIO3) #if defined(MBED_CONF_S2LP_SPI_GPIO3)
#define MBED_CONF_S2LP_SPI_GPIO3 A5 #define S2LP_SPI_GPIO3 MBED_CONF_S2LP_SPI_GPIO3
#else
#define S2LP_SPI_GPIO3 A5
#endif #endif
#if !defined(MBED_CONF_S2LP_I2C_SDA) #if defined(MBED_CONF_S2LP_I2C_SDA)
#define MBED_CONF_S2LP_I2C_SDA null #define S2LP_I2C_SDA MBED_CONF_S2LP_I2C_SDA
#else
#define S2LP_I2C_SDA null
#endif #endif
#if !defined(MBED_CONF_S2LP_I2C_SCL) #if defined(MBED_CONF_S2LP_I2C_SCL)
#define MBED_CONF_S2LP_I2C_SCL null #define S2LP_I2C_SCL MBED_CONF_S2LP_I2C_SCL
#else
#define S2LP_I2C_SCL null
#endif #endif
#include "at24mac_s2lp.h" #include "at24mac_s2lp.h"