Remove restriction on free use of TX/RX. Fixes #168

plerup · Jun 11, 2020 · 5a84bc8 · 5a84bc8
1 parent 42c182f
commit 5a84bc8
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 18 deletions.
diff --git a/examples/loopback/loopback.ino b/examples/loopback/loopback.ino
@@ -16,12 +16,20 @@
 // Hardware Serial2 defaults to D4 (rx), D3 (tx).
 // For local hardware loopback, connect D5 (rx) to D3 (tx), D6 (tx) to D4 (rx).
 
-#if defined(ESP8266) && !defined(D5)
+#ifndef D5
+#if defined(ESP8266)
 #define D5 (14)
 #define D6 (12)
 #define D7 (13)
 #define D8 (15)
 #define TX (1)
+#elif defined(ESP32)
+#define D5 (18)
+#define D6 (19)
+#define D7 (23)
+#define D8 (5)
+#define TX (1)
+#endif
 #endif
 
 // Pick only one of HWLOOPBACK, HWSOURCESWSINK, or HWSOURCESINK

diff --git a/examples/repeater/repeater.ino b/examples/repeater/repeater.ino
@@ -9,12 +9,20 @@
 // On ESP32:
 // For software or hardware loopback, connect source rx to local D8 (tx), source tx to local D7 (rx).
 
-#if defined(ESP8266) && !defined(D5)
+#ifndef D5
+#if defined(ESP8266)
 #define D5 (14)
 #define D6 (12)
 #define D7 (13)
 #define D8 (15)
 #define TX (1)
+#elif defined(ESP32)
+#define D5 (18)
+#define D6 (19)
+#define D7 (23)
+#define D8 (5)
+#define TX (1)
+#endif
 #endif
 
 #define HWLOOPBACK 1

diff --git a/examples/swsertest/swsertest.ino b/examples/swsertest/swsertest.ino
@@ -4,11 +4,20 @@
 
 #include <SoftwareSerial.h>
 
-#if defined(ESP8266) && !defined(D5)
+#ifndef D5
+#if defined(ESP8266)
 #define D5 (14)
 #define D6 (12)
 #define D7 (13)
 #define D8 (15)
+#define TX (1)
+#elif defined(ESP32)
+#define D5 (18)
+#define D6 (19)
+#define D7 (23)
+#define D8 (5)
+#define TX (1)
+#endif
 #endif
 
 #ifdef ESP32

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "EspSoftwareSerial",
-    "version": "6.8.2",
+    "version": "6.8.3",
     "keywords": [
       "serial", "io", "softwareserial"
     ],

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=EspSoftwareSerial
-version=6.8.2
+version=6.8.3
 author=Peter Lerup, Dirk Kaar
 maintainer=Dirk Kaar <[email protected]>
 sentence=Implementation of the Arduino software serial for ESP8266/ESP32.

diff --git a/src/SoftwareSerial.cpp b/src/SoftwareSerial.cpp
@@ -59,21 +59,11 @@ bool SoftwareSerial::isValidGPIOpin(int8_t pin) {
 
 bool SoftwareSerial::isValidRxGPIOpin(int8_t pin) {
     return isValidGPIOpin(pin)
-#if defined(ESP8266) || defined(ESP32)
-        && (pin != 1)
-#endif
 #if defined(ESP8266)
         && (pin != 16)
 #endif
         ;
 }
-bool SoftwareSerial::isValidTxGPIOpin(int8_t pin) {
-    return isValidGPIOpin(pin)
-#if defined(ESP8266) || defined(ESP32)
-        && (pin != 3)
-#endif
-        ;
-}
 
 void SoftwareSerial::begin(uint32_t baud, SoftwareSerialConfig config,
     int8_t rxPin, int8_t txPin,
@@ -102,7 +92,7 @@ void SoftwareSerial::begin(uint32_t baud, SoftwareSerialConfig config,
             pinMode(m_rxPin, INPUT_PULLUP);
         }
     }
-    if (isValidTxGPIOpin(m_txPin)) {
+    if (isValidGPIOpin(m_txPin)) {
         m_txValid = true;
         if (!m_oneWire) {
             pinMode(m_txPin, OUTPUT);
@@ -130,7 +120,7 @@ uint32_t SoftwareSerial::baudRate() {
 }
 
 void SoftwareSerial::setTransmitEnablePin(int8_t txEnablePin) {
-    if (isValidTxGPIOpin(txEnablePin)) {
+    if (isValidGPIOpin(txEnablePin)) {
         m_txEnableValid = true;
         m_txEnablePin = txEnablePin;
         pinMode(m_txEnablePin, OUTPUT);

diff --git a/src/SoftwareSerial.h b/src/SoftwareSerial.h
@@ -211,7 +211,6 @@ class SoftwareSerial : public Stream {
         uint32_t dutyCycle, uint32_t offCycle, bool withStopBit);
     bool isValidGPIOpin(int8_t pin);
     bool isValidRxGPIOpin(int8_t pin);
-    bool isValidTxGPIOpin(int8_t pin);
     /* check m_rxValid that calling is safe */
     void rxBits();
     void rxBits(const uint32_t& isrCycle);