From 07f1ba9d04171b92bb31a7479de841dae69f72e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=B8rch?= Date: Tue, 29 Dec 2015 19:13:22 +0100 Subject: [PATCH] Changed updated name of macro for serial device, to follow generic MY_xx format --- .../MySensors/core/MyGatewayTransportEthernet.cpp | 14 +++++++------- .../core/MyGatewayTransportMQTTClient.cpp | 14 +++++++------- .../MySensors/core/MyGatewayTransportSerial.cpp | 6 +++--- libraries/MySensors/core/MyHwATMega328.h | 2 +- libraries/MySensors/core/MyHwESP8266.h | 2 +- libraries/MySensors/core/MyHwSAMD.cpp | 12 ++++++------ libraries/MySensors/core/MyHwSAMD.h | 2 +- libraries/MySensors/core/MySigningAtsha204.cpp | 8 ++++---- libraries/MySensors/core/MySigningAtsha204Soft.cpp | 8 ++++---- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libraries/MySensors/core/MyGatewayTransportEthernet.cpp b/libraries/MySensors/core/MyGatewayTransportEthernet.cpp index e58e88a..3bbeb3d 100644 --- a/libraries/MySensors/core/MyGatewayTransportEthernet.cpp +++ b/libraries/MySensors/core/MyGatewayTransportEthernet.cpp @@ -107,22 +107,22 @@ bool gatewayTransportInit() { while (WiFi.status() != WL_CONNECTED) { delay(500); - SERIALDEVICE.print("."); + MY_SERIALDEVICE.print("."); yield(); } - SERIALDEVICE.print(F("IP: ")); - SERIALDEVICE.println(WiFi.localIP()); + MY_SERIALDEVICE.print(F("IP: ")); + MY_SERIALDEVICE.println(WiFi.localIP()); #else #ifdef MY_IP_ADDRESS Ethernet.begin(_ethernetGatewayMAC, _ethernetGatewayIP); - SERIALDEVICE.print(F("IP: ")); - SERIALDEVICE.println(Ethernet.localIP()); + MY_SERIALDEVICE.print(F("IP: ")); + MY_SERIALDEVICE.println(Ethernet.localIP()); #else // Get IP address from DHCP Ethernet.begin(_ethernetGatewayMAC); - SERIALDEVICE.print(F("IP: ")); - SERIALDEVICE.println(Ethernet.localIP()); + MY_SERIALDEVICE.print(F("IP: ")); + MY_SERIALDEVICE.println(Ethernet.localIP()); #endif /* IP_ADDRESS_DHCP */ // give the Ethernet interface a second to initialize // TODO: use HW delay diff --git a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp index 27f126c..d43091f 100644 --- a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp +++ b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp @@ -161,21 +161,21 @@ bool gatewayTransportInit() { while (WiFi.status() != WL_CONNECTED) { delay(500); - SERIALDEVICE.print("."); + MY_SERIALDEVICE.print("."); yield(); } - SERIALDEVICE.print(F("IP: ")); - SERIALDEVICE.println(WiFi.localIP()); + MY_SERIALDEVICE.print(F("IP: ")); + MY_SERIALDEVICE.println(WiFi.localIP()); #else #ifdef MY_IP_ADDRESS Ethernet.begin(_clientMAC, _clientIp); - SERIALDEVICE.print(F("IP: ")); - SERIALDEVICE.println(Ethernet.localIP()); + MY_SERIALDEVICE.print(F("IP: ")); + MY_SERIALDEVICE.println(Ethernet.localIP()); #else // Get IP address from DHCP Ethernet.begin(_clientMAC); - SERIALDEVICE.print(F("IP: ")); - SERIALDEVICE.println(Ethernet.localIP()); + MY_SERIALDEVICE.print(F("IP: ")); + MY_SERIALDEVICE.println(Ethernet.localIP()); #endif /* IP_ADDRESS_DHCP */ // give the Ethernet interface a second to initialize // TODO: use HW delay diff --git a/libraries/MySensors/core/MyGatewayTransportSerial.cpp b/libraries/MySensors/core/MyGatewayTransportSerial.cpp index 8538d15..ee8299b 100644 --- a/libraries/MySensors/core/MyGatewayTransportSerial.cpp +++ b/libraries/MySensors/core/MyGatewayTransportSerial.cpp @@ -31,7 +31,7 @@ MyMessage _serialMsg; bool gatewayTransportSend(MyMessage &message) { - SERIALDEVICE.print(protocolFormat(message)); + MY_SERIALDEVICE.print(protocolFormat(message)); // Serial print is always successful return true; } @@ -45,9 +45,9 @@ bool gatewayTransportInit() { bool gatewayTransportAvailable() { bool available = false; - while (SERIALDEVICE.available()) { + while (MY_SERIALDEVICE.available()) { // get the new byte: - char inChar = (char) SERIALDEVICE.read(); + char inChar = (char) MY_SERIALDEVICE.read(); // if the incoming character is a newline, set a flag // so the main loop can do something about it: if (_serialInputPos < MY_GATEWAY_MAX_RECEIVE_LENGTH - 1 && !available) { diff --git a/libraries/MySensors/core/MyHwATMega328.h b/libraries/MySensors/core/MyHwATMega328.h index e8a41fa..5f01c2d 100644 --- a/libraries/MySensors/core/MyHwATMega328.h +++ b/libraries/MySensors/core/MyHwATMega328.h @@ -36,7 +36,7 @@ #include #endif -#define SERIALDEVICE Serial +#define MY_SERIALDEVICE Serial #if defined __AVR_ATmega328P__ #ifndef sleep_bod_disable #define sleep_bod_disable() \ diff --git a/libraries/MySensors/core/MyHwESP8266.h b/libraries/MySensors/core/MyHwESP8266.h index 338b59d..b3a5bf0 100644 --- a/libraries/MySensors/core/MyHwESP8266.h +++ b/libraries/MySensors/core/MyHwESP8266.h @@ -30,7 +30,7 @@ //#include #endif -#define SERIALDEVICE Serial +#define MY_SERIALDEVICE Serial #define min(a,b) ((a)<(b)?(a):(b)) #define max(a,b) ((a)>(b)?(a):(b)) diff --git a/libraries/MySensors/core/MyHwSAMD.cpp b/libraries/MySensors/core/MyHwSAMD.cpp index d7cd5f9..017fc7a 100644 --- a/libraries/MySensors/core/MyHwSAMD.cpp +++ b/libraries/MySensors/core/MyHwSAMD.cpp @@ -99,9 +99,9 @@ void hwWriteConfig(int adr, uint8_t value) } void hwInit() { - SERIALDEVICE.begin(MY_BAUD_RATE); + MY_SERIALDEVICE.begin(MY_BAUD_RATE); #ifndef MY_GATEWAY_W5100 - while (!SERIALDEVICE) {} + while (!MY_SERIALDEVICE) {} #endif Wire.begin(); } @@ -140,12 +140,12 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo #ifdef MY_DEBUG void hwDebugPrint(const char *fmt, ... ) { - if (SERIALDEVICE) { + if (MY_SERIALDEVICE) { char fmtBuffer[300]; #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) snprintf(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); - SERIALDEVICE.print(fmtBuffer); + MY_SERIALDEVICE.print(fmtBuffer); #endif va_list args; va_start (args, fmt ); @@ -159,8 +159,8 @@ void hwDebugPrint(const char *fmt, ... ) { vsnprintf(fmtBuffer, 299, fmt, args); #endif va_end (args); - SERIALDEVICE.print(fmtBuffer); -// SERIALDEVICE.flush(); + MY_SERIALDEVICE.print(fmtBuffer); +// MY_SERIALDEVICE.flush(); //Serial.write(freeRam()); } diff --git a/libraries/MySensors/core/MyHwSAMD.h b/libraries/MySensors/core/MyHwSAMD.h index deb7695..dc5f468 100644 --- a/libraries/MySensors/core/MyHwSAMD.h +++ b/libraries/MySensors/core/MyHwSAMD.h @@ -52,7 +52,7 @@ void hwWriteConfigBlock(void* buf, void* adr, size_t length); void hwWriteConfig(int adr, uint8_t value); uint8_t hwReadConfig(int adr); -#define SERIALDEVICE SerialUSB +#define MY_SERIALDEVICE SerialUSB /* diff --git a/libraries/MySensors/core/MySigningAtsha204.cpp b/libraries/MySensors/core/MySigningAtsha204.cpp index d62c6a0..218c22f 100644 --- a/libraries/MySensors/core/MySigningAtsha204.cpp +++ b/libraries/MySensors/core/MySigningAtsha204.cpp @@ -63,7 +63,7 @@ static void DEBUG_SIGNING_PRINTBUF(const __FlashStringHelper* str, uint8_t* buf, #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) snprintf_P(printBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); - SERIALDEVICE.print(printBuffer); + MY_SERIALDEVICE.print(printBuffer); #endif for (int i=0; i 0) { - SERIALDEVICE.print(printBuffer); + MY_SERIALDEVICE.print(printBuffer); } - SERIALDEVICE.println(""); + MY_SERIALDEVICE.println(""); } #else #define DEBUG_SIGNING_PRINTBUF(str, buf, sz) diff --git a/libraries/MySensors/core/MySigningAtsha204Soft.cpp b/libraries/MySensors/core/MySigningAtsha204Soft.cpp index 3c6ab67..c4152f6 100644 --- a/libraries/MySensors/core/MySigningAtsha204Soft.cpp +++ b/libraries/MySensors/core/MySigningAtsha204Soft.cpp @@ -66,7 +66,7 @@ static void DEBUG_SIGNING_PRINTBUF(const __FlashStringHelper* str, uint8_t* buf, #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) snprintf_P(printBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); - SERIALDEVICE.print(printBuffer); + MY_SERIALDEVICE.print(printBuffer); #endif for (int i=0; i 0) { - SERIALDEVICE.print(printBuffer); + MY_SERIALDEVICE.print(printBuffer); } - SERIALDEVICE.println(""); + MY_SERIALDEVICE.println(""); } #else #define DEBUG_SIGNING_PRINTBUF(str, buf, sz)