Skip to content

Commit 82f3126

Browse files
0xc01700xc0170
authored
Merge pull request #14049 from jeromecoutant/PR_L072_LORA
DISCO_L072CZ_LRWAN1: enable LORA by default
2 parents 830f82c + e0217ad commit 82f3126

File tree

10 files changed

+293
-228
lines changed

10 files changed

+293
-228
lines changed

‎connectivity/drivers/lora/COMPONENT_SX126X/mbed_lib.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "SX126X-lora-driver",
33
"config": {
4+
"radio": {
5+
"value": "SX126X",
6+
"macro_name" : "MBED_CONF_LORA_RADIO"
7+
},
48
"spi-frequency": {
59
"help": "SPI frequency, Default: 16 MHz",
610
"value": 16000000
@@ -24,6 +28,39 @@
2428
"standby-mode": {
2529
"help": "Default: STDBY_RC = 0, STDBY_XOSC = 1",
2630
"value": 0
31+
},
32+
"spi-mosi": {
33+
"value": "NC"
34+
},
35+
"spi-miso": {
36+
"value": "NC"
37+
},
38+
"spi-sclk": {
39+
"value": "NC"
40+
},
41+
"spi-cs": {
42+
"value": "NC"
43+
},
44+
"reset": {
45+
"value": "NC"
46+
},
47+
"dio1": {
48+
"value": "NC"
49+
},
50+
"busy": {
51+
"value": "NC"
52+
},
53+
"freq-select": {
54+
"value": "NC"
55+
},
56+
"device-select": {
57+
"value": "NC"
58+
},
59+
"crystal-select": {
60+
"value": "NC"
61+
},
62+
"ant-switch": {
63+
"value": "NC"
2764
}
2865
}
2966
}

‎connectivity/drivers/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,25 @@ class SX1272_LoRaRadio: public LoRaRadio {
6565
* The pins that are marked NC are optional. It is assumed that these
6666
* pins are not connected until/unless configured otherwise.
6767
*/
68-
SX1272_LoRaRadio(PinName mosi,
69-
PinName miso,
70-
PinName sclk,
71-
PinName nss,
72-
PinName reset,
73-
PinName dio0,
74-
PinName dio1,
75-
PinName dio2,
76-
PinName dio3,
77-
PinName dio4,
78-
PinName dio5,
79-
PinName rf_switch_ctl1 = NC,
80-
PinName rf_switch_ctl2 = NC,
81-
PinName txctl = NC,
82-
PinName rxctl = NC,
83-
PinName ant_switch = NC,
84-
PinName pwr_amp_ctl = NC,
85-
PinName tcxo = NC);
68+
SX1272_LoRaRadio(PinName mosi = MBED_CONF_SX1272_LORA_DRIVER_SPI_MOSI,
69+
PinName miso = MBED_CONF_SX1272_LORA_DRIVER_SPI_MISO,
70+
PinName sclk = MBED_CONF_SX1272_LORA_DRIVER_SPI_SCLK,
71+
PinName nss = MBED_CONF_SX1272_LORA_DRIVER_SPI_CS,
72+
PinName reset = MBED_CONF_SX1272_LORA_DRIVER_RESET,
73+
PinName dio0 = MBED_CONF_SX1272_LORA_DRIVER_DIO0,
74+
PinName dio1 = MBED_CONF_SX1272_LORA_DRIVER_DIO1,
75+
PinName dio2 = MBED_CONF_SX1272_LORA_DRIVER_DIO2,
76+
PinName dio3 = MBED_CONF_SX1272_LORA_DRIVER_DIO3,
77+
PinName dio4 = MBED_CONF_SX1272_LORA_DRIVER_DIO4,
78+
PinName dio5 = MBED_CONF_SX1272_LORA_DRIVER_DIO5,
79+
PinName rf_switch_ctl1 = MBED_CONF_SX1272_LORA_DRIVER_RF_SWITCH_CTL1,
80+
PinName rf_switch_ctl2 = MBED_CONF_SX1272_LORA_DRIVER_RF_SWITCH_CTL2,
81+
PinName txctl = MBED_CONF_SX1272_LORA_DRIVER_TXCTL,
82+
PinName rxctl = MBED_CONF_SX1272_LORA_DRIVER_RXCTL,
83+
PinName ant_switch = MBED_CONF_SX1272_LORA_DRIVER_ANT_SWITCH,
84+
PinName pwr_amp_ctl = MBED_CONF_SX1272_LORA_DRIVER_PWR_AMP_CTL,
85+
PinName tcxo = MBED_CONF_SX1272_LORA_DRIVER_TCXO
86+
);
8687

8788
/**
8889
* Destructor

‎connectivity/drivers/lora/COMPONENT_SX1272/mbed_lib.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "sx1272-lora-driver",
33
"config": {
4+
"radio": {
5+
"value": "SX1272",
6+
"macro_name" : "MBED_CONF_LORA_RADIO"
7+
},
48
"spi-frequency": {
59
"help": "SPI frequency, Default: 8 MHz",
610
"value": 8000000
@@ -12,6 +16,60 @@
1216
"radio-variant": {
1317
"help": "Use to set the radio variant if the antenna switch input is not connected.",
1418
"value": "SX1272UNDEFINED"
19+
},
20+
"spi-mosi": {
21+
"value": "NC"
22+
},
23+
"spi-miso": {
24+
"value": "NC"
25+
},
26+
"spi-sclk": {
27+
"value": "NC"
28+
},
29+
"spi-cs": {
30+
"value": "NC"
31+
},
32+
"reset": {
33+
"value": "NC"
34+
},
35+
"dio0": {
36+
"value": "NC"
37+
},
38+
"dio1": {
39+
"value": "NC"
40+
},
41+
"dio2": {
42+
"value": "NC"
43+
},
44+
"dio3": {
45+
"value": "NC"
46+
},
47+
"dio4": {
48+
"value": "NC"
49+
},
50+
"dio5": {
51+
"value": "NC"
52+
},
53+
"rf-switch-ctl1": {
54+
"value": "NC"
55+
},
56+
"rf-switch-ctl2": {
57+
"value": "NC"
58+
},
59+
"txctl": {
60+
"value": "NC"
61+
},
62+
"rxctl": {
63+
"value": "NC"
64+
},
65+
"ant-switch": {
66+
"value": "NC"
67+
},
68+
"pwr-amp-ctl": {
69+
"value": "NC"
70+
},
71+
"tcxo": {
72+
"value": "NC"
1573
}
1674
}
1775
}

‎connectivity/drivers/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,25 @@ class SX1276_LoRaRadio: public LoRaRadio {
8080
* setting SX1276 radio module gets connected to an external power amplifier
8181
* or radio latch controls are connected.
8282
*/
83-
SX1276_LoRaRadio(PinName mosi,
84-
PinName miso,
85-
PinName sclk,
86-
PinName nss,
87-
PinName reset,
88-
PinName dio0,
89-
PinName dio1,
90-
PinName dio2,
91-
PinName dio3,
92-
PinName dio4,
93-
PinName dio5,
94-
PinName rf_switch_ctl1 = NC,
95-
PinName rf_switch_ctl2 = NC,
96-
PinName txctl = NC,
97-
PinName rxctl = NC,
98-
PinName ant_switch = NC,
99-
PinName pwr_amp_ctl = NC,
100-
PinName tcxo = NC);
83+
SX1276_LoRaRadio(PinName mosi = MBED_CONF_SX1276_LORA_DRIVER_SPI_MOSI,
84+
PinName miso = MBED_CONF_SX1276_LORA_DRIVER_SPI_MISO,
85+
PinName sclk = MBED_CONF_SX1276_LORA_DRIVER_SPI_SCLK,
86+
PinName nss = MBED_CONF_SX1276_LORA_DRIVER_SPI_CS,
87+
PinName reset = MBED_CONF_SX1276_LORA_DRIVER_RESET,
88+
PinName dio0 = MBED_CONF_SX1276_LORA_DRIVER_DIO0,
89+
PinName dio1 = MBED_CONF_SX1276_LORA_DRIVER_DIO1,
90+
PinName dio2 = MBED_CONF_SX1276_LORA_DRIVER_DIO2,
91+
PinName dio3 = MBED_CONF_SX1276_LORA_DRIVER_DIO3,
92+
PinName dio4 = MBED_CONF_SX1276_LORA_DRIVER_DIO4,
93+
PinName dio5 = MBED_CONF_SX1276_LORA_DRIVER_DIO5,
94+
PinName rf_switch_ctl1 = MBED_CONF_SX1276_LORA_DRIVER_RF_SWITCH_CTL1,
95+
PinName rf_switch_ctl2 = MBED_CONF_SX1276_LORA_DRIVER_RF_SWITCH_CTL2,
96+
PinName txctl = MBED_CONF_SX1276_LORA_DRIVER_TXCTL,
97+
PinName rxctl = MBED_CONF_SX1276_LORA_DRIVER_RXCTL,
98+
PinName ant_switch = MBED_CONF_SX1276_LORA_DRIVER_ANT_SWITCH,
99+
PinName pwr_amp_ctl = MBED_CONF_SX1276_LORA_DRIVER_PWR_AMP_CTL,
100+
PinName tcxo = MBED_CONF_SX1276_LORA_DRIVER_TCXO
101+
);
101102

102103
/**
103104
* Destructor

‎connectivity/drivers/lora/COMPONENT_SX1276/mbed_lib.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "sx1276-lora-driver",
33
"config": {
4+
"radio": {
5+
"value": "SX1276",
6+
"macro_name" : "MBED_CONF_LORA_RADIO"
7+
},
48
"spi-frequency": {
59
"help": "SPI frequency, Default: 8 MHz",
610
"value": 8000000
@@ -12,6 +16,77 @@
1216
"radio-variant": {
1317
"help": "Use to set the radio variant if the antenna switch input is not connected.",
1418
"value": "SX1276UNDEFINED"
19+
},
20+
"spi-mosi": {
21+
"value": "NC"
22+
},
23+
"spi-miso": {
24+
"value": "NC"
25+
},
26+
"spi-sclk": {
27+
"value": "NC"
28+
},
29+
"spi-cs": {
30+
"value": "NC"
31+
},
32+
"reset": {
33+
"value": "NC"
34+
},
35+
"dio0": {
36+
"value": "NC"
37+
},
38+
"dio1": {
39+
"value": "NC"
40+
},
41+
"dio2": {
42+
"value": "NC"
43+
},
44+
"dio3": {
45+
"value": "NC"
46+
},
47+
"dio4": {
48+
"value": "NC"
49+
},
50+
"dio5": {
51+
"value": "NC"
52+
},
53+
"rf-switch-ctl1": {
54+
"value": "NC"
55+
},
56+
"rf-switch-ctl2": {
57+
"value": "NC"
58+
},
59+
"txctl": {
60+
"value": "NC"
61+
},
62+
"rxctl": {
63+
"value": "NC"
64+
},
65+
"ant-switch": {
66+
"value": "NC"
67+
},
68+
"pwr-amp-ctl": {
69+
"value": "NC"
70+
},
71+
"tcxo": {
72+
"value": "NC"
73+
}
74+
},
75+
"target_overrides": {
76+
"DISCO_L072CZ_LRWAN1": {
77+
"spi-mosi": "PA_7",
78+
"spi-miso": "PA_6",
79+
"spi-sclk": "PB_3",
80+
"spi-cs": "PA_15",
81+
"reset": "PC_0",
82+
"dio0": "PB_4",
83+
"dio1": "PB_1",
84+
"dio2": "PB_0",
85+
"dio3": "PC_13",
86+
"txctl": "PC_2",
87+
"rxctl": "PA_1",
88+
"pwr-amp-ctl": "PC_1",
89+
"tcxo": "PA_12"
1590
}
1691
}
1792
}

‎connectivity/lorawan/mbed_lib.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"help": "LoRa PHY region: EU868, AS923, AU915, CN470, CN779, EU433, IN865, KR920, US915",
66
"value": "EU868"
77
},
8+
"radio": {
9+
"help": "value set in radio driver : SX126X, SX1272, SX1276"
10+
},
811
"over-the-air-activation": {
912
"help": "When set to 1 the application uses the Over-the-Air activation procedure, default: true",
1013
"value": true

‎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.

0 commit comments

Comments
 (0)