Skip to content

Commit 307cc61

Browse files
author
Marcelo Salazar
committed
Add legacy config support
1 parent 1496564 commit 307cc61

File tree

2 files changed

+67
-35
lines changed

2 files changed

+67
-35
lines changed

components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,10 +1423,10 @@ static bool rf_rx_filter(uint8_t *mac_header, uint8_t *mac_64bit_addr, uint8_t *
14231423
#if MBED_CONF_S2LP_PROVIDE_DEFAULT
14241424
NanostackRfPhy &NanostackRfPhy::get_default_instance()
14251425
{
1426-
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
1427-
, MBED_CONF_S2LP_SPI_GPIO0, MBED_CONF_S2LP_SPI_GPIO1, MBED_CONF_S2LP_SPI_GPIO2, MBED_CONF_S2LP_SPI_GPIO3
1426+
static NanostackRfPhys2lp rf_phy(S2LP_SPI_SDI, S2LP_SPI_SDO, S2LP_SPI_SCLK, S2LP_SPI_CS, S2LP_SPI_SDN
1427+
, S2LP_SPI_GPIO0, S2LP_SPI_GPIO1, S2LP_SPI_GPIO2, S2LP_SPI_GPIO3
14281428
#ifdef AT24MAC
1429-
, MBED_CONF_S2LP_I2C_SDA, MBED_CONF_S2LP_I2C_SCL
1429+
, S2LP_I2C_SDA, S2LP_I2C_SCL
14301430
#endif //AT24MAC
14311431
);
14321432
return rf_phy;

components/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h

Lines changed: 64 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,68 +25,100 @@
2525
#include "InterruptIn.h"
2626
#include "SPI.h"
2727

28-
#if !defined(MBED_CONF_S2LP_SPI_SDI)
29-
#define MBED_CONF_S2LP_SPI_SDI D11
28+
#if defined(MBED_CONF_S2LP_SPI_SDI)
29+
#define S2LP_SPI_SDI MBED_CONF_S2LP_SPI_SDI
30+
#else
31+
#define S2LP_SPI_SDI D11
3032
#endif
3133

32-
#if !defined(MBED_CONF_S2LP_SPI_SDO)
33-
#define MBED_CONF_S2LP_SPI_SDO D12
34+
#if defined(MBED_CONF_S2LP_SPI_SDO)
35+
#define S2LP_SPI_SDO MBED_CONF_S2LP_SPI_SDO
36+
#else
37+
#define S2LP_SPI_SDO D12
3438
#endif
3539

36-
#if !defined(MBED_CONF_S2LP_SPI_SCLK)
37-
#define MBED_CONF_S2LP_SPI_SCLK D13
40+
#if defined(MBED_CONF_S2LP_SPI_SCLK)
41+
#define S2LP_SPI_SCLK MBED_CONF_S2LP_SPI_SCLK
42+
#else
43+
#define S2LP_SPI_SCLK D13
3844
#endif
3945

40-
#if !defined(MBED_CONF_S2LP_SPI_CS)
41-
#define MBED_CONF_S2LP_SPI_CS A1
46+
#if defined(MBED_CONF_S2LP_SPI_CS)
47+
#define S2LP_SPI_CS MBED_CONF_S2LP_SPI_CS
48+
#else
49+
#define S2LP_SPI_CS A1
4250
#endif
4351

44-
#if !defined(MBED_CONF_S2LP_SPI_SDN)
45-
#define MBED_CONF_S2LP_SPI_SDN D7
52+
#if defined(MBED_CONF_S2LP_SPI_SDN)
53+
#define S2LP_SPI_SDN MBED_CONF_S2LP_SPI_SDN
54+
#else
55+
#define S2LP_SPI_SDN D7
4656
#endif
4757

48-
#if !defined(MBED_CONF_S2LP_TEST_PIN_TX)
49-
#define MBED_CONF_S2LP_TEST_PIN_TX D6
58+
#if defined(MBED_CONF_S2LP_TEST_PIN_TX)
59+
#define S2LP_TEST_PIN_TX MBED_CONF_S2LP_TEST_PIN_TX
60+
#else
61+
#define S2LP_TEST_PIN_TX D6
5062
#endif
5163

52-
#if !defined(MBED_CONF_S2LP_TEST_PIN_RX)
53-
#define MBED_CONF_S2LP_TEST_PIN_RX D5
64+
#if defined(MBED_CONF_S2LP_TEST_PIN_RX)
65+
#define S2LP_TEST_PIN_RX MBED_CONF_S2LP_TEST_PIN_RX
66+
#else
67+
#define S2LP_TEST_PIN_RX D5
5468
#endif
5569

56-
#if !defined(TMBED_CONF_S2LP_TEST_PIN_CSMA)
57-
#define MBED_CONF_S2LP_TEST_PIN_CSMA D4
70+
#if defined(TMBED_CONF_S2LP_TEST_PIN_CSMA)
71+
#define S2LP_TEST_PIN_CSMA TMBED_CONF_S2LP_TEST_PIN_CSMA
72+
#else
73+
#define S2LP_TEST_PIN_CSMA D4
5874
#endif
5975

60-
#if !defined(MBED_CONF_S2LP_TEST_PIN_SPARE_1)
61-
#define MBED_CONF_S2LP_TEST_PIN_SPARE_1 D2
76+
#if defined(MBED_CONF_S2LP_TEST_PIN_SPARE_1)
77+
#define S2LP_TEST_PIN_SPARE_1 MBED_CONF_S2LP_TEST_PIN_SPARE_1
78+
#else
79+
#define S2LP_TEST_PIN_SPARE_1 D2
6280
#endif
6381

64-
#if !defined(MBED_CONF_S2LP_TEST_PIN_SPARE_2)
65-
#define MBED_CONF_S2LP_TEST_PIN_SPARE_2 D8
82+
#if defined(MBED_CONF_S2LP_TEST_PIN_SPARE_2)
83+
#define S2LP_TEST_PIN_SPARE_2 DMBED_CONF_S2LP_TEST_PIN_SPARE_2
84+
#else
85+
#define S2LP_TEST_PIN_SPARE_2 D8
6686
#endif
6787

68-
#if !defined(MBED_CONF_S2LP_SPI_GPIO0)
69-
#define MBED_CONF_S2LP_SPI_GPIO0 A0
88+
#if defined(MBED_CONF_S2LP_SPI_GPIO0)
89+
#define S2LP_SPI_GPIO0 MBED_CONF_S2LP_SPI_GPIO0
90+
#else
91+
#define S2LP_SPI_GPIO0 A0
7092
#endif
7193

72-
#if !defined(MBED_CONF_S2LP_SPI_GPIO1)
73-
#define MBED_CONF_S2LP_SPI_GPIO1 A2
94+
#if defined(MBED_CONF_S2LP_SPI_GPIO1)
95+
#define S2LP_SPI_GPIO1 MBED_CONF_S2LP_SPI_GPIO1
96+
#else
97+
#define S2LP_SPI_GPIO1 A2
7498
#endif
7599

76-
#if !defined(MBED_CONF_S2LP_SPI_GPIO2)
77-
#define MBED_CONF_S2LP_SPI_GPIO2 A3
100+
#if defined(MBED_CONF_S2LP_SPI_GPIO2)
101+
#define S2LP_SPI_GPIO2 MBED_CONF_S2LP_SPI_GPIO2
102+
#else
103+
#define S2LP_SPI_GPIO2 A3
78104
#endif
79105

80-
#if !defined(MBED_CONF_S2LP_SPI_GPIO3)
81-
#define MBED_CONF_S2LP_SPI_GPIO3 A5
106+
#if defined(MBED_CONF_S2LP_SPI_GPIO3)
107+
#define S2LP_SPI_GPIO3 MBED_CONF_S2LP_SPI_GPIO3
108+
#else
109+
#define S2LP_SPI_GPIO3 A5
82110
#endif
83111

84-
#if !defined(MBED_CONF_S2LP_I2C_SDA)
85-
#define MBED_CONF_S2LP_I2C_SDA null
112+
#if defined(MBED_CONF_S2LP_I2C_SDA)
113+
#define S2LP_I2C_SDA MBED_CONF_S2LP_I2C_SDA
114+
#else
115+
#define S2LP_I2C_SDA null
86116
#endif
87117

88-
#if !defined(MBED_CONF_S2LP_I2C_SCL)
89-
#define MBED_CONF_S2LP_I2C_SCL null
118+
#if defined(MBED_CONF_S2LP_I2C_SCL)
119+
#define S2LP_I2C_SCL MBED_CONF_S2LP_I2C_SCL
120+
#else
121+
#define S2LP_I2C_SCL null
90122
#endif
91123

92124
#include "at24mac_s2lp.h"

0 commit comments

Comments
 (0)