From c20dc7c34ba2178c3b8c1744acf7ea97436d0475 Mon Sep 17 00:00:00 2001 From: idgay Date: Tue, 24 Jun 2008 20:36:24 +0000 Subject: [PATCH] nesdoc --- .../RadioCountMsg.java | 2 +- .../TestPeriodicAppC.nc | 4 ++-- .../TestPeriodicC.nc | 4 ++-- .../TestPeriodicAppC.nc | 4 ++-- .../TestPeriodicC.nc | 4 ++-- .../cc2420/RssiToSerial/RssiToSerialC.nc | 20 +++++++++-------- .../cc2420/RssiToSerial/RssiToSerialP.nc | 22 ++++++++++--------- .../cc2420/TestPacketLink/TestPacketLinkC.nc | 4 ++-- .../cc2420/TestPacketLink/TestPacketLinkP.nc | 4 ++-- .../cc2420/TxThroughput/TxThroughputC.nc | 8 +++++-- .../cc2420/TxThroughput/TxThroughputP.nc | 8 +++++-- 11 files changed, 48 insertions(+), 36 deletions(-) diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountMsg.java b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountMsg.java index 47c935da..46f7c7a0 100644 --- a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountMsg.java +++ b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountMsg.java @@ -10,7 +10,7 @@ public class RadioCountMsg extends net.tinyos.message.Message { public static final int DEFAULT_MESSAGE_SIZE = 2; /** The Active Message type associated with this message. */ - public static final int AM_TYPE = 6; + public static final int AM_TYPE = 134; /** Create a new RadioCountMsg of size 2. */ public RadioCountMsg() { diff --git a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc index 412f5b56..6668c01d 100644 --- a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc +++ b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc @@ -29,6 +29,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TestPeriodic.h" + /** * 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 @@ -39,8 +41,6 @@ * @author David Moss */ -#include "TestPeriodic.h" - configuration TestPeriodicAppC { } diff --git a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc index 98e7071a..dab737a8 100644 --- a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc +++ b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc @@ -29,6 +29,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TestPeriodic.h" + /** * 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 @@ -39,8 +41,6 @@ * @author David Moss */ -#include "TestPeriodic.h" - module TestPeriodicC { uses { interface Boot; diff --git a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc index 9b336ed2..d9dd9084 100644 --- a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc +++ b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc @@ -29,6 +29,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TestPeriodic.h" + /** * This app sends a message from Transmitter node to the recevier node * and waits 1000 ms between each delivery so the Rx mote's radio @@ -39,8 +41,6 @@ * @author David Moss */ -#include "TestPeriodic.h" - configuration TestPeriodicAppC { } diff --git a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc index 3635981e..59d3b881 100644 --- a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc +++ b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc @@ -29,6 +29,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TestPeriodic.h" + /** * This app sends a message from Transmitter node to the recevier node * and waits 1000 ms between each delivery so the Rx mote's radio @@ -39,8 +41,6 @@ * @author David Moss */ -#include "TestPeriodic.h" - module TestPeriodicC { uses { interface Boot; diff --git a/apps/tests/cc2420/RssiToSerial/RssiToSerialC.nc b/apps/tests/cc2420/RssiToSerial/RssiToSerialC.nc index bc16c77c..d9769960 100644 --- a/apps/tests/cc2420/RssiToSerial/RssiToSerialC.nc +++ b/apps/tests/cc2420/RssiToSerial/RssiToSerialC.nc @@ -30,20 +30,22 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "RssiToSerial.h" + /** + * This is more of a general demonstration than a test. + * + * Install this application to one node, connected to the computer. + * The node will measure the environmental RSSI from the CC2420 and + * sending those readings over the serial port. + * + * Use the Java application to display the relative RSSI readings. + * * @author Jared Hill + * @date 23 March 2007 */ -#include "RssiToSerial.h" - -/** - * - * - * @author Jared Hill - * @date 23 March 2007 - */ - configuration RssiToSerialC {} implementation { components MainC, RssiToSerialP as App, LedsC; diff --git a/apps/tests/cc2420/RssiToSerial/RssiToSerialP.nc b/apps/tests/cc2420/RssiToSerial/RssiToSerialP.nc index 0ee4bf3b..0ec6bcaf 100644 --- a/apps/tests/cc2420/RssiToSerial/RssiToSerialP.nc +++ b/apps/tests/cc2420/RssiToSerial/RssiToSerialP.nc @@ -29,20 +29,22 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ - /** - * @author Jared Hill - */ - #include "Timer.h" #include "RssiToSerial.h" -/** - * - * - * @author Jared Hill + /** + * This is more of a general demonstration than a test. + * + * Install this application to one node, connected to the computer. + * The node will measure the environmental RSSI from the CC2420 and + * sending those readings over the serial port. + * + * Use the Java application to display the relative RSSI readings. + * + * @author Jared Hill * @date 23 March 2007 - */ - + */ + module RssiToSerialP { uses { interface Leds; diff --git a/apps/tests/cc2420/TestPacketLink/TestPacketLinkC.nc b/apps/tests/cc2420/TestPacketLink/TestPacketLinkC.nc index d26add85..22fb9e6e 100644 --- a/apps/tests/cc2420/TestPacketLink/TestPacketLinkC.nc +++ b/apps/tests/cc2420/TestPacketLink/TestPacketLinkC.nc @@ -30,6 +30,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TestPacketLink.h" + /** * Test the effectiveness of the PacketLink layer * @@ -56,8 +58,6 @@ * @author David Moss */ -#include "TestPacketLink.h" - configuration TestPacketLinkC { } diff --git a/apps/tests/cc2420/TestPacketLink/TestPacketLinkP.nc b/apps/tests/cc2420/TestPacketLink/TestPacketLinkP.nc index abb08d2b..8c83ff7f 100644 --- a/apps/tests/cc2420/TestPacketLink/TestPacketLinkP.nc +++ b/apps/tests/cc2420/TestPacketLink/TestPacketLinkP.nc @@ -29,6 +29,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TestPacketLink.h" + /** * Test the effectiveness of the PacketLink layer * @@ -55,8 +57,6 @@ * @author David Moss */ -#include "TestPacketLink.h" - module TestPacketLinkP { uses { interface Boot; diff --git a/apps/tests/cc2420/TxThroughput/TxThroughputC.nc b/apps/tests/cc2420/TxThroughput/TxThroughputC.nc index dbeb733c..ff9beb75 100644 --- a/apps/tests/cc2420/TxThroughput/TxThroughputC.nc +++ b/apps/tests/cc2420/TxThroughput/TxThroughputC.nc @@ -29,12 +29,16 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TxThroughput.h" + /** + * This application is used more for characterization rather than a + * test. It measures the maximum radio throughput using the largest + * message payload size, and does not use low power listening. + * * @author David Moss */ -#include "TxThroughput.h" - configuration TxThroughputC { } diff --git a/apps/tests/cc2420/TxThroughput/TxThroughputP.nc b/apps/tests/cc2420/TxThroughput/TxThroughputP.nc index 2c91487a..deceb27b 100644 --- a/apps/tests/cc2420/TxThroughput/TxThroughputP.nc +++ b/apps/tests/cc2420/TxThroughput/TxThroughputP.nc @@ -29,12 +29,16 @@ * OF THE POSSIBILITY OF SUCH DAMAGE */ +#include "TxThroughput.h" + /** + * This application is used more for characterization rather than a + * test. It measures the maximum radio throughput using the largest + * message payload size, and does not use low power listening. + * * @author David Moss */ -#include "TxThroughput.h" - module TxThroughputP { uses { interface Boot; -- 2.39.2