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

fixed to compile with new sensors API

Browse source
This commit is contained in:
joxe 2010-01-14 14:32:22 +00:00
parent 480f72c95c
commit a6abcbe578
7 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/rime/example-mesh.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-mesh.c,v 1.5 2009/10/18 17:52:08 adamdunkels Exp $ * $Id: example-mesh.c,v 1.6 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -83,7 +83,7 @@ PROCESS_THREAD(example_mesh_process, ev, data)
mesh_open(&mesh, 132, &callbacks); mesh_open(&mesh, 132, &callbacks);
button_sensor.activate(); button_sensor.configure(SENSORS_ACTIVE, (void *) 1);
while(1) { while(1) {
rimeaddr_t addr; rimeaddr_t addr;

4
examples/rime/example-meshconn.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-meshconn.c,v 1.2 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: example-meshconn.c,v 1.3 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -95,8 +95,6 @@ PROCESS_THREAD(test_meshconn_process, ev, data)
meshconn_open(&meshconn, 128, &callbacks); meshconn_open(&meshconn, 128, &callbacks);
/* button_sensor.activate();*/
while(1) { while(1) {
rimeaddr_t addr; rimeaddr_t addr;
static struct etimer et; static struct etimer et;

6
examples/rime/example-multihop.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-multihop.c,v 1.5 2009/10/18 17:52:08 adamdunkels Exp $ * $Id: example-multihop.c,v 1.6 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -220,8 +220,8 @@ PROCESS_THREAD(example_multihop_process, ev, data)
received_announcement); received_announcement);
/* Activate the button sensor. We use the button to drive traffic - /* Activate the button sensor. We use the button to drive traffic -
when the btton is pressed, a packet is sent. */ when the button is pressed, a packet is sent. */
button_sensor.activate(); button_sensor.configure(SENSORS_ACTIVE, (void *) 1);
/* Loop forever, send a packet when the button is pressed. */ /* Loop forever, send a packet when the button is pressed. */
while(1) { while(1) {

4
examples/rime/example-rudolph0.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-rudolph0.c,v 1.3 2009/10/18 17:52:09 adamdunkels Exp $ * $Id: example-rudolph0.c,v 1.4 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -124,7 +124,7 @@ PROCESS_THREAD(example_rudolph0_process, ev, data)
rudolph0_open(&rudolph0, 138, &rudolph0_call); rudolph0_open(&rudolph0, 138, &rudolph0_call);
button_sensor.activate(); button_sensor.configure(SENSORS_ACTIVE, (void *) 1);
while(1) { while(1) {
PROCESS_WAIT_EVENT_UNTIL(ev == sensors_event && PROCESS_WAIT_EVENT_UNTIL(ev == sensors_event &&

4
examples/rime/example-rudolph1.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-rudolph1.c,v 1.5 2009/10/18 17:52:09 adamdunkels Exp $ * $Id: example-rudolph1.c,v 1.6 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -160,7 +160,7 @@ PROCESS_THREAD(example_rudolph1_process, ev, data)
rudolph1_open(&rudolph1, 140, &rudolph1_call); rudolph1_open(&rudolph1, 140, &rudolph1_call);
button_sensor.activate(); button_sensor.configure(SENSORS_ACTIVE, (void *) 1);
rtimer_set(&t, RTIMER_NOW() + RTIMER_ARCH_SECOND, 1, rtimer_set(&t, RTIMER_NOW() + RTIMER_ARCH_SECOND, 1,
log_queuelen, NULL); log_queuelen, NULL);

4
examples/rime/example-rudolph2.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-rudolph2.c,v 1.4 2009/10/18 17:52:09 adamdunkels Exp $ * $Id: example-rudolph2.c,v 1.5 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -146,7 +146,7 @@ PROCESS_THREAD(example_rudolph2_process, ev, data)
rudolph2_open(&rudolph2, 142, &rudolph2_call); rudolph2_open(&rudolph2, 142, &rudolph2_call);
button_sensor.activate(); button_sensor.configure(SENSORS_ACTIVE, (void *) 1);
PROCESS_PAUSE(); PROCESS_PAUSE();

4
examples/rime/example-trickle.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-trickle.c,v 1.3 2009/10/18 17:52:09 adamdunkels Exp $ * $Id: example-trickle.c,v 1.4 2010/01/14 14:32:22 joxe Exp $
*/ */
/** /**
@ -66,7 +66,7 @@ PROCESS_THREAD(example_trickle_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
trickle_open(&trickle, CLOCK_SECOND, 145, &trickle_call); trickle_open(&trickle, CLOCK_SECOND, 145, &trickle_call);
button_sensor.activate(); button_sensor.configure(SENSORS_ACTIVE, (void *) 1);
while(1) { while(1) {
PROCESS_WAIT_EVENT_UNTIL(ev == sensors_event && PROCESS_WAIT_EVENT_UNTIL(ev == sensors_event &&