From 7b07fc8ef05afcd68a293cbd6983c2df0ed98938 Mon Sep 17 00:00:00 2001 From: klueska Date: Sat, 26 Jul 2008 02:32:43 +0000 Subject: [PATCH] Updates to files after running the majority of the telosb rc3 tests --- apps/tests/TestPrintf/README.txt | 5 ++--- apps/tests/TestPrintf/TestPrintfAppC.nc | 2 ++ apps/tests/TestPrintf/TestPrintfC.nc | 7 ++++++- apps/tests/cc2420/LplBroadcastCountToLeds/README.txt | 4 ++-- .../cc2420/LplBroadcastPeriodicDelivery/README.txt | 2 +- .../tests/cc2420/LplUnicastPeriodicDelivery/README.txt | 2 +- apps/tests/cc2420/RssiToSerial/README.txt | 2 +- apps/tests/cc2420/TestAcks/README.txt | 2 +- apps/tests/cc2420/TestPacketLink/README.txt | 2 +- apps/tests/cc2420/TxThroughput/README.txt | 2 +- apps/tests/tkn154/TestPromiscuous/README.txt | 4 +--- apps/tosthreads/apps/BaseStation/Makefile | 5 ----- apps/tosthreads/apps/TestCollection/README | 9 +++++++-- apps/tosthreads/capps/TestCollection/README | 7 ++++++- apps/tosthreads/capps/TestLogStorage/README | 10 +++++----- 15 files changed, 37 insertions(+), 28 deletions(-) diff --git a/apps/tests/TestPrintf/README.txt b/apps/tests/TestPrintf/README.txt index b38bc437..bbb9ed1d 100644 --- a/apps/tests/TestPrintf/README.txt +++ b/apps/tests/TestPrintf/README.txt @@ -1,5 +1,3 @@ -$Id$ - README for TestPrintf Author/Contact: tinyos-help@millennium.berkeley.edu @@ -21,4 +19,5 @@ java net.tinyos.tools.PrintfClient -comm serial@: Known bugs/limitations: None. - \ No newline at end of file + +$Id$ diff --git a/apps/tests/TestPrintf/TestPrintfAppC.nc b/apps/tests/TestPrintf/TestPrintfAppC.nc index 9332725a..3bff6492 100644 --- a/apps/tests/TestPrintf/TestPrintfAppC.nc +++ b/apps/tests/TestPrintf/TestPrintfAppC.nc @@ -37,7 +37,9 @@ configuration TestPrintfAppC{ } implementation { components MainC, TestPrintfC; + components new TimerMilliC(); TestPrintfC.Boot -> MainC; + TestPrintfC.Timer -> TimerMilliC; } diff --git a/apps/tests/TestPrintf/TestPrintfC.nc b/apps/tests/TestPrintf/TestPrintfC.nc index 5d970f32..ab9d625b 100644 --- a/apps/tests/TestPrintf/TestPrintfC.nc +++ b/apps/tests/TestPrintf/TestPrintfC.nc @@ -36,6 +36,7 @@ module TestPrintfC @safe() { uses { interface Boot; + interface Timer; } } implementation { @@ -45,10 +46,14 @@ implementation { uint32_t dummyVar3 = 1234567890; event void Boot.booted() { + call Timer.startPeriodic(1000); + } + + event void Timer.fired() { printf("Hi I am writing to you from my TinyOS application!!\n"); printf("Here is a uint8: %u\n", dummyVar1); printf("Here is a uint16: %u\n", dummyVar2); - printf("Here is a uint32: %ld\n", dummyVar3); + printf("Here is a uint32: %lu\n", dummyVar3); printfflush(); } } diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/README.txt b/apps/tests/cc2420/LplBroadcastCountToLeds/README.txt index 8dfe0815..bb30e90d 100644 --- a/apps/tests/cc2420/LplBroadcastCountToLeds/README.txt +++ b/apps/tests/cc2420/LplBroadcastCountToLeds/README.txt @@ -1,4 +1,4 @@ -README for RadioCountToLeds +README for LplBroadcastCountToLeds Author/Contact: tinyos-help@millennium.berkeley.edu Description: @@ -23,7 +23,7 @@ Verification: If you see LED's waggling on both motes, the test passed. -RadioCountToLeds maintains a 4Hz counter, broadcasting its value in +LplBroadcastCountToLeds maintains a 4Hz counter, broadcasting its value in an AM packet 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 diff --git a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/README.txt b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/README.txt index fdd1d912..0733e605 100644 --- a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/README.txt +++ b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/README.txt @@ -1,4 +1,4 @@ - +README for LplBroadcastPeriodicDelivery Author/Contact: tinyos-help@millennium.berkeley.edu Description: diff --git a/apps/tests/cc2420/LplUnicastPeriodicDelivery/README.txt b/apps/tests/cc2420/LplUnicastPeriodicDelivery/README.txt index 313dbb55..11784ff9 100644 --- a/apps/tests/cc2420/LplUnicastPeriodicDelivery/README.txt +++ b/apps/tests/cc2420/LplUnicastPeriodicDelivery/README.txt @@ -1,4 +1,4 @@ - +README for LplUnicastPeriodicDelivery Author/Contact: tinyos-help@millennium.berkeley.edu Description: diff --git a/apps/tests/cc2420/RssiToSerial/README.txt b/apps/tests/cc2420/RssiToSerial/README.txt index 32416b2a..f8d7af67 100644 --- a/apps/tests/cc2420/RssiToSerial/README.txt +++ b/apps/tests/cc2420/RssiToSerial/README.txt @@ -1,4 +1,4 @@ - +README for RssiToSerial Author/Contact: tinyos-help@millennium.berkeley.edu Description: diff --git a/apps/tests/cc2420/TestAcks/README.txt b/apps/tests/cc2420/TestAcks/README.txt index 15ce682e..1adcbc64 100644 --- a/apps/tests/cc2420/TestAcks/README.txt +++ b/apps/tests/cc2420/TestAcks/README.txt @@ -1,4 +1,4 @@ - +README for TestAcks Author/Contact: tinyos-help@millennium.berkeley.edu Description: diff --git a/apps/tests/cc2420/TestPacketLink/README.txt b/apps/tests/cc2420/TestPacketLink/README.txt index d41ce7ee..4c291ba1 100644 --- a/apps/tests/cc2420/TestPacketLink/README.txt +++ b/apps/tests/cc2420/TestPacketLink/README.txt @@ -1,4 +1,4 @@ - +README for TestPacketLink Author/Contact: tinyos-help@millennium.berkeley.edu Description: diff --git a/apps/tests/cc2420/TxThroughput/README.txt b/apps/tests/cc2420/TxThroughput/README.txt index 504e3591..d3531d83 100644 --- a/apps/tests/cc2420/TxThroughput/README.txt +++ b/apps/tests/cc2420/TxThroughput/README.txt @@ -1,4 +1,4 @@ - +README for TxThroughput Author/Contact: tinyos-help@millennium.berkeley.edu Description: diff --git a/apps/tests/tkn154/TestPromiscuous/README.txt b/apps/tests/tkn154/TestPromiscuous/README.txt index 83a3b9cf..8f1b1f5b 100644 --- a/apps/tests/tkn154/TestPromiscuous/README.txt +++ b/apps/tests/tkn154/TestPromiscuous/README.txt @@ -20,9 +20,7 @@ Install the application on a node Start the printf client on - $ cd $TOSDIR/../apps/tests/TestPrintf - $ make telosb - $ java net.tinyos.tools.PrintfClient -comm serial@/dev/ttyUSB0:telosb + $ java net.tinyos.tools.PrintfClient -comm serial@/dev/ttyUSBXXX:telosb (http://docs.tinyos.net/ has a section on how to use the TinyOS printf library) diff --git a/apps/tosthreads/apps/BaseStation/Makefile b/apps/tosthreads/apps/BaseStation/Makefile index 8e664309..85201696 100644 --- a/apps/tosthreads/apps/BaseStation/Makefile +++ b/apps/tosthreads/apps/BaseStation/Makefile @@ -1,9 +1,4 @@ COMPONENT=BaseStationAppC - - - -CFLAGS+=-DCC2420_DEF_CHANNEL=26 - CFLAGS+=-DCC2420_NO_ACKNOWLEDGEMENTS CFLAGS+=-DCC2420_NO_ADDRESS_RECOGNITION CFLAGS+=-DTOSH_DATA_LENGTH=115 diff --git a/apps/tosthreads/apps/TestCollection/README b/apps/tosthreads/apps/TestCollection/README index 62061ce9..32c26f54 100644 --- a/apps/tosthreads/apps/TestCollection/README +++ b/apps/tosthreads/apps/TestCollection/README @@ -12,7 +12,7 @@ subdirectory. The sampling rate starts at 4Hz, but can be changed from the Java application. You can install TestCollection on a mote via the following command: - make cthreads install + make threads install Valid platforms are currently: tmote, telosb, mica2, micaz and iris @@ -39,11 +39,16 @@ MultihopOscilloscope demo via a serial forwarder. To run it, change to the TestCollection/java subdirectory and type: make - java net.tinyos.sf.SerialForwarder -comm serial@: + java net.tinyos.sf.SerialForwarder -comm serial@: # e.g., java net.tinyps.sf.SerialForwarder -comm serial@/dev/ttyUSB0:mica2 # or java net.tinyps.sf.SerialForwarder -comm serial@COM2:telosb ./run +NOTE:: The baud rate 57600 must be used telos based motes, as its configuration +has been changed to work with this baud rate when compiled for tosthreads. I.e. +DO NOT just substitute 'telosb' or 'tmote' for above. Explicitly +set it to 57600. + The controls at the bottom of the screen allow you to zoom in or out the X axis, change the range of the Y axis, and clear all received data. You can change the color used to display a mote by clicking on its color in the diff --git a/apps/tosthreads/capps/TestCollection/README b/apps/tosthreads/capps/TestCollection/README index 78ef6003..63cd279d 100644 --- a/apps/tosthreads/capps/TestCollection/README +++ b/apps/tosthreads/capps/TestCollection/README @@ -39,11 +39,16 @@ MultihopOscilloscope demo via a serial forwarder. To run it, change to the TestCollection/java subdirectory and type: make - java net.tinyos.sf.SerialForwarder -comm serial@: + java net.tinyos.sf.SerialForwarder -comm serial@: # e.g., java net.tinyps.sf.SerialForwarder -comm serial@/dev/ttyUSB0:mica2 # or java net.tinyps.sf.SerialForwarder -comm serial@COM2:telosb ./run +NOTE:: The baud rate 57600 must be used telos based motes, as its configuration +has been changed to work with this baud rate when compiled for tosthreads. I.e. +DO NOT just substitute 'telosb' or 'tmote' for above. Explicitly +set it to 57600. + The controls at the bottom of the screen allow you to zoom in or out the X axis, change the range of the Y axis, and clear all received data. You can change the color used to display a mote by clicking on its color in the diff --git a/apps/tosthreads/capps/TestLogStorage/README b/apps/tosthreads/capps/TestLogStorage/README index 95a0fcde..7016add8 100644 --- a/apps/tosthreads/capps/TestLogStorage/README +++ b/apps/tosthreads/capps/TestLogStorage/README @@ -6,7 +6,7 @@ Description: TestLogStorage is a threaded implementation of an application that takes a dummy sensor readings of a counter, logs it flash, and then sends it out over the -radio at some later time. In the current implementation, each sensor reading is +serial port at some later time. In the current implementation, each sensor reading is taken once every 3000ms, and records containing a set of readings from each iteration are batched out over the radio every 10000ms. This application is very similar to the SenseStoreAndForward application contained in this same @@ -22,19 +22,19 @@ Valid platforms are currently: tmote, telosb, iris, mica2, and micaz Readings are taken from the dummy sensor and logged to flash as one record in an infinite loop. Records are then read out of flash and and sent out over the -radio interface in separate infinite loop. Before the application starts +serial interface in separate infinite loop. Before the application starts running, the entire contents of the flash drive are erased. A successful test will result in LED0 remaining solid for approximately 6s while the flash is being erased. After that LED0 will toggle with each successful sensor readings logged to flash, at a rate of 3000ms. Also, LED1 will begin toggling in rapid succession once every 10000ms as records are successfully read -from flash and sent out over the radio. Once all of the records currently +from flash and sent out over the serial port. Once all of the records currently recorded to flash since the last batch of sends have been sent out, LED2 Toggles to indicate completion. This process continues in an infinite loop forever. -Additionally, the TestLogStorage mote writes its records out to the serial -port. You can test that the application is working properly by reading these +Since the TestLogStorage mote writes its records out to the serial +port, you can test that the application is working properly by reading these packets (e.g., through seriallisten) and checking that they have reasonable values, counting up from 0. E.g.: -- 2.39.2