RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/sx127x: cleanup RX/TX timers

Browse Source
This commit is contained in:
Alexandre Abadie 2017-12-07 17:26:07 +01:00
parent 2320c269c1
commit 32b1ee3baf
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/include/sx127x.h
View File

@ -176,7 +176,6 @@ typedef struct {
*/
typedef struct {
uint32_t channel; /**< Radio channel */
uint32_t window_timeout; /**< Timeout window */
uint8_t state; /**< Radio state */
uint8_t modem; /**< Driver model (FSK or LoRa) */
sx127x_lora_settings_t lora; /**< LoRa settings */

10
drivers/sx127x/sx127x_getset.c
View File

@ -309,9 +309,8 @@ void sx127x_set_rx(sx127x_t *dev)
}
sx127x_set_state(dev, SX127X_RF_RX_RUNNING);
if (dev->settings.window_timeout != 0) {
xtimer_set(&(dev->_internal.rx_timeout_timer),
dev->settings.window_timeout);
if (dev->settings.lora.rx_timeout != 0) {
xtimer_set(&(dev->_internal.rx_timeout_timer), dev->settings.lora.rx_timeout);
}
if (dev->settings.lora.flags & SX127X_RX_CONTINUOUS_FLAG) {
@ -372,9 +371,8 @@ void sx127x_set_tx(sx127x_t *dev)
}
sx127x_set_state(dev, SX127X_RF_RX_RUNNING);
if (dev->settings.window_timeout != 0) {
xtimer_set(&(dev->_internal.tx_timeout_timer),
dev->settings.window_timeout);
if (dev->settings.lora.tx_timeout != 0) {
xtimer_set(&(dev->_internal.tx_timeout_timer), dev->settings.lora.tx_timeout);
}
sx127x_set_op_mode(dev, SX127X_RF_OPMODE_TRANSMITTER );
}

2
drivers/sx127x/sx127x_netdev.c
View File

@ -500,8 +500,8 @@ static int _set_state(sx127x_t *dev, netopt_state_t state)
break;
case NETOPT_STATE_IDLE:
dev->settings.window_timeout = 0;
/* set permanent listening */
sx127x_set_rx_timeout(dev, 0);
sx127x_set_rx(dev);
break;

1
tests/driver_sx127x/main.c
View File

@ -241,6 +241,7 @@ int listen_cmd(int argc, char **argv)
/* Switch to continuous listen mode */
netdev->driver->set(netdev, NETOPT_SINGLE_RECEIVE, false, sizeof(uint8_t));
netdev->driver->set(netdev, NETOPT_RX_TIMEOUT, 0, sizeof(uint8_t));
/* Switch to RX state */
uint8_t state = NETOPT_STATE_RX;