Reordering EspSoftwareSerial and HW serial initialization was faulty, reverted, clean up.

Author: dok-net

examples/loopback/loopback.ino

@@ -87,32 +87,14 @@ HardwareSerial& logger(Serial);
 #endif
 
 void setup() {
-#if defined(ESP8266)
-#if defined(HWLOOPBACK) || defined(HWSOURCESINK) || defined(HWSOURCESWSINK)
-    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);
+    logger.begin(9600, SWSERIAL_8N1, -1, TX);
+#else
+    logger.begin(9600);
 #endif
 #if !defined(HWSOURCESINK)
     serialIUT.begin(IUTBITRATE, swSerialConfig, D5, D6, invert, 2 * BLOCKSIZE);
@@ -134,9 +116,15 @@ void setup() {
     serialIUT.enableIntTx(false);
 #endif
 #endif
-#elif !defined(HWSOURCESINK)
+    logger.begin(9600);
+#else
+#if !defined(HWSOURCESINK)
     serialIUT.begin(IUTBITRATE);
 #endif
+    logger.begin(9600);
+#endif
+
+    logger.println("Loopback example for EspSoftwareSerial");
 
     start = micros();
     txCount = 0;
@@ -183,10 +171,10 @@ void loop() {
 #endif
 #ifdef HWSOURCESINK
 #if defined(ESP8266)
-    if (Serial.hasOverrun()) { logger.println("Serial::overrun"); }
+    if (serialIUT.hasOverrun()) { logger.println("serialIUT.overrun"); }
 #endif
 #else
-    if (serialIUT.overflow()) { logger.println("SoftwareSerial::overflow"); }
+    if (serialIUT.overflow()) { logger.println("serialIUT.overflow"); }
 #endif
 
     int inCnt;
@@ -231,7 +219,7 @@ void loop() {
                 expected = -1;
             }
 #ifndef HWSOURCESINK
-            if ((serialIUT.readParity() ^ static_cast<bool>(swSerialConfig & 010)) != serialIUT.parityEven(r))
+            if (serialIUT.readParity() != (static_cast<bool>(swSerialConfig & 010) ? serialIUT.parityOdd(r) : serialIUT.parityEven(r)))
             {
                 ++rxParityErrors;
             }
@@ -256,7 +244,7 @@ void loop() {
             + rxErrors + " errors (" + 100.0 * rxErrors / (!rxErrors ? 1 : rxCount) + "%)");
         if (0 != (swSerialConfig & 070))
         {
-            logger.println(String(" (") + rxParityErrors + " parity errors)");
+            logger.print(" ("); logger.print(rxParityErrors) + logger.println(" parity errors)");
         }
         else
         {

examples/repeater/repeater.ino

@@ -68,28 +68,18 @@ 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)
@@ -101,10 +91,13 @@ void setup() {
     repeater.enableIntTx(false);
 #endif
 #endif
+    logger.begin(9600);
 #else
     repeater.begin(IUTBITRATE);
+    logger.begin(9600);
 #endif
 
+    logger.println("Repeater example for EspSoftwareSerial");
     start = micros();
     rxCount = 0;
     seqErrors = 0;
@@ -113,6 +106,14 @@ void setup() {
 }
 
 void loop() {
+#ifdef HWLOOPBACK
+#if defined(ESP8266)
+    if (repeater.hasOverrun()) { logger.println("repeater.overrun"); }
+#endif
+#else
+    if (repeater.overflow()) { logger.println("repeater.overflow"); }
+#endif
+
 #ifdef HALFDUPLEX
     char block[BLOCKSIZE];
 #endif
@@ -134,7 +135,7 @@ void loop() {
                 expected = -1;
             }
 #ifndef HWLOOPBACK
-            if ((repeater.readParity() ^ static_cast<bool>(swSerialConfig & 010)) != repeater.parityEven(r))
+            if (repeater.readParity() != (static_cast<bool>(swSerialConfig & 010) ? repeater.parityOdd(r) : repeater.parityEven(r)))
             {
                 ++parityErrors;
             }
@@ -166,7 +167,7 @@ void loop() {
 #ifndef HWLOOPBACK
         if (0 != (swSerialConfig & 070))
         {
-            logger.println(String(" (") + parityErrors + " parity errors)");
+            logger.print(" ("); logger.print(parityErrors) + logger.println(" parity errors)");
         }
         else
 #endif