deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1370 from g-oikonomou/contrib/cc13xx/prop-mode

Browse source 
Improve the CC13xx sub-ghz driver
This commit is contained in:
Fredrik Österlind 2015-11-20 16:30:34 +01:00
parent 513d8bc9d5 b4393e861f
commit 9effff6526
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cpu/cc26xx-cc13xx/rf-core/prop-mode.c
View file

@ -647,6 +647,7 @@ static int
transmit(unsigned short transmit_len) transmit(unsigned short transmit_len)
{ {
int ret; int ret;
uint8_t was_off = 0;
uint32_t cmd_status; uint32_t cmd_status;
volatile rfc_CMD_PROP_TX_ADV_t *cmd_tx_adv; volatile rfc_CMD_PROP_TX_ADV_t *cmd_tx_adv;
@ -654,6 +655,7 @@ transmit(unsigned short transmit_len)
uint16_t total_length; uint16_t total_length;
if(!rf_is_on()) { if(!rf_is_on()) {
was_off = 1;
if(on() != RF_CORE_CMD_OK) { if(on() != RF_CORE_CMD_OK) {
PRINTF("transmit: on() failed\n"); PRINTF("transmit: on() failed\n");
return RADIO_TX_ERR; return RADIO_TX_ERR;
@ -739,6 +741,10 @@ transmit(unsigned short transmit_len)
rx_on_prop(); rx_on_prop();
if(was_off) {
off();
}
return ret; return ret;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -971,6 +977,8 @@ off(void)
rx_off_prop(); rx_off_prop();
rf_core_power_down(); rf_core_power_down();
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
/* Switch HF clock source to the RCOSC to preserve power */ /* Switch HF clock source to the RCOSC to preserve power */
oscillators_switch_to_hf_rc(); oscillators_switch_to_hf_rc();
@ -1058,6 +1066,12 @@ set_value(radio_param_t param, radio_value_t value)
return RADIO_RESULT_INVALID_VALUE; return RADIO_RESULT_INVALID_VALUE;
} }
if(get_channel() == (uint8_t)value) {
/* We already have that very same channel configured.
* Nothing to do here. */
return RADIO_RESULT_OK;
}
set_channel((uint8_t)value); set_channel((uint8_t)value);
break; break;
case RADIO_PARAM_TXPOWER: case RADIO_PARAM_TXPOWER: