From c3a5b21b38cd9dbce0d1d89513ba97f98bfb2766 Mon Sep 17 00:00:00 2001
From: razvanm <razvanm>
Date: Thu, 26 Jun 2008 18:30:21 +0000
Subject: [PATCH] Address Vlado's comments and improve the GoldenImage's
 README.

---
 apps/tests/deluge/Blink/BlinkAppC.nc            | 11 ++++-------
 .../{GoldenImageC.nc => GoldenImageAppC.nc}     |  2 +-
 apps/tests/deluge/GoldenImage/Makefile          |  5 +++--
 apps/tests/deluge/GoldenImage/README.txt        | 17 ++++-------------
 4 files changed, 12 insertions(+), 23 deletions(-)
 rename apps/tests/deluge/GoldenImage/{GoldenImageC.nc => GoldenImageAppC.nc} (97%)

diff --git a/apps/tests/deluge/Blink/BlinkAppC.nc b/apps/tests/deluge/Blink/BlinkAppC.nc
index 1a09d0ff..2189ce46 100644
--- 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/GoldenImageC.nc b/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
similarity index 97%
rename from apps/tests/deluge/GoldenImage/GoldenImageC.nc
rename to apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
index d99c2c9c..f27635f4 100644
--- a/apps/tests/deluge/GoldenImage/GoldenImageC.nc
+++ b/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
@@ -24,7 +24,7 @@
  * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
  */
 
-configuration GoldenImageC {}
+configuration GoldenImageAppC {}
 
 implementation
 {
diff --git a/apps/tests/deluge/GoldenImage/Makefile b/apps/tests/deluge/GoldenImage/Makefile
index cbdea503..caf65c10 100644
--- 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 39dd3f59..b3e140ea 100644
--- 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:
 
-- 
2.39.2