Skip to content

Commit dcd7a09

Browse files
jeromecoutantpaul-szczepanek-arm
authored andcommitted
Lora component driver update
1 parent 0c6978d commit dcd7a09

File tree

2 files changed

+177
-298
lines changed

2 files changed

+177
-298
lines changed

lora_radio_helper.h

Lines changed: 50 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -20,65 +20,61 @@
2020

2121
#include "lorawan/LoRaRadio.h"
2222

23-
#define SX1272 0xFF
24-
#define SX1276 0xEE
25-
#define SX126X 0xDD
26-
27-
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
23+
#if COMPONENT_SX1272
2824
#include "SX1272_LoRaRadio.h"
29-
SX1272_LoRaRadio radio(MBED_CONF_APP_LORA_SPI_MOSI,
30-
MBED_CONF_APP_LORA_SPI_MISO,
31-
MBED_CONF_APP_LORA_SPI_SCLK,
32-
MBED_CONF_APP_LORA_CS,
33-
MBED_CONF_APP_LORA_RESET,
34-
MBED_CONF_APP_LORA_DIO0,
35-
MBED_CONF_APP_LORA_DIO1,
36-
MBED_CONF_APP_LORA_DIO2,
37-
MBED_CONF_APP_LORA_DIO3,
38-
MBED_CONF_APP_LORA_DIO4,
39-
MBED_CONF_APP_LORA_DIO5,
40-
MBED_CONF_APP_LORA_RF_SWITCH_CTL1,
41-
MBED_CONF_APP_LORA_RF_SWITCH_CTL2,
42-
MBED_CONF_APP_LORA_TXCTL,
43-
MBED_CONF_APP_LORA_RXCTL,
44-
MBED_CONF_APP_LORA_ANT_SWITCH,
45-
MBED_CONF_APP_LORA_PWR_AMP_CTL,
46-
MBED_CONF_APP_LORA_TCXO);
25+
SX1272_LoRaRadio radio(MBED_CONF_SX1272_LORA_DRIVER_SPI_MOSI,
26+
MBED_CONF_SX1272_LORA_DRIVER_SPI_MISO,
27+
MBED_CONF_SX1272_LORA_DRIVER_SPI_SCLK,
28+
MBED_CONF_SX1272_LORA_DRIVER_SPI_CS,
29+
MBED_CONF_SX1272_LORA_DRIVER_RESET,
30+
MBED_CONF_SX1272_LORA_DRIVER_DIO0,
31+
MBED_CONF_SX1272_LORA_DRIVER_DIO1,
32+
MBED_CONF_SX1272_LORA_DRIVER_DIO2,
33+
MBED_CONF_SX1272_LORA_DRIVER_DIO3,
34+
MBED_CONF_SX1272_LORA_DRIVER_DIO4,
35+
MBED_CONF_SX1272_LORA_DRIVER_DIO5,
36+
MBED_CONF_SX1272_LORA_DRIVER_RF_SWITCH_CTL1,
37+
MBED_CONF_SX1272_LORA_DRIVER_RF_SWITCH_CTL2,
38+
MBED_CONF_SX1272_LORA_DRIVER_TXCTL,
39+
MBED_CONF_SX1272_LORA_DRIVER_RXCTL,
40+
MBED_CONF_SX1272_LORA_DRIVER_ANT_SWITCH,
41+
MBED_CONF_SX1272_LORA_DRIVER_PWR_AMP_CTL,
42+
MBED_CONF_SX1272_LORA_DRIVER_TCXO);
4743

