From 27025cdc1dc04bc270cbd18ebf5a096c22900843 Mon Sep 17 00:00:00 2001
From: tekka007 <myscontroller@gmail.com>
Date: Mon, 2 May 2016 22:16:55 +0200
Subject: [PATCH] fix hw abstraction defs

---
 libraries/MySensors/core/MyHw.h            |  2 +-
 libraries/MySensors/core/MyHwATMega328.cpp | 10 +++++-----
 libraries/MySensors/core/MyHwATMega328.h   |  2 +-
 libraries/MySensors/core/MyHwESP8266.cpp   |  8 ++++----
 libraries/MySensors/core/MyHwESP8266.h     |  2 +-
 libraries/MySensors/core/MyHwSAMD.cpp      |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/MySensors/core/MyHw.h b/libraries/MySensors/core/MyHw.h
index e7a9ee6..1224f66 100644
--- a/libraries/MySensors/core/MyHw.h
+++ b/libraries/MySensors/core/MyHw.h
@@ -31,7 +31,7 @@
 // Implement these as functions or macros
 /*
 #define hwDigitalWrite(__pin, __value)
-#define hwInit() Serial.begin(BAUD_RATE)
+#define hwInit() MY_SERIALDEVICE.begin(BAUD_RATE)
 #define hwWatchdogReset() wdt_reset()
 #define hwReboot() wdt_enable(WDTO_15MS); while (1)
 #define hwMillis() millis()
diff --git a/libraries/MySensors/core/MyHwATMega328.cpp b/libraries/MySensors/core/MyHwATMega328.cpp
index 0a0bcc9..4e73b0a 100644
--- a/libraries/MySensors/core/MyHwATMega328.cpp
+++ b/libraries/MySensors/core/MyHwATMega328.cpp
@@ -78,7 +78,7 @@ void hwPowerDown(period_t period) {
 void hwInternalSleep(unsigned long ms) {
 	// Let serial prints finish (debug, log etc)
   #ifndef MY_DISABLED_SERIAL
-	  Serial.flush();
+	  MY_SERIALDEVICE.flush();
   #endif
 	// reset interrupt trigger var
 	pinIntTrigger = 0;
@@ -188,7 +188,7 @@ void hwDebugPrint(const char *fmt, ... ) {
 	#ifdef MY_GATEWAY_FEATURE
 		// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 		snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);
-		Serial.print(fmtBuffer);
+		MY_SERIALDEVICE.print(fmtBuffer);
 	#endif
 	va_list args;
 	va_start (args, fmt );
@@ -202,10 +202,10 @@ void hwDebugPrint(const char *fmt, ... ) {
 		vsnprintf_P(fmtBuffer, 299, fmt, args);
 	#endif
 	va_end (args);
-	Serial.print(fmtBuffer);
-	Serial.flush();
+	MY_SERIALDEVICE.print(fmtBuffer);
+	MY_SERIALDEVICE.flush();
 
-	//Serial.write(freeRam());
+	//MY_SERIALDEVICE.write(freeRam());
 }
 #endif
 
diff --git a/libraries/MySensors/core/MyHwATMega328.h b/libraries/MySensors/core/MyHwATMega328.h
index 9b9a487..8eb0060 100644
--- a/libraries/MySensors/core/MyHwATMega328.h
+++ b/libraries/MySensors/core/MyHwATMega328.h
@@ -57,7 +57,7 @@ do { 																\
 // Define these as macros to save valuable space
 
 #define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value))
-#define hwInit() Serial.begin(MY_BAUD_RATE)
+#define hwInit() MY_SERIALDEVICE.begin(MY_BAUD_RATE)
 #define hwWatchdogReset() wdt_reset()
 #define hwReboot() wdt_enable(WDTO_15MS); while (1)
 #define hwMillis() millis()
diff --git a/libraries/MySensors/core/MyHwESP8266.cpp b/libraries/MySensors/core/MyHwESP8266.cpp
index be898a1..a711606 100644
--- a/libraries/MySensors/core/MyHwESP8266.cpp
+++ b/libraries/MySensors/core/MyHwESP8266.cpp
@@ -132,7 +132,7 @@ void hwDebugPrint(const char *fmt, ... ) {
 	#ifdef MY_GATEWAY_FEATURE
 		// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 		snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);
-		Serial.print(fmtBuffer);
+		MY_SERIALDEVICE.print(fmtBuffer);
 	#endif
 	va_list args;
 	va_start (args, fmt );
@@ -146,9 +146,9 @@ void hwDebugPrint(const char *fmt, ... ) {
 		vsnprintf_P(fmtBuffer, 299, fmt, args);
 	#endif
 	va_end (args);
-	Serial.print(fmtBuffer);
-	Serial.flush();
+	MY_SERIALDEVICE.print(fmtBuffer);
+	MY_SERIALDEVICE.flush();
 
-	//Serial.write(freeRam());
+	//MY_SERIALDEVICE.write(freeRam());
 }
 #endif
diff --git a/libraries/MySensors/core/MyHwESP8266.h b/libraries/MySensors/core/MyHwESP8266.h
index bd958cb..b5d9f65 100644
--- a/libraries/MySensors/core/MyHwESP8266.h
+++ b/libraries/MySensors/core/MyHwESP8266.h
@@ -34,7 +34,7 @@
 // Define these as macros to save valuable space
 
 #define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value))
-#define hwInit() Serial.begin(MY_BAUD_RATE); Serial.setDebugOutput(true)
+#define hwInit() MY_SERIALDEVICE.begin(MY_BAUD_RATE); MY_SERIALDEVICE.setDebugOutput(true)
 #define hwWatchdogReset() wdt_reset()
 #define hwReboot() wdt_enable(WDTO_15MS); while (1)
 #define hwMillis() millis()
diff --git a/libraries/MySensors/core/MyHwSAMD.cpp b/libraries/MySensors/core/MyHwSAMD.cpp
index 017fc7a..0e404dc 100644
--- a/libraries/MySensors/core/MyHwSAMD.cpp
+++ b/libraries/MySensors/core/MyHwSAMD.cpp
@@ -162,7 +162,7 @@ void hwDebugPrint(const char *fmt, ... ) {
 	MY_SERIALDEVICE.print(fmtBuffer);
 //	MY_SERIALDEVICE.flush();
 
-	//Serial.write(freeRam());
+	//MY_SERIALDEVICE.write(freeRam());
     }
 }
 #endif