riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/sx127x: uncrustify code

Browse Source
This commit is contained in:
Alexandre Abadie 2021-03-30 15:06:32 +02:00
parent 680cc67ece
commit 39094d0833
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
5 changed files with 841 additions and 818 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/sx127x/sx127x.c
View File

@ -76,6 +76,7 @@ static void sx127x_on_dio3_isr(void *arg);
void sx127x_setup(sx127x_t *dev, const sx127x_params_t *params, uint8_t index) void sx127x_setup(sx127x_t *dev, const sx127x_params_t *params, uint8_t index)
{ {
netdev_t *netdev = (netdev_t *)dev; netdev_t *netdev = (netdev_t *)dev;
netdev->driver = &sx127x_driver; netdev->driver = &sx127x_driver;
dev->params = *params; dev->params = *params;
netdev_register(&dev->netdev, NETDEV_SX127X, index); netdev_register(&dev->netdev, NETDEV_SX127X, index);
@ -148,7 +149,7 @@ int sx127x_init(sx127x_t *dev)
/* wait till device signals end of POR cycle */ /* wait till device signals end of POR cycle */
while ((gpio_read(dev->params.reset_pin) > 0) == while ((gpio_read(dev->params.reset_pin) > 0) ==
SX127X_POR_ACTIVE_LOGIC_LEVEL ) {}; SX127X_POR_ACTIVE_LOGIC_LEVEL) {}
} }
/* wait for the device to become ready */ /* wait for the device to become ready */

32
drivers/sx127x/sx127x_getset.c
View File

