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

Fixed CC2420 to return RADIO_RESULT_INVALID_VALUE if trying to set a

Browse source 
transmission power outside the valid range instead of using closest
valid value.
This commit is contained in:
Niclas Finne 2014-04-13 21:43:37 +02:00
parent f0c48c55ca
commit 132b8dde3b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dev/cc2420/cc2420.c
View file

@ -246,15 +246,16 @@ set_value(radio_param_t param, radio_value_t value)
cc2420_set_channel(value); cc2420_set_channel(value);
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
case RADIO_PARAM_TXPOWER: case RADIO_PARAM_TXPOWER:
if(value < OUTPUT_POWER_MIN || value > OUTPUT_POWER_MAX) {
return RADIO_RESULT_INVALID_VALUE;
}
/* Find the closest higher PA_LEVEL for the desired output power */ /* Find the closest higher PA_LEVEL for the desired output power */
for(i = 1; i < OUTPUT_NUM; i++) { for(i = 1; i < OUTPUT_NUM; i++) {
if(value > output_power[i].power) { if(value > output_power[i].power) {
cc2420_set_txpower(output_power[i - 1].config); break;
return RADIO_RESULT_OK;
} }
} }
/* Set lowest output power */ cc2420_set_txpower(output_power[i - 1].config);
cc2420_set_txpower(output_power[OUTPUT_NUM - 1].config);
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
default: default:
return RADIO_RESULT_NOT_SUPPORTED; return RADIO_RESULT_NOT_SUPPORTED;