From d5016f4dac85a26df066061143428839649f4f93 Mon Sep 17 00:00:00 2001 From: klueska Date: Tue, 9 Feb 2010 22:49:44 +0000 Subject: [PATCH] Fixed TestJoin README and javadoc --- apps/tosthreads/apps/TestJoin/README | 15 +++++++++++---- apps/tosthreads/apps/TestJoin/TestJoinAppC.nc | 15 +++++++++++---- apps/tosthreads/apps/TestJoin/TestJoinC.nc | 15 +++++++++++---- apps/tosthreads/capps/TestJoin/README | 14 +++++++++++--- apps/tosthreads/capps/TestJoin/TestJoin.c | 14 +++++++++++--- 5 files changed, 55 insertions(+), 18 deletions(-) diff --git a/apps/tosthreads/apps/TestJoin/README b/apps/tosthreads/apps/TestJoin/README index 10719d87..2f45af0d 100644 --- a/apps/tosthreads/apps/TestJoin/README +++ b/apps/tosthreads/apps/TestJoin/README @@ -13,10 +13,17 @@ You can install TestJoin on a mote via the following command: Valid platforms are currently: tmote, telosb, iris, mica2, micaz, and epic -Upon a successful burn, you should see LED2 toggles at the end of each time -period. In addition, during each time period, LED0 should toggle twice, and LED1 -toggles four times (with an interval of 1 sec). This LED behavior repeats in the -next time period. +Upon a successful burn, you should see all LEDs toggle in the following pattern, +repeating every 8 seconds: + +0s: (110) LED0 ON, LED1 ON, LED2 OFF +1s: (000) LED0 OFF, LED1 OFF, LED2 OFF +2s: (010) LED0 OFF, LED1 ON, LED2 OFF +3s: (000) LED0 OFF, LED1 OFF, LED2 OFF +4s: (111) LED0 ON, LED1 ON, LED2 ON +5s: (001) LED0 OFF, LED1 OFF, LED2 ON +6s: (011) LED0 OFF, LED1 ON, LED2 ON +7s: (001) LED0 OFF, LED1 OFF, LED2 ON Tools: None. diff --git a/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc b/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc index 08e106aa..9b875e64 100644 --- a/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc +++ b/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc @@ -34,10 +34,17 @@ * the join() system call for waiting on a set of threads in a TOSThreads * based application. * - * Upon a successful burn, you should see LED2 toggles at the end of each time - * period. In addition, during each time period, LED0 should toggle twice, and LED1 - * toggles four times (with an interval of 1 sec). This LED behavior repeats in the - * next time period. + * Upon a successful burn, you should see all LEDs toggle in the following pattern, + * repeating every 8 seconds: + * + * 0s: (110) LED0 ON, LED1 ON, LED2 OFF
+ * 1s: (000) LED0 OFF, LED1 OFF, LED2 OFF
+ * 2s: (010) LED0 OFF, LED1 ON, LED2 OFF
+ * 3s: (000) LED0 OFF, LED1 OFF, LED2 OFF
+ * 4s: (111) LED0 ON, LED1 ON, LED2 ON
+ * 5s: (001) LED0 OFF, LED1 OFF, LED2 ON
+ * 6s: (011) LED0 OFF, LED1 ON, LED2 ON
+ * 7s: (001) LED0 OFF, LED1 OFF, LED2 ON
* * @author Kevin Klues (klueska@cs.stanford.edu) */ diff --git a/apps/tosthreads/apps/TestJoin/TestJoinC.nc b/apps/tosthreads/apps/TestJoin/TestJoinC.nc index 58485f1a..ada03332 100644 --- a/apps/tosthreads/apps/TestJoin/TestJoinC.nc +++ b/apps/tosthreads/apps/TestJoin/TestJoinC.nc @@ -34,10 +34,17 @@ * the join() system call for waiting on a set of threads in a TOSThreads * based application. * - * Upon a successful burn, you should see LED2 toggles at the end of each time - * period. In addition, during each time period, LED0 should toggle twice, and LED1 - * toggles four times (with an interval of 1 sec). This LED behavior repeats in the - * next time period. + * Upon a successful burn, you should see all LEDs toggle in the following pattern, + * repeating every 8 seconds: + * + * 0s: (110) LED0 ON, LED1 ON, LED2 OFF
+ * 1s: (000) LED0 OFF, LED1 OFF, LED2 OFF
+ * 2s: (010) LED0 OFF, LED1 ON, LED2 OFF
+ * 3s: (000) LED0 OFF, LED1 OFF, LED2 OFF
+ * 4s: (111) LED0 ON, LED1 ON, LED2 ON
+ * 5s: (001) LED0 OFF, LED1 OFF, LED2 ON
+ * 6s: (011) LED0 OFF, LED1 ON, LED2 ON
+ * 7s: (001) LED0 OFF, LED1 OFF, LED2 ON
* * @author Kevin Klues (klueska@cs.stanford.edu) */ diff --git a/apps/tosthreads/capps/TestJoin/README b/apps/tosthreads/capps/TestJoin/README index 424e07b2..35eba606 100644 --- a/apps/tosthreads/capps/TestJoin/README +++ b/apps/tosthreads/capps/TestJoin/README @@ -13,9 +13,17 @@ You can install TestJoin on a mote via the following command: Valid platforms are currently: tmote, telosb, iris, mica2, micaz, and epic -Upon a successful burn, you should first see LED0 flash twice with a period of -1s and LED1 flash 4 times with a period of 1s. After these are done, -LED2 should come on and stay on. +Upon a successful burn, you should see all LEDs toggle in the following pattern, +repeating every 8 seconds: + +0s: (110) LED0 ON, LED1 ON, LED2 OFF +1s: (000) LED0 OFF, LED1 OFF, LED2 OFF +2s: (010) LED0 OFF, LED1 ON, LED2 OFF +3s: (000) LED0 OFF, LED1 OFF, LED2 OFF +4s: (111) LED0 ON, LED1 ON, LED2 ON +5s: (001) LED0 OFF, LED1 OFF, LED2 ON +6s: (011) LED0 OFF, LED1 ON, LED2 ON +7s: (001) LED0 OFF, LED1 OFF, LED2 ON Tools: None. diff --git a/apps/tosthreads/capps/TestJoin/TestJoin.c b/apps/tosthreads/capps/TestJoin/TestJoin.c index 5952d397..3ff35b57 100644 --- a/apps/tosthreads/capps/TestJoin/TestJoin.c +++ b/apps/tosthreads/capps/TestJoin/TestJoin.c @@ -34,9 +34,17 @@ * the join() system call for waiting on a set of threads in a TOSThreads * based application. * - * Upon a successful burn, you should first see LED0 flash twice with a period of - * 1s and LED1 flash 4 times with a period of 1s. After these are done, - * LED2 should come on and stay on. + * Upon a successful burn, you should see all LEDs toggle in the following pattern, + * repeating every 8 seconds: + * + * 0s: (110) LED0 ON, LED1 ON, LED2 OFF
+ * 1s: (000) LED0 OFF, LED1 OFF, LED2 OFF
+ * 2s: (010) LED0 OFF, LED1 ON, LED2 OFF
+ * 3s: (000) LED0 OFF, LED1 OFF, LED2 OFF
+ * 4s: (111) LED0 ON, LED1 ON, LED2 ON
+ * 5s: (001) LED0 OFF, LED1 OFF, LED2 ON
+ * 6s: (011) LED0 OFF, LED1 ON, LED2 ON
+ * 7s: (001) LED0 OFF, LED1 OFF, LED2 ON
* * @author Kevin Klues (klueska@cs.stanford.edu) */ -- 2.39.2