@ -243,10 +243,15 @@ void sx127x_set_rx(sx127x_t *dev)
((sx127x_reg_read(dev, SX127X_REG_LR_INVERTIQ) & ((sx127x_reg_read(dev, SX127X_REG_LR_INVERTIQ) &
SX127X_RF_LORA_INVERTIQ_TX_MASK & SX127X_RF_LORA_INVERTIQ_TX_MASK &
SX127X_RF_LORA_INVERTIQ_RX_MASK) | SX127X_RF_LORA_INVERTIQ_RX_MASK) |
((dev->settings.lora.flags & SX127X_IQ_INVERTED_FLAG) ? SX127X_RF_LORA_INVERTIQ_RX_ON :SX127X_RF_LORA_INVERTIQ_RX_OFF) | ((dev->settings.lora.flags &
SX127X_IQ_INVERTED_FLAG) ? SX127X_RF_LORA_INVERTIQ_RX_ON :
SX127X_RF_LORA_INVERTIQ_RX_OFF)
|
SX127X_RF_LORA_INVERTIQ_TX_OFF)); SX127X_RF_LORA_INVERTIQ_TX_OFF));
sx127x_reg_write(dev, SX127X_REG_LR_INVERTIQ2, sx127x_reg_write(dev, SX127X_REG_LR_INVERTIQ2,
((dev->settings.lora.flags & SX127X_IQ_INVERTED_FLAG) ? SX127X_RF_LORA_INVERTIQ2_ON : SX127X_RF_LORA_INVERTIQ2_OFF)); ((dev->settings.lora.flags &
SX127X_IQ_INVERTED_FLAG) ? SX127X_RF_LORA_INVERTIQ2_ON :
SX127X_RF_LORA_INVERTIQ2_OFF));
#if defined(MODULE_SX1276) #if defined(MODULE_SX1276)
/* ERRATA 2.3 - Receiver Spurious Reception of a LoRa Signal */ /* ERRATA 2.3 - Receiver Spurious Reception of a LoRa Signal */
@ -370,8 +375,7 @@ void sx127x_set_tx(sx127x_t *dev)
SX127X_RF_LORA_DIOMAPPING1_DIO0_01 | SX127X_RF_LORA_DIOMAPPING1_DIO0_01 |
SX127X_RF_LORA_DIOMAPPING1_DIO2_00); SX127X_RF_LORA_DIOMAPPING1_DIO2_00);
} }
else else {
{
/* Enable TXDONE interrupt */ /* Enable TXDONE interrupt */
sx127x_reg_write(dev, SX127X_REG_LR_IRQFLAGSMASK, sx127x_reg_write(dev, SX127X_REG_LR_IRQFLAGSMASK,
SX127X_RF_LORA_IRQFLAGS_RXTIMEOUT | SX127X_RF_LORA_IRQFLAGS_RXTIMEOUT |
@ -481,7 +485,8 @@ static void _low_datarate_optimize(sx127x_t *dev)
((dev->settings.lora.bandwidth == LORA_BW_250_KHZ) && ((dev->settings.lora.bandwidth == LORA_BW_250_KHZ) &&
(dev->settings.lora.datarate == LORA_SF12))) { (dev->settings.lora.datarate == LORA_SF12))) {
dev->settings.lora.flags |= SX127X_LOW_DATARATE_OPTIMIZE_FLAG; dev->settings.lora.flags |= SX127X_LOW_DATARATE_OPTIMIZE_FLAG;
} else { }
else {
dev->settings.lora.flags &= ~SX127X_LOW_DATARATE_OPTIMIZE_FLAG; dev->settings.lora.flags &= ~SX127X_LOW_DATARATE_OPTIMIZE_FLAG;
} }
@ -501,6 +506,7 @@ static void _low_datarate_optimize(sx127x_t *dev)
static void _update_bandwidth(const sx127x_t *dev) static void _update_bandwidth(const sx127x_t *dev)
{ {
uint8_t config1_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG1); uint8_t config1_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG1);
#if defined(MODULE_SX1272) #if defined(MODULE_SX1272)
config1_reg &= SX1272_RF_LORA_MODEMCONFIG1_BW_MASK; config1_reg &= SX1272_RF_LORA_MODEMCONFIG1_BW_MASK;
switch (dev->settings.lora.bandwidth) { switch (dev->settings.lora.bandwidth) {
@ -587,6 +593,7 @@ void sx127x_set_spreading_factor(sx127x_t *dev, uint8_t datarate)
dev->settings.lora.datarate = datarate; dev->settings.lora.datarate = datarate;
uint8_t config2_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG2); uint8_t config2_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG2);
config2_reg &= SX127X_RF_LORA_MODEMCONFIG2_SF_MASK; config2_reg &= SX127X_RF_LORA_MODEMCONFIG2_SF_MASK;
config2_reg |= datarate << 4; config2_reg |= datarate << 4;
sx127x_reg_write(dev, SX127X_REG_LR_MODEMCONFIG2, config2_reg); sx127x_reg_write(dev, SX127X_REG_LR_MODEMCONFIG2, config2_reg);
@ -694,6 +701,7 @@ void sx127x_set_hop_period(sx127x_t *dev, uint8_t hop_period)
dev->settings.lora.freq_hop_period = hop_period; dev->settings.lora.freq_hop_period = hop_period;
uint8_t tmp = sx127x_reg_read(dev, SX127X_REG_LR_PLLHOP); uint8_t tmp = sx127x_reg_read(dev, SX127X_REG_LR_PLLHOP);
if (dev->settings.lora.flags & SX127X_CHANNEL_HOPPING_FLAG) { if (dev->settings.lora.flags & SX127X_CHANNEL_HOPPING_FLAG) {
tmp |= SX127X_RF_LORA_PLLHOP_FASTHOP_ON; tmp |= SX127X_RF_LORA_PLLHOP_FASTHOP_ON;
sx127x_reg_write(dev, SX127X_REG_LR_PLLHOP, tmp); sx127x_reg_write(dev, SX127X_REG_LR_PLLHOP, tmp);
@ -713,6 +721,7 @@ void sx127x_set_fixed_header_len_mode(sx127x_t *dev, bool fixed_len)
_set_flag(dev, SX127X_ENABLE_FIXED_HEADER_LENGTH_FLAG, fixed_len); _set_flag(dev, SX127X_ENABLE_FIXED_HEADER_LENGTH_FLAG, fixed_len);
uint8_t config1_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG1); uint8_t config1_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG1);
#if defined(MODULE_SX1272) #if defined(MODULE_SX1272)
config1_reg &= SX1272_RF_LORA_MODEMCONFIG1_IMPLICITHEADER_MASK; config1_reg &= SX1272_RF_LORA_MODEMCONFIG1_IMPLICITHEADER_MASK;
config1_reg |= fixed_len << 2; config1_reg |= fixed_len << 2;
@ -725,7 +734,7 @@ void sx127x_set_fixed_header_len_mode(sx127x_t *dev, bool fixed_len)
uint8_t sx127x_get_payload_length(const sx127x_t *dev) uint8_t sx127x_get_payload_length(const sx127x_t *dev)
{ {
return sx127x_reg_read(dev, SX127X_REG_LR_PAYLOADLENGTH);; return sx127x_reg_read(dev, SX127X_REG_LR_PAYLOADLENGTH);
} }
void sx127x_set_payload_length(sx127x_t *dev, uint8_t len) void sx127x_set_payload_length(sx127x_t *dev, uint8_t len)
@ -756,6 +765,7 @@ void sx127x_set_tx_power(sx127x_t *dev, int8_t power)
dev->settings.lora.power = power; dev->settings.lora.power = power;
uint8_t pa_config = sx127x_reg_read(dev, SX127X_REG_PACONFIG); uint8_t pa_config = sx127x_reg_read(dev, SX127X_REG_PACONFIG);
#if defined(MODULE_SX1272) #if defined(MODULE_SX1272)
uint8_t pa_dac = sx127x_reg_read(dev, SX1272_REG_PADAC); uint8_t pa_dac = sx127x_reg_read(dev, SX1272_REG_PADAC);
#else /* MODULE_SX1276 */ #else /* MODULE_SX1276 */
@ -777,7 +787,8 @@ void sx127x_set_tx_power(sx127x_t *dev, int8_t power)
if (power > 17) { if (power > 17) {
pa_dac = ((pa_dac & SX127X_RF_PADAC_20DBM_MASK) | pa_dac = ((pa_dac & SX127X_RF_PADAC_20DBM_MASK) |
SX127X_RF_PADAC_20DBM_ON); SX127X_RF_PADAC_20DBM_ON);
} else { }
else {
pa_dac = ((pa_dac & SX127X_RF_PADAC_20DBM_MASK) | pa_dac = ((pa_dac & SX127X_RF_PADAC_20DBM_MASK) |
SX127X_RF_PADAC_20DBM_OFF); SX127X_RF_PADAC_20DBM_OFF);
} }
@ -791,7 +802,8 @@ void sx127x_set_tx_power(sx127x_t *dev, int8_t power)
pa_config = ((pa_config & SX127X_RF_PACONFIG_OUTPUTPOWER_MASK) | pa_config = ((pa_config & SX127X_RF_PACONFIG_OUTPUTPOWER_MASK) |
(uint8_t)((uint16_t)(power - 5) & 0x0F)); (uint8_t)((uint16_t)(power - 5) & 0x0F));
} else { }
else {
if (power < 2) { if (power < 2) {
power = 2; power = 2;
} }
@ -802,7 +814,8 @@ void sx127x_set_tx_power(sx127x_t *dev, int8_t power)
pa_config = ((pa_config & SX127X_RF_PACONFIG_OUTPUTPOWER_MASK) | pa_config = ((pa_config & SX127X_RF_PACONFIG_OUTPUTPOWER_MASK) |
(uint8_t)((uint16_t)(power - 2) & 0x0F)); (uint8_t)((uint16_t)(power - 2) & 0x0F));
} }
} else { }
else {
if (power < -1) { if (power < -1) {
power = -1; power = -1;
} }
@ -858,6 +871,7 @@ void sx127x_set_symbol_timeout(sx127x_t *dev, uint16_t timeout)
DEBUG("[sx127x] Set symbol timeout: %d\n", timeout); DEBUG("[sx127x] Set symbol timeout: %d\n", timeout);
uint8_t config2_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG2); uint8_t config2_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG2);
config2_reg &= SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK; config2_reg &= SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK;
config2_reg |= (timeout >> 8) & ~SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK; config2_reg |= (timeout >> 8) & ~SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK;
sx127x_reg_write(dev, SX127X_REG_LR_MODEMCONFIG2, config2_reg); sx127x_reg_write(dev, SX127X_REG_LR_MODEMCONFIG2, config2_reg);

