ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Astyle fixes

pull/12741/head
Kimmo Vaisanen 2020-03-25 12:52:29 +02:00
parent 2867b1878a
commit 444e72561f
7 changed files with 780 additions and 822 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SX126X/SX126X_LoRaRadio.cpp
View File

@ -47,14 +47,12 @@ using namespace rtos;
/*! /*!
* FSK bandwidth definition * FSK bandwidth definition
*/ */
typedef struct typedef struct {
{
uint32_t bandwidth; uint32_t bandwidth;
uint8_t register_value; uint8_t register_value;
} fsk_bw_t; } fsk_bw_t;
static const fsk_bw_t fsk_bandwidths[] = static const fsk_bw_t fsk_bandwidths[] = {
{
{ 4800, 0x1F }, { 4800, 0x1F },
{ 5800, 0x17 }, { 5800, 0x17 },
{ 7300, 0x0F }, { 7300, 0x0F },
@ -84,7 +82,8 @@ const uint8_t sync_word[] = {0xC1, 0x94, 0xC1, 0x00, 0x00, 0x00, 0x00,0x00};
// in ms SF12 SF11 SF10 SF9 SF8 SF7 // in ms SF12 SF11 SF10 SF9 SF8 SF7
const float lora_symbol_time[3][6] = {{ 32.768, 16.384, 8.192, 4.096, 2.048, 1.024 }, // 125 KHz const float lora_symbol_time[3][6] = {{ 32.768, 16.384, 8.192, 4.096, 2.048, 1.024 }, // 125 KHz
{ 16.384, 8.192, 4.096, 2.048, 1.024, 0.512 }, // 250 KHz { 16.384, 8.192, 4.096, 2.048, 1.024, 0.512 }, // 250 KHz
{ 8.192, 4.096, 2.048, 1.024, 0.512, 0.256 }}; // 500 KHz { 8.192, 4.096, 2.048, 1.024, 0.512, 0.256 }
}; // 500 KHz
SX126X_LoRaRadio::SX126X_LoRaRadio(PinName mosi, SX126X_LoRaRadio::SX126X_LoRaRadio(PinName mosi,
PinName miso, PinName miso,

92
SX1272/SX1272_LoRaRadio.cpp
View File

@ -63,8 +63,7 @@ enum RadioVariant {
/*! /*!
* FSK bandwidth definition * FSK bandwidth definition
*/ */
typedef struct typedef struct {
{
uint32_t bandwidth; uint32_t bandwidth;
uint8_t register_value; uint8_t register_value;
} fsk_bw_t; } fsk_bw_t;
@ -72,8 +71,7 @@ typedef struct
/*! /*!
* Radio registers definition * Radio registers definition
*/ */
typedef struct typedef struct {
{
modem_type modem; modem_type modem;
uint8_t addr; uint8_t addr;
uint8_t value; uint8_t value;
@ -105,8 +103,7 @@ typedef struct
{ MODEM_LORA, REG_LR_PAYLOADMAXLENGTH, 0x40 },\ { MODEM_LORA, REG_LR_PAYLOADMAXLENGTH, 0x40 },\
} }
const fsk_bw_t fsk_bandwidths[] = const fsk_bw_t fsk_bandwidths[] = {
{
{ 2600, 0x17 }, { 2600, 0x17 },
{ 3100, 0x0F }, { 3100, 0x0F },
{ 3900, 0x07 }, { 3900, 0x07 },
@ -352,8 +349,7 @@ void SX1272_LoRaRadio::set_modem(uint8_t modem)
_rf_settings.modem = modem; _rf_settings.modem = modem;
switch(_rf_settings.modem) switch (_rf_settings.modem) {
{
default: default:
case MODEM_FSK: case MODEM_FSK:
// before changing modem mode, put the module to sleep // before changing modem mode, put the module to sleep
@ -1356,8 +1352,7 @@ int16_t SX1272_LoRaRadio::get_rssi(radio_modems_t modem)
{ {
int16_t rssi = 0; int16_t rssi = 0;
switch( modem ) switch (modem) {
{
case MODEM_FSK: case MODEM_FSK:
rssi = -(read_register(REG_RSSIVALUE) >> 1); rssi = -(read_register(REG_RSSIVALUE) >> 1);
break; break;
@ -1391,9 +1386,7 @@ void SX1272_LoRaRadio::set_rf_tx_power(int8_t power)
if (power > 19) { if (power > 19) {
pa_config = (pa_config & RF_PACONFIG_PASELECT_MASK) | RF_PACONFIG_PASELECT_RFO; pa_config = (pa_config & RF_PACONFIG_PASELECT_MASK) | RF_PACONFIG_PASELECT_RFO;
pa_config = (pa_config & RFLR_PACONFIG_OUTPUTPOWER_MASK) | RFO_table[power - 20]; pa_config = (pa_config & RFLR_PACONFIG_OUTPUTPOWER_MASK) | RFO_table[power - 20];
} } else {
else
{
pa_config = (pa_config & RF_PACONFIG_PASELECT_MASK) | RF_PACONFIG_PASELECT_PABOOST; pa_config = (pa_config & RF_PACONFIG_PASELECT_MASK) | RF_PACONFIG_PASELECT_PABOOST;
pa_config = (pa_config & RFLR_PACONFIG_OUTPUTPOWER_MASK) | pa_boost_table[power]; pa_config = (pa_config & RFLR_PACONFIG_OUTPUTPOWER_MASK) | pa_boost_table[power];
} }
@ -1812,8 +1805,7 @@ void SX1272_LoRaRadio::handle_dio0_irq()
} }
_rf_settings.lora_packet_handler.snr_value = read_register(REG_LR_PKTSNRVALUE); _rf_settings.lora_packet_handler.snr_value = read_register(REG_LR_PKTSNRVALUE);
if (_rf_settings.lora_packet_handler.snr_value & 0x80) // The SNR sign bit is 1 if (_rf_settings.lora_packet_handler.snr_value & 0x80) { // The SNR sign bit is 1
{
// Invert and divide by 4 // Invert and divide by 4
snr = ((~_rf_settings.lora_packet_handler.snr_value + 1) & 0xFF) >> 2; snr = ((~_rf_settings.lora_packet_handler.snr_value + 1) & 0xFF) >> 2;
snr = -snr; snr = -snr;
@ -1878,32 +1870,24 @@ void SX1272_LoRaRadio::handle_dio0_irq()
void SX1272_LoRaRadio::handle_dio1_irq() void SX1272_LoRaRadio::handle_dio1_irq()
{ {
switch(_rf_settings.state ) switch (_rf_settings.state) {
{
case RF_RX_RUNNING: case RF_RX_RUNNING:
switch (_rf_settings.modem) { switch (_rf_settings.modem) {
case MODEM_FSK: case MODEM_FSK:
// FifoLevel interrupt // FifoLevel interrupt
// Read received packet size // Read received packet size
if( ( _rf_settings.fsk_packet_handler.size == 0 ) && ( _rf_settings.fsk_packet_handler.nb_bytes == 0 ) ) if ((_rf_settings.fsk_packet_handler.size == 0) && (_rf_settings.fsk_packet_handler.nb_bytes == 0)) {
{ if (_rf_settings.fsk.fix_len == false) {
if( _rf_settings.fsk.fix_len == false )
{
read_fifo((uint8_t *)&_rf_settings.fsk_packet_handler.size, 1); read_fifo((uint8_t *)&_rf_settings.fsk_packet_handler.size, 1);
} } else {
else
{
_rf_settings.fsk_packet_handler.size = read_register(REG_PAYLOADLENGTH); _rf_settings.fsk_packet_handler.size = read_register(REG_PAYLOADLENGTH);
} }
} }
if( ( _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes ) > _rf_settings.fsk_packet_handler.fifo_thresh ) if ((_rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes) > _rf_settings.fsk_packet_handler.fifo_thresh) {
{
read_fifo((_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes), _rf_settings.fsk_packet_handler.fifo_thresh); read_fifo((_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes), _rf_settings.fsk_packet_handler.fifo_thresh);
_rf_settings.fsk_packet_handler.nb_bytes += _rf_settings.fsk_packet_handler.fifo_thresh; _rf_settings.fsk_packet_handler.nb_bytes += _rf_settings.fsk_packet_handler.fifo_thresh;
} } else {
else
{
read_fifo((_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes), _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes); read_fifo((_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes), _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes);
_rf_settings.fsk_packet_handler.nb_bytes += (_rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes); _rf_settings.fsk_packet_handler.nb_bytes += (_rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes);
} }
@ -1920,17 +1904,13 @@ void SX1272_LoRaRadio::handle_dio1_irq()
} }
break; break;
case RF_TX_RUNNING: case RF_TX_RUNNING:
switch( _rf_settings.modem ) switch (_rf_settings.modem) {
{
case MODEM_FSK: case MODEM_FSK:
// FifoLevel interrupt // FifoLevel interrupt
if( ( _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes ) > _rf_settings.fsk_packet_handler.chunk_size ) if ((_rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes) > _rf_settings.fsk_packet_handler.chunk_size) {
{
write_fifo((_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes), _rf_settings.fsk_packet_handler.chunk_size); write_fifo((_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes), _rf_settings.fsk_packet_handler.chunk_size);
_rf_settings.fsk_packet_handler.nb_bytes += _rf_settings.fsk_packet_handler.chunk_size; _rf_settings.fsk_packet_handler.nb_bytes += _rf_settings.fsk_packet_handler.chunk_size;
} } else {
else
{
// Write the last chunk of data // Write the last chunk of data
write_fifo(_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes, _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes); write_fifo(_data_buffer + _rf_settings.fsk_packet_handler.nb_bytes, _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes);
_rf_settings.fsk_packet_handler.nb_bytes += _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes; _rf_settings.fsk_packet_handler.nb_bytes += _rf_settings.fsk_packet_handler.size - _rf_settings.fsk_packet_handler.nb_bytes;
@ -1949,11 +1929,9 @@ void SX1272_LoRaRadio::handle_dio1_irq()
void SX1272_LoRaRadio::handle_dio2_irq(void) void SX1272_LoRaRadio::handle_dio2_irq(void)
{ {
switch(_rf_settings.state ) switch (_rf_settings.state) {
{
case RF_RX_RUNNING: case RF_RX_RUNNING:
switch( _rf_settings.modem ) switch (_rf_settings.modem) {
{
case MODEM_FSK: case MODEM_FSK:
_rf_settings.fsk_packet_handler.preamble_detected = 0; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = 0; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
@ -1984,13 +1962,11 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
break; break;
case MODEM_LORA: case MODEM_LORA:
if( _rf_settings.lora.freq_hop_on == true ) if (_rf_settings.lora.freq_hop_on == true) {
{
// Clear Irq // Clear Irq
write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL); write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL);
if( ( _radio_events != NULL ) && (_radio_events->fhss_change_channel ) ) if ((_radio_events != NULL) && (_radio_events->fhss_change_channel)) {
{
_radio_events->fhss_change_channel((read_register(REG_LR_HOPCHANNEL) & RFLR_HOPCHANNEL_CHANNEL_MASK)); _radio_events->fhss_change_channel((read_register(REG_LR_HOPCHANNEL) & RFLR_HOPCHANNEL_CHANNEL_MASK));
} }
} }
@ -2000,18 +1976,15 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
} }
break; break;
case RF_TX_RUNNING: case RF_TX_RUNNING:
switch( _rf_settings.modem ) switch (_rf_settings.modem) {
{
case MODEM_FSK: case MODEM_FSK:
break; break;
case MODEM_LORA: case MODEM_LORA:
if( _rf_settings.lora.freq_hop_on == true ) if (_rf_settings.lora.freq_hop_on == true) {
{
// Clear Irq // Clear Irq
write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL); write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL);
if( (_radio_events != NULL ) && ( _radio_events->fhss_change_channel ) ) if ((_radio_events != NULL) && (_radio_events->fhss_change_channel)) {
{
_radio_events->fhss_change_channel((read_register(REG_LR_HOPCHANNEL) & RFLR_HOPCHANNEL_CHANNEL_MASK)); _radio_events->fhss_change_channel((read_register(REG_LR_HOPCHANNEL) & RFLR_HOPCHANNEL_CHANNEL_MASK));
} }
} }
@ -2027,26 +2000,20 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
void SX1272_LoRaRadio::handle_dio3_irq(void) void SX1272_LoRaRadio::handle_dio3_irq(void)
{ {
switch( _rf_settings.modem ) switch (_rf_settings.modem) {
{
case MODEM_FSK: case MODEM_FSK:
break; break;
case MODEM_LORA: case MODEM_LORA:
if( ( read_register( REG_LR_IRQFLAGS ) & RFLR_IRQFLAGS_CADDETECTED ) == RFLR_IRQFLAGS_CADDETECTED ) if ((read_register(REG_LR_IRQFLAGS) & RFLR_IRQFLAGS_CADDETECTED) == RFLR_IRQFLAGS_CADDETECTED) {
{
// Clear Irq // Clear Irq
write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDETECTED | RFLR_IRQFLAGS_CADDONE); write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDETECTED | RFLR_IRQFLAGS_CADDONE);
if( ( _radio_events != NULL ) && ( _radio_events->cad_done ) ) if ((_radio_events != NULL) && (_radio_events->cad_done)) {
{
_radio_events->cad_done(true); _radio_events->cad_done(true);
} }
} } else {
else
{
// Clear Irq // Clear Irq
write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDONE); write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDONE);
if( ( _radio_events != NULL ) && ( _radio_events->cad_done ) ) if ((_radio_events != NULL) && (_radio_events->cad_done)) {
{
_radio_events->cad_done(false); _radio_events->cad_done(false);
} }
} }
@ -2075,8 +2042,7 @@ void SX1272_LoRaRadio::handle_dio4_irq(void)
void SX1272_LoRaRadio::handle_dio5_irq() void SX1272_LoRaRadio::handle_dio5_irq()
{ {
switch( _rf_settings.modem ) switch (_rf_settings.modem) {
{
case MODEM_FSK: case MODEM_FSK:
break; break;
case MODEM_LORA: case MODEM_LORA:

21
SX1276/SX1276_LoRaRadio.cpp
View File

@ -64,8 +64,7 @@ using namespace mbed;
/*! /*!
* FSK bandwidth definition * FSK bandwidth definition
*/ */
typedef struct typedef struct {
{
uint32_t bandwidth; uint32_t bandwidth;
uint8_t register_value; uint8_t register_value;
} fsk_bw_t; } fsk_bw_t;
@ -73,8 +72,7 @@ typedef struct
/*! /*!
* Radio registers definition * Radio registers definition
*/ */
typedef struct typedef struct {
{
uint8_t modem; uint8_t modem;
uint8_t addr; uint8_t addr;
uint8_t value; uint8_t value;
@ -100,8 +98,7 @@ typedef struct
{ MODEM_LORA, REG_LR_PAYLOADMAXLENGTH, 0x40 },\ { MODEM_LORA, REG_LR_PAYLOADMAXLENGTH, 0x40 },\
} }
static const fsk_bw_t fsk_bandwidths[] = static const fsk_bw_t fsk_bandwidths[] = {
{
{ 2600, 0x17 }, { 2600, 0x17 },
{ 3100, 0x0F }, { 3100, 0x0F },
{ 3900, 0x07 }, { 3900, 0x07 },
@ -1294,8 +1291,7 @@ void SX1276_LoRaRadio::set_modem(uint8_t modem )
_rf_settings.modem = modem; _rf_settings.modem = modem;
switch(_rf_settings.modem) switch (_rf_settings.modem) {
{
default: default:
case MODEM_FSK: case MODEM_FSK:
// before changing modem mode, put the module to sleep // before changing modem mode, put the module to sleep
@ -1403,8 +1399,7 @@ void SX1276_LoRaRadio::rx_chain_calibration(void)
& RF_IMAGECAL_IMAGECAL_MASK) & RF_IMAGECAL_IMAGECAL_MASK)
| RF_IMAGECAL_IMAGECAL_START); | RF_IMAGECAL_IMAGECAL_START);
while ((read_register(REG_IMAGECAL) & RF_IMAGECAL_IMAGECAL_RUNNING) while ((read_register(REG_IMAGECAL) & RF_IMAGECAL_IMAGECAL_RUNNING)
== RF_IMAGECAL_IMAGECAL_RUNNING ) == RF_IMAGECAL_IMAGECAL_RUNNING) {
{
} }
// Sets a Frequency in HF band // Sets a Frequency in HF band
@ -1415,8 +1410,7 @@ void SX1276_LoRaRadio::rx_chain_calibration(void)
& RF_IMAGECAL_IMAGECAL_MASK) & RF_IMAGECAL_IMAGECAL_MASK)
| RF_IMAGECAL_IMAGECAL_START); | RF_IMAGECAL_IMAGECAL_START);
while ((read_register(REG_IMAGECAL) & RF_IMAGECAL_IMAGECAL_RUNNING) while ((read_register(REG_IMAGECAL) & RF_IMAGECAL_IMAGECAL_RUNNING)
== RF_IMAGECAL_IMAGECAL_RUNNING ) == RF_IMAGECAL_IMAGECAL_RUNNING) {
{
// do nothing, just wait while rf image frequency calibration is done // do nothing, just wait while rf image frequency calibration is done
} }
@ -1947,8 +1941,7 @@ void SX1276_LoRaRadio::handle_dio0_irq()
_rf_settings.lora_packet_handler.snr_value = read_register( _rf_settings.lora_packet_handler.snr_value = read_register(
REG_LR_PKTSNRVALUE); REG_LR_PKTSNRVALUE);
if (_rf_settings.lora_packet_handler.snr_value & 0x80) // The SNR sign bit is 1 if (_rf_settings.lora_packet_handler.snr_value & 0x80) { // The SNR sign bit is 1
{
// Invert and divide by 4 // Invert and divide by 4
snr = ((~_rf_settings.lora_packet_handler.snr_value + 1) snr = ((~_rf_settings.lora_packet_handler.snr_value + 1)
& 0xFF) >> 2; & 0xFF) >> 2;