Skip to content

Commit baf6a30

Browse files
authored
Merge pull request #15471 from hallard/LoRaWAN_set_antenna_gain
LoRaWAN allow to adapt antenna gain
2 parents 61ab4f7 + deb09a3 commit baf6a30

9 files changed

+42
-1
lines changed

connectivity/lorawan/lorastack/phy/LoRaPHYAS923.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,11 @@
187187
/*!
188188
* Default antenna gain
189189
*/
190+
#ifdef LORAPHY_ANTENNA_GAIN
191+
#define AS923_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
192+
#else
190193
#define AS923_DEFAULT_ANTENNA_GAIN 2.15f
194+
#endif
191195

192196
/*!
193197
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYAU915.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@
9696
/*!
9797
* Default antenna gain
9898
*/
99+
#ifdef LORAPHY_ANTENNA_GAIN
100+
#define AU915_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
101+
#else
99102
#define AU915_DEFAULT_ANTENNA_GAIN 2.15f
103+
#endif
100104

101105
/*!
102106
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYCN470.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@
9595
/*!
9696
* Default antenna gain
9797
*/
98+
#ifdef LORAPHY_ANTENNA_GAIN
99+
#define CN470_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
100+
#else
98101
#define CN470_DEFAULT_ANTENNA_GAIN 2.15f
102+
#endif
99103

100104
/*!
101105
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYCN779.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@
107107
/*!
108108
* Default antenna gain
109109
*/
110+
#ifdef LORAPHY_ANTENNA_GAIN
111+
#define CN779_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
112+
#else
110113
#define CN779_DEFAULT_ANTENNA_GAIN 2.15f
114+
#endif
111115

112116
/*!
113117
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYEU433.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@
107107
/*!
108108
* Default antenna gain
109109
*/
110+
#ifdef LORAPHY_ANTENNA_GAIN
111+
#define EU433_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
112+
#else
110113
#define EU433_DEFAULT_ANTENNA_GAIN 2.15f
114+
#endif
111115

112116
/*!
113117
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYEU868.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@
107107
/*!
108108
* Default antenna gain
109109
*/
110+
#ifdef LORAPHY_ANTENNA_GAIN
111+
#define EU868_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
112+
#else
110113
#define EU868_DEFAULT_ANTENNA_GAIN 2.15f
114+
#endif
111115

112116
/*!
113117
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYIN865.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@
107107
/*!
108108
* Default antenna gain
109109
*/
110+
#ifdef LORAPHY_ANTENNA_GAIN
111+
#define IN865_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
112+
#else
110113
#define IN865_DEFAULT_ANTENNA_GAIN 2.15f
114+
#endif
111115

112116
/*!
113117
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYKR920.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,11 @@
111111
/*!
112112
* Default antenna gain
113113
*/
114+
#ifdef LORAPHY_ANTENNA_GAIN
115+
#define KR920_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
116+
#else
114117
#define KR920_DEFAULT_ANTENNA_GAIN 2.15f
118+
#endif
115119

116120
/*!
117121
* ADR Ack limit

connectivity/lorawan/lorastack/phy/LoRaPHYUS915.cpp

+10-1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,15 @@
9494
*/
9595
#define US915_DEFAULT_MAX_ERP 30.0f
9696

97+
/*!
98+
* Default antenna gain
99+
*/
100+
#ifdef LORAPHY_ANTENNA_GAIN
101+
#define US915_DEFAULT_ANTENNA_GAIN LORAPHY_ANTENNA_GAIN
102+
#else
103+
#define US915_DEFAULT_ANTENNA_GAIN 0.00f
104+
#endif
105+
97106
/*!
98107
* ADR Ack limit
99108
*/
@@ -299,7 +308,7 @@ LoRaPHYUS915::LoRaPHYUS915()
299308
phy_params.max_tx_power = US915_MAX_TX_POWER;
300309
phy_params.default_tx_power = US915_DEFAULT_TX_POWER;
301310
phy_params.default_max_eirp = 0;
302-
phy_params.default_antenna_gain = 0;
311+
phy_params.default_antenna_gain = US915_DEFAULT_ANTENNA_GAIN;
303312
phy_params.adr_ack_limit = US915_ADR_ACK_LIMIT;
304313
phy_params.adr_ack_delay = US915_ADR_ACK_DELAY;
305314
phy_params.max_rx_window = US915_MAX_RX_WINDOW;

0 commit comments

Comments
 (0)