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

Keep cca scan function separated

Browse source 
modified:   examples/rf_environment/rf_environment.c
This commit is contained in:
Robert Olsson 2017-05-23 21:07:59 +02:00
parent 18cfaf7fa2
commit b4ef18b2fa
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
examples/rf_environment/rf_environment.c
View file

@ -132,6 +132,25 @@ set_cca_thresh(radio_value_t thresh)
} }
return 0; return 0;
} }
void
do_all_chan_cca(int *cca, int try)
{
int j;
for(j = 0; j < 16; j++) {
set_chan(j+11);
cca[j] = 0;
#ifdef CONTIKI_TARGET_AVR_RSS2
watchdog_periodic();
#endif
NETSTACK_RADIO.on();
for(i = 0; i < try; i++) {
cca[j] += NETSTACK_RADIO.channel_clear();
}
NETSTACK_RADIO.off();
}
}
PROCESS_THREAD(rf_scan_process, ev, data) PROCESS_THREAD(rf_scan_process, ev, data)
{ {
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -155,18 +174,9 @@ PROCESS_THREAD(rf_scan_process, ev, data)
for(k = -90; k <= -60; k += 2) { for(k = -90; k <= -60; k += 2) {
set_cca_thresh(k); set_cca_thresh(k);
for(j = 0; j < 16; j++) {
set_chan(j+11); do_all_chan_cca(cca, SAMPLES);
cca[j] = 0;
#ifdef CONTIKI_TARGET_AVR_RSS2
watchdog_periodic();
#endif
NETSTACK_RADIO.on();
for(i = 0; i < SAMPLES; i++) {
cca[j] += NETSTACK_RADIO.channel_clear();
}
NETSTACK_RADIO.off();
}
printf("cca_thresh=%-3ddBm", get_cca_thresh()); printf("cca_thresh=%-3ddBm", get_cca_thresh());
worst = 0; worst = 0;