bugfix: including random.h to avoid random_rand() assumed signed, and timer intervals becoming very very small
This commit is contained in:
parent
8516626703
commit
ab61e8b8b5
1 changed files with 8 additions and 6 deletions
|
@ -28,7 +28,7 @@
|
||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: example-collect.c,v 1.5 2009/02/11 11:08:56 adamdunkels Exp $
|
* $Id: example-collect.c,v 1.6 2009/02/17 08:44:44 fros4943 Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "lib/rand.h"
|
#include "lib/random.h"
|
||||||
#include "net/rime.h"
|
#include "net/rime.h"
|
||||||
#include "net/rime/collect.h"
|
#include "net/rime/collect.h"
|
||||||
#include "net/rime/neighbor.h"
|
#include "net/rime/neighbor.h"
|
||||||
|
@ -75,6 +75,7 @@ PROCESS_THREAD(example_collect_process, ev, data)
|
||||||
|
|
||||||
while(1) {
|
while(1) {
|
||||||
static struct etimer et;
|
static struct etimer et;
|
||||||
|
uint16_t tmp;
|
||||||
|
|
||||||
/* Send a packet every 16 seconds; first wait 8 seconds, than a
|
/* Send a packet every 16 seconds; first wait 8 seconds, than a
|
||||||
random time between 0 and 8 seconds. */
|
random time between 0 and 8 seconds. */
|
||||||
|
@ -83,6 +84,7 @@ PROCESS_THREAD(example_collect_process, ev, data)
|
||||||
PROCESS_WAIT_EVENT();
|
PROCESS_WAIT_EVENT();
|
||||||
|
|
||||||
if(etimer_expired(&et)) {
|
if(etimer_expired(&et)) {
|
||||||
|
printf("Sending\n");
|
||||||
rimebuf_clear();
|
rimebuf_clear();
|
||||||
rimebuf_set_datalen(sprintf(rimebuf_dataptr(),
|
rimebuf_set_datalen(sprintf(rimebuf_dataptr(),
|
||||||
"%s", "Hello") + 1);
|
"%s", "Hello") + 1);
|
||||||
|
@ -91,7 +93,7 @@ PROCESS_THREAD(example_collect_process, ev, data)
|
||||||
|
|
||||||
if(ev == sensors_event) {
|
if(ev == sensors_event) {
|
||||||
if(data == &button_sensor) {
|
if(data == &button_sensor) {
|
||||||
printf("Button\n");
|
printf("I am sink\n");
|
||||||
collect_set_sink(&tc, 1);
|
collect_set_sink(&tc, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue