From e9b8f79e6e6870ff50b823dc3c049e42a572b20a Mon Sep 17 00:00:00 2001 From: Roar Fredriksen Date: Tue, 26 Sep 2017 18:53:53 +0200 Subject: [PATCH] Fixed a bug where han port variable was never set --- Code/Arduino/HanReader/src/HanReader.cpp | 1 + Code/Arduino/HanReader/src/HanReader.h | 2 +- Code/ESPDebugger/HanReader.cpp | 1 + Code/ESPDebugger/HanReader.h | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Code/Arduino/HanReader/src/HanReader.cpp b/Code/Arduino/HanReader/src/HanReader.cpp index 6b793d1c..ddbcd0fc 100644 --- a/Code/Arduino/HanReader/src/HanReader.cpp +++ b/Code/Arduino/HanReader/src/HanReader.cpp @@ -11,6 +11,7 @@ void HanReader::setup(HardwareSerial *hanPort) hanPort->begin(2400, SERIAL_8E1); while (!hanPort) {} bytesRead = 0; + han = hanPort; } void HanReader::setup(HardwareSerial *hanPort, Stream *debugPort) diff --git a/Code/Arduino/HanReader/src/HanReader.h b/Code/Arduino/HanReader/src/HanReader.h index 34740bfb..b19a8a7f 100644 --- a/Code/Arduino/HanReader/src/HanReader.h +++ b/Code/Arduino/HanReader/src/HanReader.h @@ -32,7 +32,7 @@ class HanReader private: Stream *debug; - Stream *han; + HardwareSerial *han; byte buffer[512]; int bytesRead; KaifaHan kaifa; diff --git a/Code/ESPDebugger/HanReader.cpp b/Code/ESPDebugger/HanReader.cpp index 6b793d1c..ddbcd0fc 100644 --- a/Code/ESPDebugger/HanReader.cpp +++ b/Code/ESPDebugger/HanReader.cpp @@ -11,6 +11,7 @@ void HanReader::setup(HardwareSerial *hanPort) hanPort->begin(2400, SERIAL_8E1); while (!hanPort) {} bytesRead = 0; + han = hanPort; } void HanReader::setup(HardwareSerial *hanPort, Stream *debugPort) diff --git a/Code/ESPDebugger/HanReader.h b/Code/ESPDebugger/HanReader.h index 34740bfb..b19a8a7f 100644 --- a/Code/ESPDebugger/HanReader.h +++ b/Code/ESPDebugger/HanReader.h @@ -32,7 +32,7 @@ class HanReader private: Stream *debug; - Stream *han; + HardwareSerial *han; byte buffer[512]; int bytesRead; KaifaHan kaifa;