From 774fc86fbff4cf97cae3ef60fd72ab50529cb496 Mon Sep 17 00:00:00 2001 From: Johannes Reichhold Date: Tue, 12 Nov 2024 16:57:59 +0100 Subject: [PATCH 1/6] Adding "setDebugOutput()" Methode to SerialFake --- src/SerialFake.cpp | 4 ++++ src/SerialFake.h | 2 ++ src/arduino/USBAPI.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/SerialFake.cpp b/src/SerialFake.cpp index 8e27a3d..e4032c4 100644 --- a/src/SerialFake.cpp +++ b/src/SerialFake.cpp @@ -83,6 +83,10 @@ bool Serial_::rts() return ArduinoFakeInstance(Serial, this)->rts(); } +void Serial_::setDebugOutput(bool _value){ + return ArduinoFakeInstance(Serial, this) -> setDebugOutput(_value); +} + int32_t Serial_::readBreak() { return ArduinoFakeInstance(Serial, this)->readBreak(); diff --git a/src/SerialFake.h b/src/SerialFake.h index 962148a..65fec59 100644 --- a/src/SerialFake.h +++ b/src/SerialFake.h @@ -28,6 +28,8 @@ struct SerialFake : public StreamFake virtual uint8_t numbits() = 0; virtual bool dtr() = 0; virtual bool rts() = 0; + + virtual void setDebugOutput(bool) = 0; }; class SerialFakeProxy : public StreamFakeProxy, public Serial_ diff --git a/src/arduino/USBAPI.h b/src/arduino/USBAPI.h index 89fc4c8..5a544b4 100644 --- a/src/arduino/USBAPI.h +++ b/src/arduino/USBAPI.h @@ -105,6 +105,8 @@ class Serial_ : public Stream volatile uint8_t _rx_buffer_tail; unsigned char _rx_buffer[SERIAL_BUFFER_SIZE]; + virtual void setDebugOutput(bool); + // This method allows processing "SEND_BREAK" requests sent by // the USB host. Those requests indicate that the host wants to // send a BREAK signal and are accompanied by a single uint16_t From 41cdf8d5aabe32c525fe31be5e0e91f380b786cf Mon Sep 17 00:00:00 2001 From: Johannes Reichhold Date: Tue, 12 Nov 2024 17:36:33 +0100 Subject: [PATCH 2/6] Adding Basic Serial Test for setDebugOutput --- test/test_serial.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test_serial.h b/test/test_serial.h index cc820b4..5047796 100644 --- a/test/test_serial.h +++ b/test/test_serial.h @@ -65,6 +65,7 @@ namespace SerialTest Serial.flush(); Serial.end(); + Serial.setDebugOutput(true); Verify(OverloadedMethod(ArduinoFake(Serial), begin, void(unsigned long)).Using(9600)).Once(); Verify(Method(ArduinoFake(Serial), available)).Exactly(2_Times); @@ -73,6 +74,8 @@ namespace SerialTest Verify(Method(ArduinoFake(Serial), flush)).Once(); Verify(Method(ArduinoFake(Serial), end)).Once(); + + Verify(OverloadedMethod(ArduinoFake(Serial), setDebugOutput, size_t(bool)).Using(true)).Once(); } void run_tests() From cda10cdc7aff6135fe6b24705e3af197c5a0dbc7 Mon Sep 17 00:00:00 2001 From: Johannes Reichhold Date: Tue, 12 Nov 2024 18:15:13 +0100 Subject: [PATCH 3/6] Changed Test OverloadedMethod from size_t(bool) to void(bool) --- test/test_serial.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_serial.h b/test/test_serial.h index 5047796..499546d 100644 --- a/test/test_serial.h +++ b/test/test_serial.h @@ -75,7 +75,7 @@ namespace SerialTest Verify(Method(ArduinoFake(Serial), flush)).Once(); Verify(Method(ArduinoFake(Serial), end)).Once(); - Verify(OverloadedMethod(ArduinoFake(Serial), setDebugOutput, size_t(bool)).Using(true)).Once(); + Verify(OverloadedMethod(ArduinoFake(Serial), setDebugOutput, void(bool)).Using(true)).Once(); } void run_tests() From d6996054ea2290378ff93ff32c9dc1aa7bb2323b Mon Sep 17 00:00:00 2001 From: Jojo1220 <97045955+JoJos1220@users.noreply.github.com> Date: Tue, 12 Nov 2024 22:31:45 +0100 Subject: [PATCH 4/6] Aktualisieren von test_serial.h --- test/test_serial.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_serial.h b/test/test_serial.h index 499546d..e3f03d0 100644 --- a/test/test_serial.h +++ b/test/test_serial.h @@ -75,7 +75,7 @@ namespace SerialTest Verify(Method(ArduinoFake(Serial), flush)).Once(); Verify(Method(ArduinoFake(Serial), end)).Once(); - Verify(OverloadedMethod(ArduinoFake(Serial), setDebugOutput, void(bool)).Using(true)).Once(); + Verify(Method(ArduinoFake(Serial), setDebugOutput)).Once(); } void run_tests() From f68517e3b33166942356253f6d5ed6e4e0840ebc Mon Sep 17 00:00:00 2001 From: Jojo Date: Wed, 13 Nov 2024 15:28:32 +0100 Subject: [PATCH 5/6] No initialisation with "0" --- src/SerialFake.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SerialFake.h b/src/SerialFake.h index 65fec59..ee25ba0 100644 --- a/src/SerialFake.h +++ b/src/SerialFake.h @@ -29,7 +29,7 @@ struct SerialFake : public StreamFake virtual bool dtr() = 0; virtual bool rts() = 0; - virtual void setDebugOutput(bool) = 0; + virtual void setDebugOutput(bool); }; class SerialFakeProxy : public StreamFakeProxy, public Serial_ From 987b48439b41a22253680586515f28b21b742da3 Mon Sep 17 00:00:00 2001 From: Jojo Date: Mon, 10 Feb 2025 15:36:53 +0100 Subject: [PATCH 6/6] IPAddress.toString() Methode added --- src/arduino/IPAddress.cpp | 7 +++++++ src/arduino/IPAddress.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/arduino/IPAddress.cpp b/src/arduino/IPAddress.cpp index f95e524..aaca797 100644 --- a/src/arduino/IPAddress.cpp +++ b/src/arduino/IPAddress.cpp @@ -112,3 +112,10 @@ size_t IPAddress::printTo(Print& p) const return n; } +String IPAddress::toString() const +{ + char szRet[16]; + sprintf(szRet,"%u.%u.%u.%u", _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3]); + return String(szRet); +} + diff --git a/src/arduino/IPAddress.h b/src/arduino/IPAddress.h index d762f2c..036100f 100644 --- a/src/arduino/IPAddress.h +++ b/src/arduino/IPAddress.h @@ -64,6 +64,7 @@ class IPAddress : public Printable { IPAddress& operator=(uint32_t address); virtual size_t printTo(Print& p) const; + String toString() const; friend class EthernetClass; friend class UDP;