Skip to content

Commit c3664d2

Browse files
jeromecoutantjeromecoutant
committed
LORA: update test
1 parent 80aa710 commit c3664d2

File tree

3 files changed

+79
-192
lines changed

3 files changed

+79
-192
lines changed

‎connectivity/lorawan/tests/TESTS/lorawan/loraradio/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The default mbed_app.json file provides configuration for some already supported
1212

1313
You can use the following command to run tests:
1414

15-
`mbed test -n mbed-os-tests-lorawan-loraradio -m TARGET -t GCC_ARM --app-config mbed-os/TESTS/lorawan/loraradio/template_mbed_app.txt`
15+
`mbed test -n connectivity-lorawan-tests-tests-lorawan-loraradio -m TARGET -t GCC_ARM -v --app-config connectivity/lorawan/tests/TESTS/lorawan/loraradio/template_mbed_app.txt
16+
`
1617

1718
Replace TARGET with the target device.

‎connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp

Lines changed: 17 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,18 @@
3333
#define SX1272 0xFF
3434
#define SX1276 0xEE
3535

36-
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
36+
#ifndef MBED_CONF_LORA_RADIO
37+
#error [NOT_SUPPORTED] Lora radio is not set
38+
#else
39+
40+
#if (MBED_CONF_LORA_RADIO == SX1272)
3741
#include "SX1272_LoRaRadio.h"
38-
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
42+
#elif (MBED_CONF_LORA_RADIO == SX1276)
3943
#include "SX1276_LoRaRadio.h"
4044
#else
41-
#error [NOT_SUPPORTED] Requires parameters from application config file.
45+
#error Lora radio is not configured
4246
#endif
4347

44-
#if (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
45-
4648
using namespace utest::v1;
4749
using namespace mbed;
4850

@@ -203,50 +205,12 @@ utest::v1::status_t test_setup(const size_t number_of_cases)
203205

