nativ tos PrintF support, demosensors based on accelerometer, better low power

[tinyos-2.x.git] / tos / lib / printf / PrintfP.nc

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index c9a99d4397fd2f84a4896ab25f7fdbec0f1d4bd9..2ebed371187999f4bc5b6c3e5c411c56d157e139 100644 (file)
--- a/tos/lib/printf/PrintfP.nc
+++ b/tos/lib/printf/PrintfP.nc
@@ -80,6 +80,9 @@ static FILE atm128_stdout =
        FDEV_SETUP_STREAM(TCAST(int (*)(char c, FILE *stream), uart_putchar), 
        NULL, _FDEV_SETUP_WRITE);
 #endif
+#ifdef __M16C62PHARDWARE_H__
+       #include "m16c62p_printf.h"
+#endif
 
 module PrintfP @safe() {
   provides {
@@ -111,11 +114,13 @@ implementation {
   }
 
   event void SerialControl.startDone(error_t error) {
+    if (state == S_STOPPED) {
 #ifdef _H_atmega128hardware_H
-    stdout = &atm128_stdout;
+      stdout = &atm128_stdout;
 #endif
-    atomic state = S_STARTED;
-    signal Boot.booted();
+      atomic state = S_STARTED;
+      signal Boot.booted();
+    }
   }
 
   event void SerialControl.stopDone(error_t error) {
@@ -165,7 +170,10 @@ implementation {
 #ifdef _H_atmega128hardware_H
   int uart_putchar(char c, FILE *stream) __attribute__((noinline)) @C() @spontaneous() {
 #endif
-    if((state == S_STARTED) && (call Queue.size() >= 5*sizeof(printf_msg_t))) {
+#ifdef __M16C62PHARDWARE_H__
+  int lowlevel_putc(int c) __attribute__((noinline)) @C() @spontaneous() {
+#endif
+    if((state == S_STARTED) && (call Queue.size() >= ((PRINTF_BUFFER_SIZE)/2))) {
       state = S_FLUSHING;
       sendNext();
     }