From: razvanm <razvanm>
Date: Mon, 19 Jan 2009 23:04:28 +0000 (+0000)
Subject: Enable the Leds and the DELUGE_LIGHT_BASESTATION setting for GoldenImage.
X-Git-Tag: rc_6_tinyos_2_1_1~526
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=8fb8ea081352ed93ab7aaf00ec42f8a828306c5e

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 f27635f4..5847026e 100644
--- 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 caf65c10..c560f82c 100644
--- 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 6b2a7f64..6160096b 100644
--- 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: