diff --git a/examples/knx-bme680/knx-bme680.ino b/examples/knx-bme680/knx-bme680.ino index c60d4af..566c0fc 100644 --- a/examples/knx-bme680/knx-bme680.ino +++ b/examples/knx-bme680/knx-bme680.ino @@ -43,7 +43,7 @@ bool trigger = false; void setup(void) { Serial.begin(115200); - ArduinoPlatform::SerialDebug = Serial; + ArduinoPlatform::SerialDebug = &Serial; delay(5000); Serial.println("start"); diff --git a/examples/knx-demo/knx-demo.ino b/examples/knx-demo/knx-demo.ino index b1be97b..f062daf 100644 --- a/examples/knx-demo/knx-demo.ino +++ b/examples/knx-demo/knx-demo.ino @@ -55,7 +55,7 @@ void resetCallback(GroupObject& go) void setup() { Serial.begin(115200); - ArduinoPlatform::SerialDebug = Serial; + ArduinoPlatform::SerialDebug = &Serial; randomSeed(millis()); diff --git a/examples/knx-hdc1008/knx-hdc1008.ino b/examples/knx-hdc1008/knx-hdc1008.ino index 8fae316..f9a285b 100644 --- a/examples/knx-hdc1008/knx-hdc1008.ino +++ b/examples/knx-hdc1008/knx-hdc1008.ino @@ -22,7 +22,7 @@ uint32_t cyclSend = 0; void setup(void) { Serial.begin(115200); - ArduinoPlatform::SerialDebug = Serial; + ArduinoPlatform::SerialDebug = &Serial; delay(5000); Serial.println("start"); diff --git a/examples/knx-sonoffS20/knx-sonoffS20.ino b/examples/knx-sonoffS20/knx-sonoffS20.ino index 17cd4f7..e25ff3e 100644 --- a/examples/knx-sonoffS20/knx-sonoffS20.ino +++ b/examples/knx-sonoffS20/knx-sonoffS20.ino @@ -25,7 +25,7 @@ void switchCallback(GroupObject& go) void setup() { Serial.begin(115200); - ArduinoPlatform::SerialDebug = Serial; + ArduinoPlatform::SerialDebug = &Serial; #ifdef ARDUINO_ARCH_ESP8266 WiFiManager wifiManager; diff --git a/src/arduino_platform.cpp b/src/arduino_platform.cpp index 3ce8b2d..979745d 100644 --- a/src/arduino_platform.cpp +++ b/src/arduino_platform.cpp @@ -3,7 +3,7 @@ #include -Stream& ArduinoPlatform::SerialDebug = Serial; +Stream* ArduinoPlatform::SerialDebug = &Serial; ArduinoPlatform::ArduinoPlatform(HardwareSerial* knxSerial) : _knxSerial(knxSerial) { @@ -139,134 +139,134 @@ size_t ArduinoPlatform::readBytesUart(uint8_t *buffer, size_t length) void print(const char* s) { - ArduinoPlatform::SerialDebug.print(s); + ArduinoPlatform::SerialDebug->print(s); } void print(char c) { - ArduinoPlatform::SerialDebug.print(c); + ArduinoPlatform::SerialDebug->print(c); } void print(unsigned char num) { - ArduinoPlatform::SerialDebug.print(num); + ArduinoPlatform::SerialDebug->print(num); } void print(unsigned char num, int base) { - ArduinoPlatform::SerialDebug.print(num, base); + ArduinoPlatform::SerialDebug->print(num, base); } void print(int num) { - ArduinoPlatform::SerialDebug.print(num); + ArduinoPlatform::SerialDebug->print(num); } void print(int num, int base) { - ArduinoPlatform::SerialDebug.print(num, base); + ArduinoPlatform::SerialDebug->print(num, base); } void print(unsigned int num) { - ArduinoPlatform::SerialDebug.print(num); + ArduinoPlatform::SerialDebug->print(num); } void print(unsigned int num, int base) { - ArduinoPlatform::SerialDebug.print(num, base); + ArduinoPlatform::SerialDebug->print(num, base); } void print(long num) { - ArduinoPlatform::SerialDebug.print(num); + ArduinoPlatform::SerialDebug->print(num); } void print(long num, int base) { - ArduinoPlatform::SerialDebug.print(num, base); + ArduinoPlatform::SerialDebug->print(num, base); } void print(unsigned long num) { - ArduinoPlatform::SerialDebug.print(num); + ArduinoPlatform::SerialDebug->print(num); } void print(unsigned long num, int base) { - ArduinoPlatform::SerialDebug.print(num, base); + ArduinoPlatform::SerialDebug->print(num, base); } void print(double num) { - ArduinoPlatform::SerialDebug.print(num); + ArduinoPlatform::SerialDebug->print(num); } void println(const char* s) { - ArduinoPlatform::SerialDebug.println(s); + ArduinoPlatform::SerialDebug->println(s); } void println(char c) { - ArduinoPlatform::SerialDebug.println(c); + ArduinoPlatform::SerialDebug->println(c); } void println(unsigned char num) { - ArduinoPlatform::SerialDebug.println(num); + ArduinoPlatform::SerialDebug->println(num); } void println(unsigned char num, int base) { - ArduinoPlatform::SerialDebug.println(num, base); + ArduinoPlatform::SerialDebug->println(num, base); } void println(int num) { - ArduinoPlatform::SerialDebug.println(num); + ArduinoPlatform::SerialDebug->println(num); } void println(int num, int base) { - ArduinoPlatform::SerialDebug.println(num, base); + ArduinoPlatform::SerialDebug->println(num, base); } void println(unsigned int num) { - ArduinoPlatform::SerialDebug.println(num); + ArduinoPlatform::SerialDebug->println(num); } void println(unsigned int num, int base) { - ArduinoPlatform::SerialDebug.println(num, base); + ArduinoPlatform::SerialDebug->println(num, base); } void println(long num) { - ArduinoPlatform::SerialDebug.println(num); + ArduinoPlatform::SerialDebug->println(num); } void println(long num, int base) { - ArduinoPlatform::SerialDebug.println(num, base); + ArduinoPlatform::SerialDebug->println(num, base); } void println(unsigned long num) { - ArduinoPlatform::SerialDebug.println(num); + ArduinoPlatform::SerialDebug->println(num); } void println(unsigned long num, int base) { - ArduinoPlatform::SerialDebug.println(num, base); + ArduinoPlatform::SerialDebug->println(num, base); } void println(double num) { - ArduinoPlatform::SerialDebug.println(num); + ArduinoPlatform::SerialDebug->println(num); } void println(void) { - ArduinoPlatform::SerialDebug.println(); + ArduinoPlatform::SerialDebug->println(); } diff --git a/src/arduino_platform.h b/src/arduino_platform.h index 3a33195..60acba8 100644 --- a/src/arduino_platform.h +++ b/src/arduino_platform.h @@ -35,7 +35,7 @@ class ArduinoPlatform : public Platform virtual int readUart(); virtual size_t readBytesUart(uint8_t* buffer, size_t length); - static Stream& SerialDebug; + static Stream* SerialDebug; protected: uint32_t _mulitcastAddr; diff --git a/src/esp32_platform.cpp b/src/esp32_platform.cpp index 3598eb4..4dd9a6b 100644 --- a/src/esp32_platform.cpp +++ b/src/esp32_platform.cpp @@ -36,7 +36,7 @@ void Esp32Platform::macAddress(uint8_t * addr) void Esp32Platform::restart() { - ArduinoPlatform::SerialDebug.println("restart"); + println("restart"); ESP.restart(); } diff --git a/src/esp_platform.cpp b/src/esp_platform.cpp index 061b601..738df8c 100644 --- a/src/esp_platform.cpp +++ b/src/esp_platform.cpp @@ -37,7 +37,7 @@ void EspPlatform::macAddress(uint8_t * addr) void EspPlatform::restart() { - ArduinoPlatform::SerialDebug.println("restart"); + println("restart"); ESP.reset(); } diff --git a/src/samd_platform.cpp b/src/samd_platform.cpp index 700f34c..db94c61 100644 --- a/src/samd_platform.cpp +++ b/src/samd_platform.cpp @@ -16,7 +16,7 @@ SamdPlatform::SamdPlatform( HardwareSerial* s) : ArduinoPlatform(s) void SamdPlatform::restart() { - ArduinoPlatform::SerialDebug.println("restart"); + println("restart"); NVIC_SystemReset(); }