Fixed TestJoin README and javadoc

diff --git a/apps/tosthreads/apps/TestJoin/README b/apps/tosthreads/apps/TestJoin/README
index 10719d87697aadde82470ae37666418552415363..2f45af0d3d7fe9fbfc4314d2058c5eb35cfbaebb 100644 (file)
--- 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 08e106aaa132f1225e97fe5558b4bfc2f2788824..9b875e640971f2a47fa483c64226c3b1c5f4c539 100644 (file)
--- 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  <br>
+ * 1s: (000) LED0 OFF, LED1 OFF, LED2 OFF  <br>
+ * 2s: (010) LED0 OFF, LED1  ON, LED2 OFF  <br>
+ * 3s: (000) LED0 OFF, LED1 OFF, LED2 OFF  <br>
+ * 4s: (111) LED0  ON, LED1  ON, LED2  ON  <br>
+ * 5s: (001) LED0 OFF, LED1 OFF, LED2  ON  <br>
+ * 6s: (011) LED0 OFF, LED1  ON, LED2  ON  <br>
+ * 7s: (001) LED0 OFF, LED1 OFF, LED2  ON  <br>
  *
  * @author Kevin Klues (klueska@cs.stanford.edu)
  */

diff --git a/apps/tosthreads/apps/TestJoin/TestJoinC.nc b/apps/tosthreads/apps/TestJoin/TestJoinC.nc
index 58485f1a1aa4b5e91542ea7c009c1a3654a03e75..ada03332d676a8fa2a202c7a58b0becdda415b02 100644 (file)
--- 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  <br>
+ * 1s: (000) LED0 OFF, LED1 OFF, LED2 OFF  <br>
+ * 2s: (010) LED0 OFF, LED1  ON, LED2 OFF  <br>
+ * 3s: (000) LED0 OFF, LED1 OFF, LED2 OFF  <br>
+ * 4s: (111) LED0  ON, LED1  ON, LED2  ON  <br>
+ * 5s: (001) LED0 OFF, LED1 OFF, LED2  ON  <br>
+ * 6s: (011) LED0 OFF, LED1  ON, LED2  ON  <br>
+ * 7s: (001) LED0 OFF, LED1 OFF, LED2  ON  <br>
  *
  * @author Kevin Klues (klueska@cs.stanford.edu)
  */

diff --git a/apps/tosthreads/capps/TestJoin/README b/apps/tosthreads/capps/TestJoin/README
index 424e07b2c6d35a6b021af0ab054b9159f3a8abcf..35eba606d0baa86923a8eb458d7e9d50b333eff0 100644 (file)
--- 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 5952d39709648b516ebadece8b94238ca6d07bf6..3ff35b57962a74316f7c1253043639f48c90f9fd 100644 (file)
--- 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  <br>
+ * 1s: (000) LED0 OFF, LED1 OFF, LED2 OFF  <br>
+ * 2s: (010) LED0 OFF, LED1  ON, LED2 OFF  <br>
+ * 3s: (000) LED0 OFF, LED1 OFF, LED2 OFF  <br>
+ * 4s: (111) LED0  ON, LED1  ON, LED2  ON  <br>
+ * 5s: (001) LED0 OFF, LED1 OFF, LED2  ON  <br>
+ * 6s: (011) LED0 OFF, LED1  ON, LED2  ON  <br>
+ * 7s: (001) LED0 OFF, LED1 OFF, LED2  ON  <br>
  *
  * @author Kevin Klues (klueska@cs.stanford.edu)
  */