Skip to content

Commit 2b5cff0

Browse files
mluis1mluis1
committed
Merge branch 'master' into develop
2 parents 1fb928c + acdf522 commit 2b5cff0

38 files changed

+309
-199
lines changed

‎src/apps/ping-pong/NucleoL073/main.c‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
#if defined( USE_MODEM_LORA )
7777

78-
#define LORA_BANDWIDTH 2 // [0: 125 kHz,
78+
#define LORA_BANDWIDTH 0 // [0: 125 kHz,
7979
// 1: 250 kHz,
8080
// 2: 500 kHz,
8181
// 3: Reserved]
@@ -85,34 +85,16 @@
8585
// 3: 4/7,
8686
// 4: 4/8]
8787
#define LORA_PREAMBLE_LENGTH 8 // Same for Tx and Rx
88-
#define LORA_SYMBOL_TIMEOUT 0 // Symbols
88+
#define LORA_SYMBOL_TIMEOUT 5 // Symbols
8989
#define LORA_FIX_LENGTH_PAYLOAD_ON false
9090
#define LORA_IQ_INVERSION_ON false
9191

9292
#elif defined( USE_MODEM_FSK )
9393

9494
#define FSK_FDEV 25000 // Hz
9595
#define FSK_DATARATE 50000 // bps
96-
97-
#if defined( SX1272MB2DAS ) || defined( SX1276MB1LAS ) || defined( SX1276MB1MAS )
98-
99-
#define FSK_BANDWIDTH 50000 // Hz >> SSB in sx127x
96+
#define FSK_BANDWIDTH 50000 // Hz
10097
#define FSK_AFC_BANDWIDTH 83333 // Hz
101-
102-
#elif defined( SX1261MBXBAS ) || defined( SX1262MBXCAS ) || defined( SX1262MBXDAS )
103-
104-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in sx126x
105-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in sx126x
106-
107-
#elif defined( LR1110MB1XXS )
108-
109-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in LR1110
110-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in LR1110
111-
112-
#else
113-
#error "Please define a mbed shield in the compiler options."
114-
#endif
115-
11698
#define FSK_PREAMBLE_LENGTH 5 // Same for Tx and Rx
11799
#define FSK_FIX_LENGTH_PAYLOAD_ON false
118100

‎src/apps/ping-pong/NucleoL152/main.c‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
#if defined( USE_MODEM_LORA )
7777

78-
#define LORA_BANDWIDTH 2 // [0: 125 kHz,
78+
#define LORA_BANDWIDTH 0 // [0: 125 kHz,
7979
// 1: 250 kHz,
8080
// 2: 500 kHz,
8181
// 3: Reserved]
@@ -85,34 +85,16 @@
8585
// 3: 4/7,
8686
// 4: 4/8]
8787
#define LORA_PREAMBLE_LENGTH 8 // Same for Tx and Rx
88-
#define LORA_SYMBOL_TIMEOUT 0 // Symbols
88+
#define LORA_SYMBOL_TIMEOUT 5 // Symbols
8989
#define LORA_FIX_LENGTH_PAYLOAD_ON false
9090
#define LORA_IQ_INVERSION_ON false
9191

9292
#elif defined( USE_MODEM_FSK )
9393

9494
#define FSK_FDEV 25000 // Hz
9595
#define FSK_DATARATE 50000 // bps
96-
97-
#if defined( SX1272MB2DAS ) || defined( SX1276MB1LAS ) || defined( SX1276MB1MAS )
98-
99-
#define FSK_BANDWIDTH 50000 // Hz >> SSB in sx127x
96+
#define FSK_BANDWIDTH 50000 // Hz
10097
#define FSK_AFC_BANDWIDTH 83333 // Hz
101-
102-
#elif defined( SX1261MBXBAS ) || defined( SX1262MBXCAS ) || defined( SX1262MBXDAS )
103-
104-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in sx126x
105-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in sx126x
106-
107-
#elif defined( LR1110MB1XXS )
108-
109-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in LR1110
110-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in LR1110
111-
112-
#else
113-
#error "Please define a mbed shield in the compiler options."
114-
#endif
115-
11698
#define FSK_PREAMBLE_LENGTH 5 // Same for Tx and Rx
11799
#define FSK_FIX_LENGTH_PAYLOAD_ON false
118100

‎src/apps/ping-pong/NucleoL476/main.c‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
#if defined( USE_MODEM_LORA )
7777