10
drivers/sx127x/sx127x_internal.c
View File

@ -124,7 +124,9 @@ void sx1276_rx_chain_calibration(sx127x_t *dev)
reg_pa_config_init_val = sx127x_reg_read(dev, SX127X_REG_PACONFIG); reg_pa_config_init_val = sx127x_reg_read(dev, SX127X_REG_PACONFIG);
initial_freq = (double)(((uint32_t)sx127x_reg_read(dev, SX127X_REG_FRFMSB) << 16) initial_freq = (double)(((uint32_t)sx127x_reg_read(dev, SX127X_REG_FRFMSB) << 16)
| ((uint32_t)sx127x_reg_read(dev, SX127X_REG_FRFMID) << 8) | ((uint32_t)sx127x_reg_read(dev, SX127X_REG_FRFMID) << 8)
| ((uint32_t) sx127x_reg_read(dev, SX127X_REG_FRFLSB))) * (double)LORA_FREQUENCY_RESOLUTION_DEFAULT; | ((uint32_t)sx127x_reg_read(dev,
SX127X_REG_FRFLSB))) *
(double)LORA_FREQUENCY_RESOLUTION_DEFAULT;
/* Cut the PA just in case, RFO output, power = -1 dBm */ /* Cut the PA just in case, RFO output, power = -1 dBm */
sx127x_reg_write(dev, SX127X_REG_PACONFIG, 0x00); sx127x_reg_write(dev, SX127X_REG_PACONFIG, 0x00);
@ -136,8 +138,7 @@ void sx1276_rx_chain_calibration(sx127x_t *dev)
| SX127X_RF_IMAGECAL_IMAGECAL_START); | SX127X_RF_IMAGECAL_IMAGECAL_START);
while ((sx127x_reg_read(dev, SX127X_REG_IMAGECAL) & SX127X_RF_IMAGECAL_IMAGECAL_RUNNING) while ((sx127x_reg_read(dev, SX127X_REG_IMAGECAL) & SX127X_RF_IMAGECAL_IMAGECAL_RUNNING)
== SX127X_RF_IMAGECAL_IMAGECAL_RUNNING) { == SX127X_RF_IMAGECAL_IMAGECAL_RUNNING) {}
}
/* Set a frequency in HF band */ /* Set a frequency in HF band */
sx127x_set_channel(dev, SX127X_HF_CHANNEL_DEFAULT); sx127x_set_channel(dev, SX127X_HF_CHANNEL_DEFAULT);
@ -148,8 +149,7 @@ void sx1276_rx_chain_calibration(sx127x_t *dev)
(sx127x_reg_read(dev, SX127X_REG_IMAGECAL) & SX127X_RF_IMAGECAL_IMAGECAL_MASK) (sx127x_reg_read(dev, SX127X_REG_IMAGECAL) & SX127X_RF_IMAGECAL_IMAGECAL_MASK)
| SX127X_RF_IMAGECAL_IMAGECAL_START); | SX127X_RF_IMAGECAL_IMAGECAL_START);
while ((sx127x_reg_read(dev, SX127X_REG_IMAGECAL) & SX127X_RF_IMAGECAL_IMAGECAL_RUNNING) while ((sx127x_reg_read(dev, SX127X_REG_IMAGECAL) & SX127X_RF_IMAGECAL_IMAGECAL_RUNNING)
== SX127X_RF_IMAGECAL_IMAGECAL_RUNNING) { == SX127X_RF_IMAGECAL_IMAGECAL_RUNNING) {}
}
/* Restore context */ /* Restore context */
sx127x_reg_write(dev, SX127X_REG_PACONFIG, reg_pa_config_init_val); sx127x_reg_write(dev, SX127X_REG_PACONFIG, reg_pa_config_init_val);

