From: klueska <klueska>
Date: Thu, 12 Jun 2008 12:55:33 +0000 (+0000)
Subject: Update to use new way of doing printf
X-Git-Tag: release_tinyos_2_1_0_0~317
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=56c485dc1d896f02891666fb0308120cef3dd66b

Update to use new way of doing printf
---

diff --git a/apps/tests/TestPrintf/Makefile b/apps/tests/TestPrintf/Makefile
index a3b9020d..dd482a5d 100644
--- a/apps/tests/TestPrintf/Makefile
+++ b/apps/tests/TestPrintf/Makefile
@@ -1,14 +1,4 @@
 COMPONENT=TestPrintfAppC
 CFLAGS += -I$(TOSDIR)/lib/printf
 
-BUILD_EXTRA_DEPS += PrintfMsg.class PrintfClient.class
-
-%.class: %.java
-	javac $<
-
-PrintfMsg.java: $(TOSDIR)/lib/printf/printf.h
-	mig java -target=$(PLATFORM) $(CFLAGS) \
-		-java-classname=PrintfMsg \
-		$(TOSDIR)/lib/printf/printf.h printf_msg -o $@
-
 include $(MAKERULES)
diff --git a/apps/tests/TestPrintf/PrintfClient.java b/apps/tests/TestPrintf/PrintfClient.java
deleted file mode 100644
index 6d98473e..00000000
--- a/apps/tests/TestPrintf/PrintfClient.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * "Copyright (c) 2006 Washington University in St. Louis.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice, the following
- * two paragraphs and the author appear in all copies of this software.
- *
- * IN NO EVENT SHALL WASHINGTON UNIVERSITY IN ST. LOUIS BE LIABLE TO ANY PARTY
- * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
- * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF WASHINGTON
- * UNIVERSITY IN ST. LOUIS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * WASHINGTON UNIVERSITY IN ST. LOUIS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND WASHINGTON UNIVERSITY IN ST. LOUIS HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
- * MODIFICATIONS."
- */
-
-/**
- * @author Kevin Klues (klueska@cs.wustl.edu)
- * @version $Revision$
- * @date $Date$
- */
-
-import java.io.IOException;
-
-import net.tinyos.message.*;
-import net.tinyos.packet.*;
-import net.tinyos.util.*;
-
-public class PrintfClient implements MessageListener {
-
-  private MoteIF moteIF;
-  
-  public PrintfClient(MoteIF moteIF) {
-    this.moteIF = moteIF;
-    this.moteIF.registerListener(new PrintfMsg(), this);
-  }
-
-  public void messageReceived(int to, Message message) {
-    PrintfMsg msg = (PrintfMsg)message;
-    for(int i=0; i<msg.totalSize_buffer(); i++) {
-      char nextChar = (char)(msg.getElement_buffer(i));
-      if(nextChar != 0)
-        System.out.print(nextChar);
-    }
-  }
-  
-  private static void usage() {
-    System.err.println("usage: PrintfClient [-comm <source>]");
-  }
-  
-  public static void main(String[] args) throws Exception {
-    String source = "";
-    if (args.length == 2) {
-      if (!args[0].equals("-comm")) {
-	       usage();
-	       System.exit(1);
-      }
-      source = args[1];
-    }
-    else {
-      usage();
-      System.exit(1);
-    }
-    
-    PhoenixSource phoenix;
-    if (source == null) {
-      phoenix = BuildSource.makePhoenix(PrintStreamMessenger.err);
-    }
-    else {
-      phoenix = BuildSource.makePhoenix(source, PrintStreamMessenger.err);
-    }
-    System.out.print(phoenix);
-    MoteIF mif = new MoteIF(phoenix);
-    PrintfClient client = new PrintfClient(mif);
-  }
-}
diff --git a/apps/tests/TestPrintf/TestPrintfAppC.nc b/apps/tests/TestPrintf/TestPrintfAppC.nc
index 8e2b565e..db8bb2f0 100644
--- a/apps/tests/TestPrintf/TestPrintfAppC.nc
+++ b/apps/tests/TestPrintf/TestPrintfAppC.nc
@@ -38,12 +38,8 @@
 configuration TestPrintfAppC{
 }
 implementation {
-  components MainC, TestPrintfC, LedsC;
-  components PrintfC;
+  components MainC, TestPrintfC;
 
   TestPrintfC.Boot -> MainC;
-  TestPrintfC.Leds -> LedsC;
-  TestPrintfC.PrintfControl -> PrintfC;
-  TestPrintfC.PrintfFlush -> PrintfC;
 }
 
diff --git a/apps/tests/TestPrintf/TestPrintfC.nc b/apps/tests/TestPrintf/TestPrintfC.nc
index 47fe191b..9d35c464 100644
--- a/apps/tests/TestPrintf/TestPrintfC.nc
+++ b/apps/tests/TestPrintf/TestPrintfC.nc
@@ -37,52 +37,21 @@
 #include "printf.h"
 module TestPrintfC {
   uses {
-    interface Boot;  
-    interface Leds;
-    interface SplitControl as PrintfControl;
-    interface PrintfFlush;
+    interface Boot;
   }
 }
 implementation {
 	
-  #define NUM_TIMES_TO_PRINT	5
-  uint16_t counter=0;
   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 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);
-  	call PrintfFlush.flush();
-  }
-
-  event void PrintfControl.stopDone(error_t error) {
-  	counter = 0;
-    call Leds.led2Toggle();
-  	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\ncharacters since that is the limit of the size I put on my\nmaximum buffer when I instantiated the PrintfC component.\n");
-      printf("Only part of this line should get printed because by writing\nthis sentence, I go over my character limit that the internal Printf buffer can hold.\n");
-      call PrintfFlush.flush();
-    }
-    else call PrintfControl.stop();
-    counter++;
+  	printfflush();
   }
 }