78-
#define LORA_BANDWIDTH 2 // [0: 125 kHz,
78+
#define LORA_BANDWIDTH 0 // [0: 125 kHz,
7979
// 1: 250 kHz,
8080
// 2: 500 kHz,
8181
// 3: Reserved]
@@ -85,34 +85,16 @@
8585
// 3: 4/7,
8686
// 4: 4/8]
8787
#define LORA_PREAMBLE_LENGTH 8 // Same for Tx and Rx
88-
#define LORA_SYMBOL_TIMEOUT 0 // Symbols
88+
#define LORA_SYMBOL_TIMEOUT 5 // Symbols
8989
#define LORA_FIX_LENGTH_PAYLOAD_ON false
9090
#define LORA_IQ_INVERSION_ON false
9191

9292
#elif defined( USE_MODEM_FSK )
9393

9494
#define FSK_FDEV 25000 // Hz
9595
#define FSK_DATARATE 50000 // bps
96-
97-
#if defined( SX1272MB2DAS ) || defined( SX1276MB1LAS ) || defined( SX1276MB1MAS )
98-
99-
#define FSK_BANDWIDTH 50000 // Hz >> SSB in sx127x
96+
#define FSK_BANDWIDTH 50000 // Hz
10097
#define FSK_AFC_BANDWIDTH 83333 // Hz
101-
102-
#elif defined( SX1261MBXBAS ) || defined( SX1262MBXCAS ) || defined( SX1262MBXDAS )
103-
104-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in sx126x
105-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in sx126x
106-
107-
#elif defined( LR1110MB1XXS )
108-
109-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in LR1110
110-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in LR1110
111-
112-
#else
113-
#error "Please define a mbed shield in the compiler options."
114-
#endif
115-
11698
#define FSK_PREAMBLE_LENGTH 5 // Same for Tx and Rx
11799
#define FSK_FIX_LENGTH_PAYLOAD_ON false
118100

‎src/apps/rx-sensi/NucleoL073/main.c‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,8 @@
9393
#elif defined( USE_MODEM_FSK )
9494

9595
#define FSK_DATARATE 50000 // bps
96-
97-
#if defined( SX1272MB2DAS ) || defined( SX1276MB1LAS ) || defined( SX1276MB1MAS )
98-
99-
#define FSK_BANDWIDTH 50000 // Hz >> SSB in sx127x
96+
#define FSK_BANDWIDTH 50000 // Hz
10097
#define FSK_AFC_BANDWIDTH 83333 // Hz
101-
102-
#elif defined( SX1261MBXBAS ) || defined( SX1262MBXCAS ) || defined( SX1262MBXDAS )
103-
104-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in sx126x
105-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in sx126x
106-
107-
#elif defined( LR1110MB1XXS )
108-
109-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in LR1110
110-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in LR1110
111-
112-
#else
113-
#error "Please define a mbed shield in the compiler options."
114-
#endif
115-
11698
#define FSK_PREAMBLE_LENGTH 5 // Same for Tx and Rx
11799
#define FSK_FIX_LENGTH_PAYLOAD_ON false
118100

‎src/apps/rx-sensi/NucleoL152/main.c‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,8 @@
9393
#elif defined( USE_MODEM_FSK )
9494

9595
#define FSK_DATARATE 50000 // bps
96-
97-
#if defined( SX1272MB2DAS ) || defined( SX1276MB1LAS ) || defined( SX1276MB1MAS )
98-
99-
#define FSK_BANDWIDTH 50000 // Hz >> SSB in sx127x
96+
#define FSK_BANDWIDTH 50000 // Hz
10097
#define FSK_AFC_BANDWIDTH 83333 // Hz
101-
102-
#elif defined( SX1261MBXBAS ) || defined( SX1262MBXCAS ) || defined( SX1262MBXDAS )
103-
104-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in sx126x
105-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in sx126x
106-
107-
#elif defined( LR1110MB1XXS )
108-
109-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in LR1110
110-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in LR1110
111-
112-
#else
113-
#error "Please define a mbed shield in the compiler options."
114-
#endif
115-
11698
#define FSK_PREAMBLE_LENGTH 5 // Same for Tx and Rx
11799
#define FSK_FIX_LENGTH_PAYLOAD_ON false
118100

‎src/apps/rx-sensi/NucleoL476/main.c‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,8 @@
9393
#elif defined( USE_MODEM_FSK )
9494

9595
#define FSK_DATARATE 50000 // bps
96-
97-
#if defined( SX1272MB2DAS ) || defined( SX1276MB1LAS ) || defined( SX1276MB1MAS )
98-
99-
#define FSK_BANDWIDTH 50000 // Hz >> SSB in sx127x
96+
#define FSK_BANDWIDTH 50000 // Hz
10097
#define FSK_AFC_BANDWIDTH 83333 // Hz
101-
102-
#elif defined( SX1261MBXBAS ) || defined( SX1262MBXCAS ) || defined( SX1262MBXDAS )
103-
104-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in sx126x
105-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in sx126x
106-
107-
#elif defined( LR1110MB1XXS )
108-
109-
#define FSK_BANDWIDTH 100000 // Hz >> DSB in LR1110
110-
#define FSK_AFC_BANDWIDTH 166666 // Hz >> Unused in LR1110
111-
112-
#else
113-
#error "Please define a mbed shield in the compiler options."
114-
#endif
115-
11698
#define FSK_PREAMBLE_LENGTH 5 // Same for Tx and Rx
11799
#define FSK_FIX_LENGTH_PAYLOAD_ON false
118100