14
drivers/sx127x/sx127x_netdev.c
View File

@ -110,6 +110,7 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
sx127x_t *dev = (sx127x_t *)netdev; sx127x_t *dev = (sx127x_t *)netdev;
volatile uint8_t irq_flags = 0; volatile uint8_t irq_flags = 0;
uint8_t size = 0; uint8_t size = 0;
switch (dev->settings.modem) { switch (dev->settings.modem) {
case SX127X_MODEM_FSK: case SX127X_MODEM_FSK:
/* todo */ /* todo */
@ -153,10 +154,12 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
packet_info->rssi = SX127X_RSSI_OFFSET + rssi + (rssi >> 4) + packet_info->snr; packet_info->rssi = SX127X_RSSI_OFFSET + rssi + (rssi >> 4) + packet_info->snr;
#else /* MODULE_SX1276 */ #else /* MODULE_SX1276 */
if (dev->settings.channel > SX127X_RF_MID_BAND_THRESH) { if (dev->settings.channel > SX127X_RF_MID_BAND_THRESH) {
packet_info->rssi = SX127X_RSSI_OFFSET_HF + rssi + (rssi >> 4) + packet_info->snr; packet_info->rssi = SX127X_RSSI_OFFSET_HF + rssi + (rssi >> 4) +
packet_info->snr;
} }
else { else {
packet_info->rssi = SX127X_RSSI_OFFSET_LF + rssi + (rssi >> 4) + packet_info->snr; packet_info->rssi = SX127X_RSSI_OFFSET_LF + rssi + (rssi >> 4) +
packet_info->snr;
} }
#endif #endif
} }
@ -206,6 +209,7 @@ static int _init(netdev_t *netdev)
sx127x->irq = 0; sx127x->irq = 0;
sx127x_radio_settings_t settings; sx127x_radio_settings_t settings;
settings.channel = SX127X_CHANNEL_DEFAULT; settings.channel = SX127X_CHANNEL_DEFAULT;
settings.modem = SX127X_MODEM_DEFAULT; settings.modem = SX127X_MODEM_DEFAULT;
settings.state = SX127X_RF_IDLE; settings.state = SX127X_RF_IDLE;
@ -305,7 +309,9 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
case NETOPT_CHANNEL_HOP: case NETOPT_CHANNEL_HOP:
assert(max_len >= sizeof(netopt_enable_t)); assert(max_len >= sizeof(netopt_enable_t));
*((netopt_enable_t*) val) = (dev->settings.lora.flags & SX127X_CHANNEL_HOPPING_FLAG) ? NETOPT_ENABLE : NETOPT_DISABLE; *((netopt_enable_t *)val) =
(dev->settings.lora.flags &
SX127X_CHANNEL_HOPPING_FLAG) ? NETOPT_ENABLE : NETOPT_DISABLE;
return sizeof(netopt_enable_t); return sizeof(netopt_enable_t);
case NETOPT_CHANNEL_HOP_PERIOD: case NETOPT_CHANNEL_HOP_PERIOD:
@ -532,8 +538,10 @@ static int _set_state(sx127x_t *dev, netopt_state_t state)
static int _get_state(sx127x_t *dev, void *val) static int _get_state(sx127x_t *dev, void *val)
{ {
uint8_t op_mode; uint8_t op_mode;
op_mode = sx127x_get_op_mode(dev); op_mode = sx127x_get_op_mode(dev);
netopt_state_t state = NETOPT_STATE_OFF; netopt_state_t state = NETOPT_STATE_OFF;
switch (op_mode) { switch (op_mode) {
case SX127X_RF_OPMODE_SLEEP: case SX127X_RF_OPMODE_SLEEP:
state = NETOPT_STATE_SLEEP; state = NETOPT_STATE_SLEEP;