@@ -87,32 +87,14 @@ HardwareSerial& logger(Serial);
87
87
#endif
88
88
89
89
void setup () {
90
- #if defined(ESP8266)
91
- #if defined(HWLOOPBACK) || defined(HWSOURCESINK) || defined(HWSOURCESWSINK)
92
- logger.begin (9600 , SWSERIAL_8N1, -1 , TX);
93
- #else
94
- logger.begin (9600 );
95
- #endif
96
- #elif defined(ESP32)
97
- #if defined(HWLOOPBACK) || defined(HWSOURCESWSINK)
98
- logger.begin (9600 );
99
- #elif defined(HWSOURCESINK)
100
- logger.begin (9600 );
101
- #else
102
- logger.begin (9600 );
103
- #endif
104
- #else
105
- logger.begin (9600 );
106
- #endif
107
-
108
- logger.println (" Loopback example for EspSoftwareSerial" );
109
-
110
-
111
90
#if defined(ESP8266)
112
91
#if defined(HWLOOPBACK) || defined(HWSOURCESINK) || defined(HWSOURCESWSINK)
113
92
Serial.begin (IUTBITRATE, hwSerialConfig, SERIAL_FULL, 1 , invert);
114
93
Serial.swap ();
115
94
Serial.setRxBufferSize (2 * BLOCKSIZE);
95
+ logger.begin (9600 , SWSERIAL_8N1, -1 , TX);
96
+ #else
97
+ logger.begin (9600 );
116
98
#endif
117
99
#if !defined(HWSOURCESINK)
118
100
serialIUT.begin (IUTBITRATE, swSerialConfig, D5, D6, invert, 2 * BLOCKSIZE);
@@ -134,9 +116,15 @@ void setup() {
134
116
serialIUT.enableIntTx (false );
135
117
#endif
136
118
#endif
137
- #elif !defined(HWSOURCESINK)
119
+ logger.begin (9600 );
120
+ #else
121
+ #if !defined(HWSOURCESINK)
138
122
serialIUT.begin (IUTBITRATE);
139
123
#endif
124
+ logger.begin (9600 );
125
+ #endif
126
+
127
+ logger.println (" Loopback example for EspSoftwareSerial" );
140
128
141
129
start = micros ();
142
130
txCount = 0 ;
@@ -183,10 +171,10 @@ void loop() {
183
171
#endif
184
172
#ifdef HWSOURCESINK
185
173
#if defined(ESP8266)
186
- if (Serial .hasOverrun ()) { logger.println (" Serial:: overrun" ); }
174
+ if (serialIUT .hasOverrun ()) { logger.println (" serialIUT. overrun" ); }
187
175
#endif
188
176
#else
189
- if (serialIUT.overflow ()) { logger.println (" SoftwareSerial:: overflow" ); }
177
+ if (serialIUT.overflow ()) { logger.println (" serialIUT. overflow" ); }
190
178
#endif
191
179
192
180
int inCnt;
@@ -231,7 +219,7 @@ void loop() {
231
219
expected = -1 ;
232
220
}
233
221
#ifndef HWSOURCESINK
234
- if (( serialIUT.readParity () ^ static_cast <bool >(swSerialConfig & 010 )) != serialIUT.parityEven (r))
222
+ if (serialIUT.readParity () != ( static_cast <bool >(swSerialConfig & 010 ) ? serialIUT. parityOdd (r) : serialIUT.parityEven (r) ))
235
223
{
236
224
++rxParityErrors;
237
225
}
@@ -256,7 +244,7 @@ void loop() {
256
244
+ rxErrors + " errors (" + 100.0 * rxErrors / (!rxErrors ? 1 : rxCount) + " %)" );
257
245
if (0 != (swSerialConfig & 070 ))
258
246
{
259
- logger.println ( String ( " (" ) + rxParityErrors + " parity errors)" );
247
+ logger.print ( " (" ); logger. print ( rxParityErrors) + logger. println ( " parity errors)" );
260
248
}
261
249
else
262
250
{
0 commit comments