Enable the Leds and the DELUGE_LIGHT_BASESTATION setting for GoldenImage.

diff --git a/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc b/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
index f27635f4171c890a81a6fd0f52af8ba1002ef70f..5847026eb10ebecf11a6999649329bd683bfd893 100644 (file)
--- a/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
+++ b/apps/tests/deluge/GoldenImage/GoldenImageAppC.nc
@@ -29,5 +29,8 @@ configuration GoldenImageAppC {}
 implementation
 {
   components DelugeC;
+  components LedsC;
+
+  DelugeC.Leds -> LedsC;
 }
 

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

diff --git a/apps/tests/deluge/GoldenImage/README.txt b/apps/tests/deluge/GoldenImage/README.txt
index 6b2a7f64cadcaa6ad0b1a96d37b8a480f0fedc02..6160096b31bc5a8deda7cace7624815b8b9150a9 100644 (file)
--- a/apps/tests/deluge/GoldenImage/README.txt
+++ b/apps/tests/deluge/GoldenImage/README.txt
@@ -7,12 +7,9 @@ Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
 Description:
 
 This is a sample application for Deluge T2. The application is similar 
-to Null, but it includes Deluge T2.
-
-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
+to Null, but it includes Deluge T2. The Makefile includes the
+DELUGE_LIGHT_BASESTATION flag to allow the nodes to be pinged using
+tos-deluge.
 
 Prerequisites: