Move logger setup to the front of setup() to allow early diagnostic o…

…utput. Reset parity error count on report.
dok-net · Dec 20, 2019 · 8175782 · 8175782
1 parent 9a772dd
commit 8175782
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 22 deletions.
diff --git a/examples/loopback/loopback.ino b/examples/loopback/loopback.ino
@@ -89,13 +89,31 @@ HardwareSerial& logger(Serial);
 void setup() {
 #if defined(ESP8266)
 #if defined(HWLOOPBACK) || defined(HWSOURCESINK) || defined(HWSOURCESWSINK)
-    Serial.begin(IUTBITRATE, hwSerialConfig, SERIAL_FULL, 1, invert);
-    Serial.swap();
-    Serial.setRxBufferSize(2 * BLOCKSIZE);
     logger.begin(9600, SWSERIAL_8N1, -1, TX);
 #else
     logger.begin(9600);
 #endif
+#elif defined(ESP32)
+#if defined(HWLOOPBACK) || defined(HWSOURCESWSINK)
+    logger.begin(9600);
+#elif defined(HWSOURCESINK)
+    logger.begin(9600);
+#else
+    logger.begin(9600);
+#endif
+#else
+    logger.begin(9600);
+#endif
+
+    logger.println("Loopback example for EspSoftwareSerial");
+
+
+#if defined(ESP8266)
+#if defined(HWLOOPBACK) || defined(HWSOURCESINK) || defined(HWSOURCESWSINK)
+    Serial.begin(IUTBITRATE, hwSerialConfig, SERIAL_FULL, 1, invert);
+    Serial.swap();
+    Serial.setRxBufferSize(2 * BLOCKSIZE);
+#endif
 #if !defined(HWSOURCESINK)
     serialIUT.begin(IUTBITRATE, swSerialConfig, D5, D6, invert, 2 * BLOCKSIZE);
 #ifdef HALFDUPLEX
@@ -106,25 +124,18 @@ void setup() {
 #if defined(HWLOOPBACK) || defined(HWSOURCESWSINK)
     Serial2.begin(IUTBITRATE, hwSerialConfig, D4, D3, invert);
     Serial2.setRxBufferSize(2 * BLOCKSIZE);
-    logger.begin(9600);
 #elif defined(HWSOURCESINK)
     serialIUT.begin(IUTBITRATE, hwSerialConfig, D5, D6, invert);
     serialIUT.setRxBufferSize(2 * BLOCKSIZE);
-    logger.begin(9600);
-#else
-    Serial.begin(9600);
 #endif
 #if !defined(HWSOURCESINK)
     serialIUT.begin(IUTBITRATE, swSerialConfig, D5, D6, invert, 2 * BLOCKSIZE);
 #ifdef HALFDUPLEX
     serialIUT.enableIntTx(false);
 #endif
 #endif
-#else
-    Serial.begin(9600);
-#if !defined(HWSOURCESINK)
+#elif !defined(HWSOURCESINK)
     serialIUT.begin(IUTBITRATE);
-#endif
 #endif
 
     start = micros();
@@ -133,8 +144,6 @@ void setup() {
     rxErrors = 0;
     rxParityErrors = 0;
     expected = -1;
-
-    logger.println("Loopback example for EspSoftwareSerial");
 }
 
 unsigned char c = 0;

diff --git a/examples/repeater/repeater.ino b/examples/repeater/repeater.ino
@@ -68,43 +68,48 @@ HardwareSerial& logger(Serial);
 #endif
 
 void setup() {
+#if defined(ESP8266)
+#if defined(HWLOOPBACK)
+    logger.begin(9600, SWSERIAL_8N1, -1, TX);
+#else
+    logger.begin(9600);
+#endif
+#else
+    logger.begin(9600);
+#endif
+
+    logger.println("Repeater example for EspSoftwareSerial");
+
 #if defined(ESP8266)
 #if defined(HWLOOPBACK)
     repeater.begin(IUTBITRATE, hwSerialConfig, SERIAL_FULL, 1, invert);
     repeater.swap();
     repeater.setRxBufferSize(2 * BLOCKSIZE);
-    logger.begin(9600, SWSERIAL_8N1, -1, TX);
 #else
     repeater.begin(IUTBITRATE, swSerialConfig, D7, D8, invert, 4 * BLOCKSIZE);
 #ifdef HALFDUPLEX
     repeater.enableIntTx(false);
 #endif
-    logger.begin(9600);
 #endif
 #elif defined(ESP32)
 #if defined(HWLOOPBACK)
     repeater.begin(IUTBITRATE, hwSerialConfig, D7, D8, invert);
     repeater.setRxBufferSize(2 * BLOCKSIZE);
-    logger.begin(9600);
 #else
     repeater.begin(IUTBITRATE, swSerialConfig, D7, D8, invert, 4 * BLOCKSIZE);
 #ifdef HALFDUPLEX
     repeater.enableIntTx(false);
 #endif
-    Serial.begin(9600);
 #endif
 #else
     repeater.begin(IUTBITRATE);
-    Serial.begin(9600);
 #endif
 
     start = micros();
     rxCount = 0;
     seqErrors = 0;
     parityErrors = 0;
     expected = -1;
-
-    logger.println("Repeater example for EspSoftwareSerial");
 }
 
 void loop() {
@@ -171,6 +176,7 @@ void loop() {
         start = end;
         rxCount = 0;
         seqErrors = 0;
+        parityErrors = 0;
         expected = -1;
     }
 }
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "EspSoftwareSerial",
-    "version": "6.5.1",
+    "version": "6.5.2",
     "keywords": [
       "serial", "io", "softwareserial"
     ],

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=EspSoftwareSerial
-version=6.5.1
+version=6.5.2
 author=Peter Lerup, Dirk Kaar
 maintainer=Peter Lerup <peter@lerup.com>
 sentence=Implementation of the Arduino software serial for ESP8266/ESP32.