‎src/boards/B-L072Z-LRWAN1/sx1276-board.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void SX1276IoInit( void )
109109
void SX1276IoIrqInit( DioIrqHandler **irqHandlers )
110110
{
111111
GpioSetInterrupt( &SX1276.DIO0, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[0] );
112-
GpioSetInterrupt( &SX1276.DIO1, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
112+
GpioSetInterrupt( &SX1276.DIO1, IRQ_RISING_FALLING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
113113
GpioSetInterrupt( &SX1276.DIO2, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[2] );
114114
GpioSetInterrupt( &SX1276.DIO3, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[3] );
115115
GpioSetInterrupt( &SX1276.DIO4, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[4] );
@@ -323,6 +323,11 @@ bool SX1276CheckRfFrequency( uint32_t frequency )
323323
return true;
324324
}
325325

326+
uint32_t SX1276GetDio1PinState( void )
327+
{
328+
return GpioRead( &SX1276.DIO1 );
329+
}
330+
326331
#if defined( USE_RADIO_DEBUG )
327332
void SX1276DbgPinTxWrite( uint8_t state )
328333
{

‎src/boards/NAMote72/sx1272-board.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void SX1272IoInit( void )
122122
void SX1272IoIrqInit( DioIrqHandler **irqHandlers )
123123
{
124124
GpioSetInterrupt( &SX1272.DIO0, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[0] );
125-
GpioSetInterrupt( &SX1272.DIO1, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
125+
GpioSetInterrupt( &SX1272.DIO1, IRQ_RISING_FALLING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
126126
GpioSetInterrupt( &SX1272.DIO2, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[2] );
127127
GpioSetInterrupt( &SX1272.DIO3, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[3] );
128128
GpioSetInterrupt( &SX1272.DIO4, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[4] );
@@ -282,6 +282,11 @@ bool SX1272CheckRfFrequency( uint32_t frequency )
282282
return true;
283283
}
284284

285+
uint32_t SX1272GetDio1PinState( void )
286+
{
287+
return GpioRead( &SX1272.DIO1 );
288+
}
289+
285290
#if defined( USE_RADIO_DEBUG )
286291
void SX1272DbgPinTxWrite( uint8_t state )
287292
{

‎src/boards/NucleoL073/sx1272mb2das-board.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void SX1272IoInit( void )
104104
void SX1272IoIrqInit( DioIrqHandler **irqHandlers )
105105
{
106106
GpioSetInterrupt( &SX1272.DIO0, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[0] );
107-
GpioSetInterrupt( &SX1272.DIO1, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
107+
GpioSetInterrupt( &SX1272.DIO1, IRQ_RISING_FALLING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
108108
GpioSetInterrupt( &SX1272.DIO2, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[2] );
109109
GpioSetInterrupt( &SX1272.DIO3, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[3] );
110110
}
@@ -286,6 +286,11 @@ bool SX1272CheckRfFrequency( uint32_t frequency )
286286
return true;
287287
}
288288

289+
uint32_t SX1272GetDio1PinState( void )
290+
{
291+
return GpioRead( &SX1272.DIO1 );
292+
}
293+
289294
#if defined( USE_RADIO_DEBUG )
290295
void SX1272DbgPinTxWrite( uint8_t state )
291296
{

‎src/boards/NucleoL073/sx1276mb1las-board.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void SX1276IoInit( void )
102102
void SX1276IoIrqInit( DioIrqHandler **irqHandlers )
103103
{
104104
GpioSetInterrupt( &SX1276.DIO0, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[0] );
105-
GpioSetInterrupt( &SX1276.DIO1, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
105+
GpioSetInterrupt( &SX1276.DIO1, IRQ_RISING_FALLING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
106106
GpioSetInterrupt( &SX1276.DIO2, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[2] );
107107
GpioSetInterrupt( &SX1276.DIO3, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[3] );
108108
GpioSetInterrupt( &SX1276.DIO4, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[4] );
@@ -302,6 +302,11 @@ bool SX1276CheckRfFrequency( uint32_t frequency )
302302
return true;
303303
}
304304

305+
uint32_t SX1276GetDio1PinState( void )
306+
{
307+
return GpioRead( &SX1276.DIO1 );
308+
}
309+
305310
#if defined( USE_RADIO_DEBUG )
306311
void SX1276DbgPinTxWrite( uint8_t state )
307312
{

0 commit comments

Comments
 (0)