204206
utest::v1::status_t case_setup_handler(const Case *const source, const size_t index_of_case)
205207
{
206-
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
207-
208-
radio = new SX1272_LoRaRadio(MBED_CONF_APP_LORA_SPI_MOSI,
209-
MBED_CONF_APP_LORA_SPI_MISO,
210-
MBED_CONF_APP_LORA_SPI_SCLK,
211-
MBED_CONF_APP_LORA_CS,
212-
MBED_CONF_APP_LORA_RESET,
213-
MBED_CONF_APP_LORA_DIO0,
214-
MBED_CONF_APP_LORA_DIO1,
215-
MBED_CONF_APP_LORA_DIO2,
216-
MBED_CONF_APP_LORA_DIO3,
217-
MBED_CONF_APP_LORA_DIO4,
218-
MBED_CONF_APP_LORA_DIO5,
219-
MBED_CONF_APP_LORA_RF_SWITCH_CTL1,
220-
MBED_CONF_APP_LORA_RF_SWITCH_CTL2,
221-
MBED_CONF_APP_LORA_TXCTL,
222-
MBED_CONF_APP_LORA_RXCTL,
223-
MBED_CONF_APP_LORA_ANT_SWITCH,
224-
MBED_CONF_APP_LORA_PWR_AMP_CTL,
225-
MBED_CONF_APP_LORA_TCXO);
226-
227-
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
228-
229-
radio = new SX1276_LoRaRadio(MBED_CONF_APP_LORA_SPI_MOSI,
230-
MBED_CONF_APP_LORA_SPI_MISO,
231-
MBED_CONF_APP_LORA_SPI_SCLK,
232-
MBED_CONF_APP_LORA_CS,
233-
MBED_CONF_APP_LORA_RESET,
234-
MBED_CONF_APP_LORA_DIO0,
235-
MBED_CONF_APP_LORA_DIO1,
236-
MBED_CONF_APP_LORA_DIO2,
237-
MBED_CONF_APP_LORA_DIO3,
238-
MBED_CONF_APP_LORA_DIO4,
239-
MBED_CONF_APP_LORA_DIO5,
240-
MBED_CONF_APP_LORA_RF_SWITCH_CTL1,
241-
MBED_CONF_APP_LORA_RF_SWITCH_CTL2,
242-
MBED_CONF_APP_LORA_TXCTL,
243-
MBED_CONF_APP_LORA_RXCTL,
244-
MBED_CONF_APP_LORA_ANT_SWITCH,
245-
MBED_CONF_APP_LORA_PWR_AMP_CTL,
246-
MBED_CONF_APP_LORA_TCXO);
208+
#if (MBED_CONF_LORA_RADIO == SX1272)
209+
radio = new SX1272_LoRaRadio();
210+
211+
#elif (MBED_CONF_LORA_RADIO == SX1276)
212+
radio = new SX1276_LoRaRadio();
247213

248-
#else
249-
#error [NOT_SUPPORTED] Unknown LoRa radio specified (SX1272,SX1276 are valid)
250214
#endif
251215

252216
TEST_ASSERT(radio);
@@ -260,12 +224,12 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t
260224
{
261225
radio->sleep();
262226

263-
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
227+
#if (MBED_CONF_LORA_RADIO == SX1272)
264228
delete static_cast<SX1272_LoRaRadio *>(radio);
265-
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
229+
230+
#elif (MBED_CONF_LORA_RADIO == SX1276)
266231
delete static_cast<SX1276_LoRaRadio *>(radio);
267-
#else
268-
#error [NOT_SUPPORTED] Unknown LoRa radio specified (SX1272,SX1276 are valid)
232+
269233
#endif
270234
radio = NULL;
271235

@@ -288,5 +252,5 @@ int main()
288252
return !Harness::run(specification);
289253
}
290254

291-
#endif // (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
255+
#endif // (MBED_CONF_LORA_RADIO)
292256
#endif // !defined(MBED_CONF_RTOS_PRESENT)

‎connectivity/lorawan/tests/TESTS/lorawan/loraradio/template_mbed_app.txt

Lines changed: 60 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,82 @@
11
{
2-
"config": {
3-
"lora-radio": {
4-
"help": "Which radio to use (options: SX1272,SX1276)",
5-
"value": "SX1276"
6-
},
7-
8-
"lora-spi-mosi": { "value": "NC" },
9-
"lora-spi-miso": { "value": "NC" },
10-
"lora-spi-sclk": { "value": "NC" },
11-
"lora-cs": { "value": "NC" },
12-
"lora-reset": { "value": "NC" },
13-
"lora-dio0": { "value": "NC" },
14-
"lora-dio1": { "value": "NC" },
15-
"lora-dio2": { "value": "NC" },
16-
"lora-dio3": { "value": "NC" },
17-
"lora-dio4": { "value": "NC" },
18-
"lora-dio5": { "value": "NC" },
19-
"lora-rf-switch-ctl1": { "value": "NC" },
20-
"lora-rf-switch-ctl2": { "value": "NC" },
21-
"lora-txctl": { "value": "NC" },
22-
"lora-rxctl": { "value": "NC" },
23-
"lora-ant-switch": { "value": "NC" },
24-
"lora-pwr-amp-ctl": { "value": "NC" },
25-
"lora-tcxo": { "value": "NC" }
26-
},
272
"target_overrides": {
283

294
"K64F": {
30-
"lora-spi-mosi": "D11",
31-
"lora-spi-miso": "D12",
32-
"lora-spi-sclk": "D13",
33-
"lora-cs": "D10",
34-
"lora-reset": "A0",
35-
"lora-dio0": "D2",
36-
"lora-dio1": "D3",
37-
"lora-dio2": "D4",
38-
"lora-dio3": "D5",
39-
"lora-dio4": "D8",
40-
"lora-dio5": "D9",
41-
"lora-rf-switch-ctl1": "NC",
42-
"lora-rf-switch-ctl2": "NC",
43-
"lora-txctl": "NC",
44-
"lora-rxctl": "NC",
45-
"lora-ant-switch": "A4",
46-
"lora-pwr-amp-ctl": "NC",
47-
"lora-tcxo": "NC"
5+
"target.components_add": ["SX1276"],
6+
"sx1276-lora-driver.spi-mosi": "D11",
7+
"sx1276-lora-driver.spi-miso": "D12",
8+
"sx1276-lora-driver.spi-sclk": "D13",
9+
"sx1276-lora-driver.spi-cs": "D10",
10+
"sx1276-lora-driver.reset": "A0",
11+
"sx1276-lora-driver.dio0": "D2",
12+
"sx1276-lora-driver.dio1": "D3",
13+
"sx1276-lora-driver.dio2": "D4",
14+
"sx1276-lora-driver.dio3": "D5",
15+
"sx1276-lora-driver.dio4": "D8",
16+
"sx1276-lora-driver.dio5": "D9",
17+
"sx1276-lora-driver.ant-switch": "A4"
4818
},
4919

5020
"DISCO_L072CZ_LRWAN1": {
51-
"lora-radio": "SX1276",
52-
"lora-spi-mosi": "PA_7",
53-
"lora-spi-miso": "PA_6",
54-
"lora-spi-sclk": "PB_3",
55-
"lora-cs": "PA_15",
56-
"lora-reset": "PC_0",
57-
"lora-dio0": "PB_4",
58-
"lora-dio1": "PB_1",
59-
"lora-dio2": "PB_0",
60-
"lora-dio3": "PC_13",
61-
"lora-dio4": "NC",
62-
"lora-dio5": "NC",
63-
"lora-rf-switch-ctl1": "NC",
64-
"lora-rf-switch-ctl2": "NC",
65-
"lora-txctl": "PC_2",
66-
"lora-rxctl": "PA_1",
67-
"lora-ant-switch": "NC",
68-
"lora-pwr-amp-ctl": "PC_1",
69-
"lora-tcxo": "PA_12"
7021
},
7122

7223
"XDOT_L151CC": {
73-
"lora-radio": "SX1272",
74-
"lora-spi-mosi": "LORA_MOSI",
75-
"lora-spi-miso": "LORA_MISO",
76-
"lora-spi-sclk": "LORA_SCK",
77-
"lora-cs": "LORA_NSS",
78-
"lora-reset": "LORA_RESET",
79-
"lora-dio0": "LORA_DIO0",
80-
"lora-dio1": "LORA_DIO1",
81-
"lora-dio2": "LORA_DIO2",
82-
"lora-dio3": "LORA_DIO3",
83-
"lora-dio4": "LORA_DIO4",
84-
"lora-dio5": "NC",
85-
"lora-rf-switch-ctl1": "NC",
86-
"lora-rf-switch-ctl2": "NC",
87-
"lora-txctl": "NC",
88-
"lora-rxctl": "NC",
89-
"lora-ant-switch": "NC",
90-
"lora-pwr-amp-ctl": "NC",
91-
"lora-tcxo": "NC"
24+
"target.components_add": ["SX1272"],
25+
"sx1272-lora-driver.spi-mosi": "LORA_MOSI",
26+
"sx1272-lora-driver.spi-miso": "LORA_MISO",
27+
"sx1272-lora-driver.spi-sclk": "LORA_SCK",
28+
"sx1272-lora-driver.spi-cs": "LORA_NSS",
29+
"sx1272-lora-driver.reset": "LORA_RESET",
30+
"sx1272-lora-driver.dio0": "LORA_DIO0",
31+
"sx1272-lora-driver.dio1": "LORA_DIO1",
32+
"sx1272-lora-driver.dio2": "LORA_DIO2",
33+
"sx1272-lora-driver.dio3": "LORA_DIO3",
34+
"sx1272-lora-driver.dio4": "LORA_DIO4"
9235
},
9336

9437
"LTEK_FF1705": {
95-
"lora-radio": "SX1272",
96-
"lora-spi-mosi": "LORA_MOSI",
97-
"lora-spi-miso": "LORA_MISO",
98-
"lora-spi-sclk": "LORA_SCK",
99-
"lora-cs": "LORA_NSS",
100-
"lora-reset": "LORA_RESET",
101-
"lora-dio0": "LORA_DIO0",
102-
"lora-dio1": "LORA_DIO1",
103-
"lora-dio2": "LORA_DIO2",
104-
"lora-dio3": "LORA_DIO3",
105-
"lora-dio4": "LORA_DIO4",
106-
"lora-dio5": "NC",
107-
"lora-rf-switch-ctl1": "NC",
108-
"lora-rf-switch-ctl2": "NC",
109-
"lora-txctl": "NC",
110-
"lora-rxctl": "NC",
111-
"lora-ant-switch": "NC",
112-
"lora-pwr-amp-ctl": "NC",
113-
"lora-tcxo": "NC"
38+
"target.components_add": ["SX1272"],
39+
"sx1272-lora-driver.spi-mosi": "LORA_MOSI",
40+
"sx1272-lora-driver.spi-miso": "LORA_MISO",
41+
"sx1272-lora-driver.spi-sclk": "LORA_SCK",
42+
"sx1272-lora-driver.spi-cs": "LORA_NSS",
43+
"sx1272-lora-driver.reset": "LORA_RESET",
44+
"sx1272-lora-driver.dio0": "LORA_DIO0",
45+
"sx1272-lora-driver.dio1": "LORA_DIO1",
46+
"sx1272-lora-driver.dio2": "LORA_DIO2",
47+
"sx1272-lora-driver.dio3": "LORA_DIO3",
48+
"sx1272-lora-driver.dio4": "LORA_DIO4"
11449
},
11550

11651
"MTS_MDOT_F411RE": {
117-
"lora-radio": "SX1272",
118-
"lora-spi-mosi": "LORA_MOSI",
119-
"lora-spi-miso": "LORA_MISO",
120-
"lora-spi-sclk": "LORA_SCK",
121-
"lora-cs": "LORA_NSS",
122-
"lora-reset": "LORA_RESET",
123-
"lora-dio0": "LORA_DIO0",
124-
"lora-dio1": "LORA_DIO1",
125-
"lora-dio2": "LORA_DIO2",
126-
"lora-dio3": "LORA_DIO3",
127-
"lora-dio4": "LORA_DIO4",
128-
"lora-dio5": "LORA_DIO5",
129-
"lora-rf-switch-ctl1": "NC",
130-
"lora-rf-switch-ctl2": "NC",
131-
"lora-txctl": "LORA_TXCTL",
132-
"lora-rxctl": "LORA_RXCTL",
133-
"lora-ant-switch": "NC",
134-
"lora-pwr-amp-ctl": "NC",
135-
"lora-tcxo": "NC"
52+
"target.components_add": ["SX1272"],
53+
"sx1272-lora-driver.spi-mosi": "LORA_MOSI",
54+
"sx1272-lora-driver.spi-miso": "LORA_MISO",
55+
"sx1272-lora-driver.spi-sclk": "LORA_SCK",
56+
"sx1272-lora-driver.spi-cs": "LORA_NSS",
57+
"sx1272-lora-driver.reset": "LORA_RESET",
58+
"sx1272-lora-driver.dio0": "LORA_DIO0",
59+
"sx1272-lora-driver.dio1": "LORA_DIO1",
60+
"sx1272-lora-driver.dio2": "LORA_DIO2",
61+
"sx1272-lora-driver.dio3": "LORA_DIO3",
62+
"sx1272-lora-driver.dio4": "LORA_DIO4",
63+
"sx1272-lora-driver.dio5": "LORA_DIO5"
13664
},
13765

13866
"ADV_WISE_1510": {
139-
"lora-radio": "SX1276",
140-
"lora-spi-mosi": "SPI_RF_MOSI",
141-
"lora-spi-miso": "SPI_RF_MISO",
142-
"lora-spi-sclk": "SPI_RF_SCK",
143-
"lora-cs": "SPI_RF_CS",
144-
"lora-reset": "SPI_RF_RESET",
145-
"lora-dio0": "DIO0",
146-
"lora-dio1": "DIO1",
147-
"lora-dio2": "DIO2",
148-
"lora-dio3": "DIO3",
149-
"lora-dio4": "DIO4",
150-
"lora-dio5": "DIO5",
151-
"lora-rf-switch-ctl1": "NC",
152-
"lora-rf-switch-ctl2": "NC",
153-
"lora-txctl": "NC",
154-
"lora-rxctl": "NC",
155-
"lora-ant-switch": "ANT_SWITCH",
156-
"lora-pwr-amp-ctl": "NC",
157-
"lora-tcxo": "NC"
67+
"target.components_add": ["SX1276"],
68+
"sx1276-lora-driver.spi-mosi": "SPI_RF_MOSI",
69+
"sx1276-lora-driver.spi-miso": "SPI_RF_MISO",
70+
"sx1276-lora-driver.spi-sclk": "SPI_RF_SCK",
71+
"sx1276-lora-driver.spi-cs": "SPI_RF_CS",
72+
"sx1276-lora-driver.reset": "SPI_RF_RESET",
73+
"sx1276-lora-driver.dio0": "DIO0",
74+
"sx1276-lora-driver.dio1": "DIO1",
75+
"sx1276-lora-driver.dio2": "DIO2",
76+
"sx1276-lora-driver.dio3": "DIO3",
77+
"sx1276-lora-driver.dio4": "DIO4",
78+
"sx1276-lora-driver.dio5": "DIO5",
79+
"sx1276-lora-driver.ant-switch": "ANT_SWITCH"
15880
}
15981
}
16082
}

0 commit comments

Comments
 (0)