Update to use new way of doing printf

[tinyos-2.x.git] / apps / tests / TestPrintf / TestPrintfC.nc

diff --git a/apps/tests/TestPrintf/TestPrintfC.nc b/apps/tests/TestPrintf/TestPrintfC.nc
index 79f3f0862e205fa67be221bfce392c3a0c0e937a..9d35c464cb1084fc6b51ca85ba10b9763e602594 100644 (file)
--- a/apps/tests/TestPrintf/TestPrintfC.nc
+++ b/apps/tests/TestPrintf/TestPrintfC.nc
@@ -21,57 +21,37 @@
  */
  
 /**
+ *
+ * This application is used to test the basic functionality of the printf service.  
+ * It is initiated by calling the start() command of the SplitControl interface 
+ * provided by the PrintfC component.  After starting the printf service, calls to 
+ * the standard c-style printf command are made to print various strings of text 
+ * over the serial line.  Only upon calling PrintfFlush.flush() does the data 
+ * actually get sent out over the serial line.
  *
  * @author Kevin Klues (klueska@cs.wustl.edu)
  * @version $Revision$
  * @date $Date$
  */
 
+#include "printf.h"
 module TestPrintfC {
   uses {
-    interface Boot;  
-    interface Leds;
-    interface SplitControl as PrintfControl;
-    interface PrintfFlush;
+    interface Boot;
   }
 }
 implementation {
        
-  #define NUM_TIMES_TO_PRINT   100
-  uint16_t counter=0;
-  uint32_t dummyVar = 345678;
+  uint8_t dummyVar1 = 123;
+  uint16_t dummyVar2 = 12345;
+  uint32_t dummyVar3 = 1234567890;
 
   event void Boot.booted() {
-    call PrintfControl.start();
-  }
-  
-  event void PrintfControl.startDone(error_t error) {
-       printf("Hi my name is Kevin Klues and I am writing to you from my telos mote\n");
-       printf("Here is a uint8: %hd\n", 123);
-       printf("Here is a uint16: %d\n", 12345);
-       printf("Here is a uint32: %ld\n", 1234567890);
-       call PrintfFlush.flush();
-  }
-
-  event void PrintfControl.stopDone(error_t error) {
-       counter = 0;
-       printf("This should not be printed...");
-       call PrintfFlush.flush();
-  }
-  
-  event void PrintfFlush.flushDone(error_t error) {
-       if(counter < NUM_TIMES_TO_PRINT) {
-      printf("I am now iterating: %d\n", counter);
-         call PrintfFlush.flush();
-    }
-    else if(counter == NUM_TIMES_TO_PRINT) {
-      printf("This is a really short string...\n");
-      printf("I am generating this string to have just less than 250 characters since that is the limit of the size I put on my maximum buffer when I instantiated the PrintfC component.\n");
-      printf("Only part of this line should get printed because by writing this sentence, I go over my character limit that the internal Printf buffer can hold.  If I were to flush before trying to write this, or increase my buffer size when I instantiate my PrintfC component to 1000, we would see this line too\n");
-      call PrintfFlush.flush();
-    }
-    else call PrintfControl.stop();
-    counter++;
+       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);
+       printfflush();
   }
 }