Address Vlado's comments and improve the GoldenImage's README.

diff --git a/apps/tests/deluge/Blink/BlinkAppC.nc b/apps/tests/deluge/Blink/BlinkAppC.nc
index 1a09d0ff973ee06d4ba0f080cf27715cbd788522..2189ce46059aa1a8cfd8b75eb26dbc1255c01de1 100644 (file)
--- a/apps/tests/deluge/Blink/BlinkAppC.nc
+++ b/apps/tests/deluge/Blink/BlinkAppC.nc
@@ -37,20 +37,17 @@
  * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
  **/
 
-configuration BlinkAppC
-{
-}
+configuration BlinkAppC { }
+
 implementation
 {
   components MainC, BlinkC, LedsC;
-#ifdef DELUGE
+  components new TimerMilliC() as Timer0;
   components DelugeC;
+
   DelugeC.Leds -> LedsC;
-#endif
-  components new TimerMilliC() as Timer0;
 
   BlinkC -> MainC.Boot;
-
   BlinkC.Timer0 -> Timer0;
   BlinkC.Leds -> LedsC;
 }

diff --git a/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc b/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
new file mode 100644 (file)
index 0000000..f27635f
--- /dev/null
+++ b/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
@@ -0,0 +1,33 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+*  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+*  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+*  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+*  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+*  THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+configuration GoldenImageAppC {}
+
+implementation
+{
+  components DelugeC;
+}
+

diff --git a/apps/tests/deluge/GoldenImage/GoldenImageC.nc b/apps/tests/deluge/GoldenImage/GoldenImageC.nc
deleted file mode 100644 (file)
index d99c2c9..0000000
--- a/apps/tests/deluge/GoldenImage/GoldenImageC.nc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (c) 2007 Johns Hopkins University.
-*  All rights reserved.
-*
-*  Permission to use, copy, modify, and distribute this software and its
-*  documentation for any purpose, without fee, and without written
-*  agreement is hereby granted, provided that the above copyright
-*  notice, the (updated) modification history and the author appear in
-*  all copies of this source code.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
-*  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-*  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
-*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
-*  OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-*  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-*  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-*  THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
- * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
- * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
- */
-
-configuration GoldenImageC {}
-
-implementation
-{
-  components DelugeC;
-}
-

diff --git a/apps/tests/deluge/GoldenImage/Makefile b/apps/tests/deluge/GoldenImage/Makefile
index cbdea503867e808b070b18d8fc24fcf2089a2e7e..caf65c10909db995cc64301f7d87ba4a7f94cc77 100644 (file)
--- a/apps/tests/deluge/GoldenImage/Makefile
+++ b/apps/tests/deluge/GoldenImage/Makefile
@@ -1,6 +1,7 @@
-COMPONENT=GoldenImageC
+COMPONENT=GoldenImageAppC
 BOOTLOADER=tosboot
 
-CFLAGS += -DDELUGE_BASESTATION
+#CFLAGS += -DDELUGE_BASESTATION
+#CFLAGS += -DDELUGE_LIGHT_BASESTATION
 
 include $(MAKERULES)

diff --git a/apps/tests/deluge/GoldenImage/README.txt b/apps/tests/deluge/GoldenImage/README.txt
index 39dd3f59118e6b0737f8a78ae1ad74dca225c36b..b3e140eae8aeaf49d27ae3fc92be6bf95964cb6d 100644 (file)
--- a/apps/tests/deluge/GoldenImage/README.txt
+++ b/apps/tests/deluge/GoldenImage/README.txt
@@ -9,19 +9,10 @@ Description:
 This is a sample application for Deluge T2. The application is similar 
 to Null, but it includes Deluge T2.
 
-You can reprogram the whole network (non-basestation motes) by first 
-uploading the image to the base station. Then, tell the base station to 
-disseminate the image. Example:
-
-   tos-deluge /dev/ttyUSB0 telosb -d 0
-   
-Finally, after the image has been disseminated, instruct the base 
-station to disseminate the command to reprogram. Example:
-
-   tos-deluge /dev/ttyUSB0 telosb -r 0
-
-For a more detailed discussion on Deluge T2, please refer to the Deluge 
-T2 manual.
+To program a basestation (a mote which can accept images over the
+serial port) you have to add CFLAGS=-DDELUGE_BASESTATION to the make
+command. For telosb this might look like this:
+        CFLAGS=-DDELUGE_BASESTATION make telosb install bsl,/dev/ttyUSB0
 
 Prerequisites: