Revert "Disable software SPI for ESP32 MCUs"

This reverts commit 793b53dd4cc71ba7695a31d50e8fef46f39d322b.

diff --git a/Config.h b/Config.h
index 4eda6c7df00cabf71b4f3305ac7e50c65230f6b9..1e4ac8005cd311c1a1d7615b8a1e774b724e5093 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -316,7 +316,6 @@
             const int pin_dio = 47;
             const int pin_led_rx = LED_BLUE;
             const int pin_led_tx = LED_GREEN;
-            #define RXEN_BUSY_PINS
         #endif
        #else
                #error An unsupported board was selected. Cannot compile RNode firmware.
@@ -334,17 +333,12 @@
        #define eeprom_addr(a) (a+EEPROM_OFFSET)
 
     #if MODEM == SX1276 || MODEM == SX1278
-        SPIClass spiModem();
+        SPIClass spiModem(pin_miso, pin_sclk, pin_mosi);
     #elif MODEM == SX1262
         SPIClass spiModem(NRF_SPIM2, pin_miso, pin_sclk, pin_mosi);
     #endif
 
        // MCU independent configuration parameters
-    #ifndef RXEN_BUSY_PINS
-    const int pin_rxen = -1;
-    const int pin_busy = -1;
-    #endif
-
        const long serial_baudrate  = 115200;
 
        // SX1276 RSSI offset to get dBm value from

diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index df36c5cd97e079ae3c985809348458ebf174a545..b59c5d130149dad99ea2a549054106e2b95947be 100644 (file)
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -86,11 +86,7 @@ void setup() {
 
   // Set chip select, reset and interrupt
   // pins for the LoRa module
-  if ((pin_rxen != -1) && (pin_busy != -1)) {
-      LoRa.setPins(pin_cs, pin_reset, pin_dio, pin_rxen, pin_busy);
-  } else {
-      LoRa.setPins(pin_cs, pin_reset, pin_dio);
-  }
+  LoRa.setPins(pin_cs, pin_reset, pin_dio, pin_rxen, pin_busy);
   
   #if MCU_VARIANT == MCU_ESP32 || MCU_VARIANT == MCU_NRF52
     init_channel_stats();
@@ -1305,10 +1301,10 @@ void buffer_serial() {
         if (!fifo_isfull_locked(&serialFIFO)) {
           fifo_push_locked(&serialFIFO, Serial.read());
         }
-      #elif HAS_BLUETOOTH
-        if (bt_state == BT_STATE_CONNECTED) {
+      #else
+        if (HAS_BLUETOOTH && bt_state == BT_STATE_CONNECTED) {
           if (!fifo_isfull(&serialFIFO)) {
-            fifo_push(&serialFIFO, SerialBT.read());
+            //fifo_push(&serialFIFO, SerialBT.read());
           }
         } else {
           if (!fifo_isfull(&serialFIFO)) {

diff --git a/Utilities.h b/Utilities.h
index fe61b7c9c5118d86f5c449bac7b6e976712c3cf0..a3597a418f433c0109e3dfcfb60a4b6a90f31924 100644 (file)
--- a/Utilities.h
+++ b/Utilities.h
@@ -13,8 +13,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "Config.h"
-
 #if HAS_EEPROM 
     #include <EEPROM.h>
 #elif PLATFORM == PLATFORM_NRF52
@@ -22,6 +20,7 @@
     int written_bytes = 0;
 #endif
 #include <stddef.h>
+#include "Config.h"
 #include "LoRa.h"
 #include "ROM.h"
 #include "Framing.h"