moved debug macro to separate file

firmata · Apr 12, 2015 · 979d46f · 979d46f
1 parent 08758cb
commit 979d46f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/examples/StandardFirmataEthernet/EthernetClientStream.cpp b/examples/StandardFirmataEthernet/EthernetClientStream.cpp
@@ -20,16 +20,10 @@
 #include "EthernetClientStream.h"
 #include <Arduino.h>
 
-#define MILLIS_RECONNECT 5000
-
 //#define DEBUG
-#ifdef DEBUG
-  #define DEBUG_PRINTLN(x)  Serial.println (x)
-  #define DEBUG_PRINT(x)    Serial.print (x)
-#else
-  #define DEBUG_PRINTLN(x)
-  #define DEBUG_PRINT(x)
-#endif
+#include "debug.h"
+
+#define MILLIS_RECONNECT 5000
 
 EthernetClientStream::EthernetClientStream(Client &client, IPAddress localip, IPAddress ip, const char* host, uint16_t port)
 : ip(ip),

diff --git a/examples/StandardFirmataEthernet/StandardFirmataEthernet.ino b/examples/StandardFirmataEthernet/StandardFirmataEthernet.ino
@@ -20,7 +20,7 @@
 
   See file LICENSE.txt for further informations on licensing terms.
 
-  Last updated by Jeff Hoefs: April 10, 2015
+  Last updated by Jeff Hoefs: April 11, 2015
 */
 
 /*
@@ -42,13 +42,7 @@
 #include <Firmata.h>
 
 //#define DEBUG
-#ifdef DEBUG
-  #define DEBUG_PRINTLN(x)  Serial.println (x)
-  #define DEBUG_PRINT(x)    Serial.print (x)
-#else
-  #define DEBUG_PRINTLN(x)
-  #define DEBUG_PRINT(x)
-#endif
+#include "debug.h"
 
 #define I2C_WRITE                   B00000000
 #define I2C_READ                    B00001000
@@ -778,12 +772,7 @@ void systemResetCallback()
 
 void setup()
 {
-#ifdef DEBUG
-  Serial.begin(9600);
-  while (!Serial) {
-    ; // wait for serial port to connect. Need only for ATmega32u4-based boards (Leonardo)
-  }
-#endif
+  DEBUG_BEGIN(9600);
 
 #ifdef _YUN_CLIENT_H_
   Bridge.begin();

diff --git a/examples/StandardFirmataEthernet/debug.h b/examples/StandardFirmataEthernet/debug.h
@@ -0,0 +1,14 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#ifdef DEBUG
+  #define DEBUG_BEGIN(baud) Serial.begin(baud); while(!Serial) {;}
+  #define DEBUG_PRINTLN(x)  Serial.println (x)
+  #define DEBUG_PRINT(x)    Serial.print (x)
+#else
+  #define DEBUG_BEGIN(baud)
+  #define DEBUG_PRINTLN(x)
+  #define DEBUG_PRINT(x)
+#endif
+
+#endif /* DEBUG_H */