Use printf_P for logging

NanodeUIP.cpp

@@ -1,5 +1,7 @@
 #include "NanodeUIP.h"
 
+#include <avr/pgmspace.h>
+#include <stdio.h>
 #include <inttypes.h>
 
 #include "uip.h"
@@ -8,12 +10,15 @@
 #include "dhcpc.h"
 #include "resolv.h"
 
-void nanode_log(char *msg);
 
 void nanode_log(char *msg) {
   Serial.println(msg);
 }
 
+void nanode_log_P(PGM_P msg) {
+  printf_P(PSTR("%lu: %S\r\n"),millis(),msg);
+}
+
 void dhcpc_configured(const struct dhcpc_state *s) {
   uip_sethostaddr(s->ipaddr);
   uip_setnetmask(s->netmask);

NanodeUIP.h

@@ -6,11 +6,14 @@
 #else
   #include <WProgram.h> // Arduino 0022
 #endif
+#include <avr/pgmspace.h>
 
 #include "uip.h"
 #include "timer.h"
 
 extern void resolv_conf(const uint16_t *dnsserver);
+extern void nanode_log(char *msg);
+extern void nanode_log_P(PGM_P msg);
 
 #define DHCP_STATUS_OK 1
 #define DHCP_STATUS_DOWN 0

examples/uip_hello_world/printf.h

@@ -0,0 +1,37 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * @file printf.h
+ *
+ * Setup necessary to direct stdout to the Arduino Serial library, which
+ * enables 'printf'
+ */
+
+#ifndef __PRINTF_H__
+#define __PRINTF_H__
+
+#ifdef ARDUINO
+
+int serial_putc( char c, FILE * ) 
+{
+  Serial.write( c );
+
+  return c;
+} 
+
+void printf_begin(void)
+{
+  fdevopen( &serial_putc, 0 );
+}
+
+#else
+#error This example is only for use on Arduino.
+#endif // ARDUINO
+
+#endif // __PRINTF_H__

examples/uip_hello_world/uip_hello_world.pde

@@ -1,6 +1,7 @@
 #include <NanodeUNIO.h>
 #include <NanodeUIP.h>
 #include <psock.h>
+#include "printf.h"
 
 struct hello_world_state {
   struct psock p;
@@ -85,17 +86,18 @@ void setup() {
   NanodeUNIO unio(NANODE_MAC_DEVICE);
 
   Serial.begin(38400);
-  Serial.println("UIP test");
+  printf_begin();
+  printf_P(PSTR(__FILE__"\r\n"));
 
   unio.read(macaddr,NANODE_MAC_ADDRESS,6);
   uip.init(macaddr);
   uip.get_mac_str(buf);
   Serial.println(buf);
   uip.wait_for_link();
-  Serial.println("Link is up");
+  nanode_log_P(PSTR("Link is up"));
   uip.init_resolv(resolv_found);
   uip.start_dhcp(dhcp_status);
-  Serial.println("setup() done");
+  nanode_log_P(PSTR("setup() done"));
 }
 
 void loop() {

platform.cpp

@@ -1,3 +1,4 @@
+#include <avr/pgmspace.h>
 #include "clock.h"
 #include "uip-conf.h"
 
@@ -14,7 +15,11 @@ clock_time_t clock_time(void) {
 void nullproc(void) {}
 
 extern void nanode_log(char *msg);
+extern void nanode_log_P(PGM_P msg);
 
 void uip_log(char *msg) {
   nanode_log(msg);
 }
+void uip_log_P(PGM_P msg) {
+  nanode_log_P(msg);
+}

uip.cpp

@@ -240,9 +240,10 @@ struct uip_stats uip_stat;
 #endif /* UIP_STATISTICS == 1 */
 
 #if UIP_LOGGING == 1
+#include <avr/pgmspace.h>
 #include <stdio.h>
-void uip_log(char *msg);
-#define UIP_LOG(m) uip_log(m)
+void uip_log_P(PGM_P msg);
+#define UIP_LOG(m) uip_log_P(PSTR(m))
 #else
 #define UIP_LOG(m)
 #endif /* UIP_LOGGING == 1 */

uipopt.h

@@ -67,6 +67,7 @@
 #define UIP_BIG_ENDIAN     1234
 #endif /* UIP_BIG_ENDIAN */
 
+#include <avr/pgmspace.h>
 #include "uip-conf.h"
 
 /*------------------------------------------------------------------------------*/
@@ -432,6 +433,7 @@
  * is called by uIP whenever a log message is generated.
  */
 void uip_log(char *msg);
+void uip_log_P(PGM_P msg);
 
 /**
  * The link level header length.