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

Updated the Rime channel numbers so that all examples can be run in the same network without channel clashes

Browse source
This commit is contained in:
adamdunkels 2009-10-18 17:52:08 +00:00
parent f97cbce055
commit e14a30262c
11 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/rime/example-collect.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-collect.c,v 1.8 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: example-collect.c,v 1.9 2009/10/18 17:52:08 adamdunkels Exp $
*/ */
/** /**
@ -71,7 +71,7 @@ PROCESS_THREAD(example_collect_process, ev, data)
{ {
PROCESS_BEGIN(); PROCESS_BEGIN();
collect_open(&tc, 128, &callbacks); collect_open(&tc, 130, &callbacks);
while(1) { while(1) {
static struct etimer et; static struct etimer et;

10
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.4 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: example-mesh.c,v 1.5 2009/10/18 17:52:08 adamdunkels Exp $
*/ */
/** /**
@ -64,7 +64,7 @@ timedout(struct mesh_conn *c)
printf("packet timedout\n"); printf("packet timedout\n");
} }
static void static void
recv(struct mesh_conn *c, rimeaddr_t *from, uint8_t hops) recv(struct mesh_conn *c, const rimeaddr_t *from, uint8_t hops)
{ {
printf("Data received from %d.%d: %.*s (%d)\n", printf("Data received from %d.%d: %.*s (%d)\n",
from->u8[0], from->u8[1], from->u8[0], from->u8[1],
@ -81,7 +81,7 @@ PROCESS_THREAD(example_mesh_process, ev, data)
PROCESS_EXITHANDLER(mesh_close(&mesh);) PROCESS_EXITHANDLER(mesh_close(&mesh);)
PROCESS_BEGIN(); PROCESS_BEGIN();
mesh_open(&mesh, 128, &callbacks); mesh_open(&mesh, 132, &callbacks);
button_sensor.activate(); button_sensor.activate();
@ -101,8 +101,8 @@ PROCESS_THREAD(example_mesh_process, ev, data)
*/ */
packetbuf_copyfrom("Hej", 3); packetbuf_copyfrom("Hej", 3);
addr.u8[0] = 161; addr.u8[0] = 1;
addr.u8[1] = 161; addr.u8[1] = 0;
mesh_send(&mesh, &addr); mesh_send(&mesh, &addr);
} }
PROCESS_END(); PROCESS_END();

4
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.4 2009/03/23 18:10:09 adamdunkels Exp $ * $Id: example-multihop.c,v 1.5 2009/10/18 17:52:08 adamdunkels Exp $
*/ */
/** /**
@ -81,7 +81,7 @@
#include <stdio.h> #include <stdio.h>
#define CHANNEL 128 #define CHANNEL 135
struct example_neighbor { struct example_neighbor {

2
examples/rime/example-polite.c
View file

@ -33,7 +33,7 @@ PROCESS_THREAD(example_polite_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
polite_open(&c, 128, &callbacks); polite_open(&c, 136, &callbacks);
while(1) { while(1) {
static struct etimer et; static struct etimer et;

4
examples/rime/example-rucb.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-rucb.c,v 1.5 2008/11/17 22:52:10 oliverschmidt Exp $ * $Id: example-rucb.c,v 1.6 2009/10/18 17:52:08 adamdunkels Exp $
*/ */
/** /**
@ -115,7 +115,7 @@ PROCESS_THREAD(example_rucb_process, ev, data)
PROCESS_PAUSE(); PROCESS_PAUSE();
rucb_open(&rucb, 128, &rucb_call); rucb_open(&rucb, 137, &rucb_call);
button_sensor.activate(); button_sensor.activate();
PROCESS_PAUSE(); PROCESS_PAUSE();

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.2 2009/02/27 14:28:02 nvt-se Exp $ * $Id: example-rudolph0.c,v 1.3 2009/10/18 17:52:09 adamdunkels Exp $
*/ */
/** /**
@ -123,7 +123,7 @@ PROCESS_THREAD(example_rudolph0_process, ev, data)
PROCESS_PAUSE(); PROCESS_PAUSE();
rudolph0_open(&rudolph0, 128, &rudolph0_call); rudolph0_open(&rudolph0, 138, &rudolph0_call);
button_sensor.activate(); button_sensor.activate();
while(1) { while(1) {

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.4 2009/02/27 14:28:02 nvt-se Exp $ * $Id: example-rudolph1.c,v 1.5 2009/10/18 17:52:09 adamdunkels Exp $
*/ */
/** /**
@ -159,7 +159,7 @@ PROCESS_THREAD(example_rudolph1_process, ev, data)
PROCESS_PAUSE(); PROCESS_PAUSE();
rudolph1_open(&rudolph1, 128, &rudolph1_call); rudolph1_open(&rudolph1, 140, &rudolph1_call);
button_sensor.activate(); button_sensor.activate();
rtimer_set(&t, RTIMER_NOW() + RTIMER_ARCH_SECOND, 1, rtimer_set(&t, RTIMER_NOW() + RTIMER_ARCH_SECOND, 1,

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.3 2009/02/27 14:28:02 nvt-se Exp $ * $Id: example-rudolph2.c,v 1.4 2009/10/18 17:52:09 adamdunkels Exp $
*/ */
/** /**
@ -145,7 +145,7 @@ PROCESS_THREAD(example_rudolph2_process, ev, data)
PROCESS_PAUSE(); PROCESS_PAUSE();
rudolph2_open(&rudolph2, 128, &rudolph2_call); rudolph2_open(&rudolph2, 142, &rudolph2_call);
button_sensor.activate(); button_sensor.activate();
PROCESS_PAUSE(); PROCESS_PAUSE();

4
examples/rime/example-runicast.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-runicast.c,v 1.5 2009/05/06 15:03:49 adamdunkels Exp $ * $Id: example-runicast.c,v 1.6 2009/10/18 17:52:09 adamdunkels Exp $
*/ */
/** /**
@ -123,7 +123,7 @@ PROCESS_THREAD(test_runicast_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
runicast_open(&runicast, 128, &runicast_callbacks); runicast_open(&runicast, 144, &runicast_callbacks);
/* OPTIONAL: Sender history */ /* OPTIONAL: Sender history */
list_init(history_table); list_init(history_table);

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.2 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: example-trickle.c,v 1.3 2009/10/18 17:52:09 adamdunkels Exp $
*/ */
/** /**
@ -65,7 +65,7 @@ PROCESS_THREAD(example_trickle_process, ev, data)
PROCESS_EXITHANDLER(trickle_close(&trickle);) PROCESS_EXITHANDLER(trickle_close(&trickle);)
PROCESS_BEGIN(); PROCESS_BEGIN();
trickle_open(&trickle, CLOCK_SECOND, 128, &trickle_call); trickle_open(&trickle, CLOCK_SECOND, 145, &trickle_call);
button_sensor.activate(); button_sensor.activate();
while(1) { while(1) {

4
examples/rime/example-unicast.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-unicast.c,v 1.2 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: example-unicast.c,v 1.3 2009/10/18 17:52:09 adamdunkels Exp $
*/ */
/** /**
@ -66,7 +66,7 @@ PROCESS_THREAD(example_unicast_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
unicast_open(&uc, 128, &unicast_callbacks); unicast_open(&uc, 146, &unicast_callbacks);
while(1) { while(1) {
static struct etimer et; static struct etimer et;