From: idgay <idgay>
Date: Tue, 24 Jun 2008 18:05:48 +0000 (+0000)
Subject: use app am ids
X-Git-Tag: release_tinyos_2_1_0_0~174
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=18c0648f91153729e47ff822942c83623764feb6

use app am ids
---

diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLeds.h b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLeds.h
index deed967d..634fa855 100644
--- a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLeds.h
+++ b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLeds.h
@@ -6,7 +6,7 @@ typedef nx_struct radio_count_msg {
 } radio_count_msg_t;
 
 enum {
-  AM_RADIO_COUNT_MSG = 6,
+  AM_RADIO_COUNT_MSG = 134,
 };
 
 #endif
diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc
index 0414f079..441fbf6e 100644
--- a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc
+++ b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc
@@ -37,9 +37,11 @@
  * every time it gets updated. A RadioCountToLeds node that hears a counter 
  * displays the bottom three bits on its LEDs. This application is a useful 
  * test to show that basic AM communication and timers work.
+ * <p>
+ * This version uses low-power listening.
  *
  * @author Philip Levis
- * @date   June 6 2005
+ * @date   June 24 2008
  */
 
 configuration RadioCountToLedsAppC {}
diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc
index 34576fd1..71fd0279 100644
--- a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc
+++ b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc
@@ -38,9 +38,11 @@
  * every time it gets updated. A RadioCountToLeds node that hears a counter 
  * displays the bottom three bits on its LEDs. This application is a useful 
  * test to show that basic AM communication and timers work.
+ * <p>
+ * This version uses low-power listening.
  *
  * @author Philip Levis
- * @date   June 6 2005
+ * @date   June 24 2008
  */
 
 module RadioCountToLedsC {
diff --git a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc
index 59d6b0c1..98e7071a 100644
--- a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc
+++ b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc
@@ -33,8 +33,8 @@
  * This app sends a message from Transmitter node to AM_BROADCAST_ADDR
  * and waits 1000 ms between each delivery so the Rx mote's radio
  * shuts back off and has to redetect to receive the next message. 
- * Receiver: TOS_NODE_ID != 1
- * Transmitter: TOS_NODE_ID == 1
+ * Receiver: TOS_NODE_ID != 1.
+ * Transmitter: TOS_NODE_ID == 1.
  *
  * @author David Moss
  */
diff --git a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodic.h b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodic.h
index 7183641d..697efe7c 100644
--- a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodic.h
+++ b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodic.h
@@ -7,7 +7,7 @@ typedef nx_struct TestPeriodicMsg {
 } TestPeriodicMsg;
 
 enum {
-  AM_TESTPERIODICMSG = 0x5,
+  AM_TESTPERIODICMSG = 133,
 };
 
 #endif
diff --git a/apps/tests/cc2420/RssiToSerial/RssiToSerial.h b/apps/tests/cc2420/RssiToSerial/RssiToSerial.h
index ffe364d2..f1d9e246 100644
--- a/apps/tests/cc2420/RssiToSerial/RssiToSerial.h
+++ b/apps/tests/cc2420/RssiToSerial/RssiToSerial.h
@@ -44,7 +44,7 @@ typedef nx_struct rssi_serial_msg {
 } rssi_serial_msg_t;
 
 enum {
-  AM_RSSI_SERIAL_MSG = 6,
+  AM_RSSI_SERIAL_MSG = 134,
   WAIT_TIME = 256,
   //* Using log2 samples to avoid a divide. Sending a packet every 1 second will allow
   //* allow about 5000 samples. A packet every half second allows for 2500 samples, and
diff --git a/apps/tests/cc2420/RssiToSerial/SpecAnalyzer.java b/apps/tests/cc2420/RssiToSerial/SpecAnalyzer.java
index d03c6b04..ccadaff0 100644
--- a/apps/tests/cc2420/RssiToSerial/SpecAnalyzer.java
+++ b/apps/tests/cc2420/RssiToSerial/SpecAnalyzer.java
@@ -31,7 +31,9 @@
  */
 
 /**
- * 
+ * Java class to display RSSI readings returned from a mote running the
+ * RssiToSerial application.
+ *
  * @author Jared Hill
  */
 
diff --git a/apps/tests/cc2420/TestAcks/TestAcksC.nc b/apps/tests/cc2420/TestAcks/TestAcksC.nc
index 2267e43f..2ad42356 100644
--- a/apps/tests/cc2420/TestAcks/TestAcksC.nc
+++ b/apps/tests/cc2420/TestAcks/TestAcksC.nc
@@ -46,8 +46,8 @@ implementation {
   components TestAcksP,
       MainC,
       ActiveMessageC,
-      new AMSenderC(0),
-      new AMReceiverC(0),
+      new AMSenderC(128),
+      new AMReceiverC(128),
       new TimerMilliC(),
       LedsC;
       
diff --git a/apps/tests/cc2420/TestPacketLink/TestPacketLink.h b/apps/tests/cc2420/TestPacketLink/TestPacketLink.h
index aeb8463e..1f225354 100644
--- a/apps/tests/cc2420/TestPacketLink/TestPacketLink.h
+++ b/apps/tests/cc2420/TestPacketLink/TestPacketLink.h
@@ -40,7 +40,7 @@ typedef nx_struct PacketLinkMsg {
 } PacketLinkMsg;
 
 enum {
-  AM_PACKETLINKMSG = 0,
+  AM_PACKETLINKMSG = 128,
 };
 
 enum {
diff --git a/apps/tests/cc2420/TxThroughput/TxThroughput.h b/apps/tests/cc2420/TxThroughput/TxThroughput.h
index 2d0627c8..fb258053 100644
--- a/apps/tests/cc2420/TxThroughput/TxThroughput.h
+++ b/apps/tests/cc2420/TxThroughput/TxThroughput.h
@@ -52,7 +52,7 @@ typedef nx_struct ThroughputMsg {
 } ThroughputMsg;
 
 enum {
-  AM_THROUGHPUTMSG = 5,
+  AM_THROUGHPUTMSG = 133,
 };
 
 /**