48-
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
44+
#elif COMPONENT_SX1276
4945
#include "SX1276_LoRaRadio.h"
50-
SX1276_LoRaRadio radio(MBED_CONF_APP_LORA_SPI_MOSI,
51-
MBED_CONF_APP_LORA_SPI_MISO,
52-
MBED_CONF_APP_LORA_SPI_SCLK,
53-
MBED_CONF_APP_LORA_CS,
54-
MBED_CONF_APP_LORA_RESET,
55-
MBED_CONF_APP_LORA_DIO0,
56-
MBED_CONF_APP_LORA_DIO1,
57-
MBED_CONF_APP_LORA_DIO2,
58-
MBED_CONF_APP_LORA_DIO3,
59-
MBED_CONF_APP_LORA_DIO4,
60-
MBED_CONF_APP_LORA_DIO5,
61-
MBED_CONF_APP_LORA_RF_SWITCH_CTL1,
62-
MBED_CONF_APP_LORA_RF_SWITCH_CTL2,
63-
MBED_CONF_APP_LORA_TXCTL,
64-
MBED_CONF_APP_LORA_RXCTL,
65-
MBED_CONF_APP_LORA_ANT_SWITCH,
66-
MBED_CONF_APP_LORA_PWR_AMP_CTL,
67-
MBED_CONF_APP_LORA_TCXO);
46+
SX1276_LoRaRadio radio(MBED_CONF_SX1276_LORA_DRIVER_SPI_MOSI,
47+
MBED_CONF_SX1276_LORA_DRIVER_SPI_MISO,
48+
MBED_CONF_SX1276_LORA_DRIVER_SPI_SCLK,
49+
MBED_CONF_SX1276_LORA_DRIVER_SPI_CS,
50+
MBED_CONF_SX1276_LORA_DRIVER_RESET,
51+
MBED_CONF_SX1276_LORA_DRIVER_DIO0,
52+
MBED_CONF_SX1276_LORA_DRIVER_DIO1,
53+
MBED_CONF_SX1276_LORA_DRIVER_DIO2,
54+
MBED_CONF_SX1276_LORA_DRIVER_DIO3,
55+
MBED_CONF_SX1276_LORA_DRIVER_DIO4,
56+
MBED_CONF_SX1276_LORA_DRIVER_DIO5,
57+
MBED_CONF_SX1276_LORA_DRIVER_RF_SWITCH_CTL1,
58+
MBED_CONF_SX1276_LORA_DRIVER_RF_SWITCH_CTL2,
59+
MBED_CONF_SX1276_LORA_DRIVER_TXCTL,
60+
MBED_CONF_SX1276_LORA_DRIVER_RXCTL,
61+
MBED_CONF_SX1276_LORA_DRIVER_ANT_SWITCH,
62+
MBED_CONF_SX1276_LORA_DRIVER_PWR_AMP_CTL,
63+
MBED_CONF_SX1276_LORA_DRIVER_TCXO);
6864

69-
#elif (MBED_CONF_APP_LORA_RADIO == SX126X)
65+
#elif COMPONENT_SX126X
7066
#include "SX126X_LoRaRadio.h"
71-
SX126X_LoRaRadio radio(MBED_CONF_APP_LORA_SPI_MOSI,
72-
MBED_CONF_APP_LORA_SPI_MISO,
73-
MBED_CONF_APP_LORA_SPI_SCLK,
74-
MBED_CONF_APP_LORA_CS,
75-
MBED_CONF_APP_LORA_RESET,
76-
MBED_CONF_APP_LORA_DIO1,
77-
MBED_CONF_APP_LORA_BUSY,
78-
MBED_CONF_APP_LORA_FREQ_SEL,
79-
MBED_CONF_APP_LORA_DEV_SEL,
80-
MBED_CONF_APP_LORA_XTAL_SEL,
81-
MBED_CONF_APP_LORA_ANT_SWITCH);
67+
SX126X_LoRaRadio radio(MBED_CONF_SX126X_LORA_DRIVER_SPI_MOSI,
68+
MBED_CONF_SX126X_LORA_DRIVER_SPI_MISO,
69+
MBED_CONF_SX126X_LORA_DRIVER_SPI_SCLK,
70+
MBED_CONF_SX126X_LORA_DRIVER_SPI_CS,
71+
MBED_CONF_SX126X_LORA_DRIVER_RESET,
72+
MBED_CONF_SX126X_LORA_DRIVER_DIO1,
73+
MBED_CONF_SX126X_LORA_DRIVER_BUSY,
74+
MBED_CONF_SX126X_LORA_DRIVER_FREQ_SEL,
75+
MBED_CONF_SX126X_LORA_DRIVER_DEV_SEL,
76+
MBED_CONF_SX126X_LORA_DRIVER_XTAL_SEL,
77+
MBED_CONF_SX126X_LORA_DRIVER_ANT_SWITCH);
8278

8379
#else
8480
#error "Unknown LoRa radio specified (SX126X, SX1272, SX1276 are valid)"

0 commit comments

Comments
 (0)