Merge pull request #355 from justcallmekoko/develop

Develop

.github/workflows/build_push.yml

@@ -121,6 +121,13 @@ jobs:
           ref: v1.3.3
           path: CustomLinkedList
 
+      - name: Install EspSoftwareSerial
+        uses: actions/checkout@v2
+        with:
+          repository: plerup/espsoftwareserial
+          ref: 8.1.0
+          path: CustomEspSoftwareSerial
+
       #- name: Search for SD lib in arduino-esp32 v2.0.4
       #  run: |
       #    find /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.4arduino-esp32 -name "SD"

README.md

@@ -3,7 +3,7 @@
 <!---[![Build Status](https://travis-ci.com/justcallmekoko/ESP32Marauder.svg?branch=master)](https://travis-ci.com/justcallmekoko/ESP32Marauder)--->
 <!---Shields/Badges https://shields.io/--->
 
-# ESP32 Marauder v0.13.0
+# ESP32 Marauder v0.13.1
 <p align="center"><img alt="Marauder logo" src="https://github.com/justcallmekoko/ESP32Marauder/blob/master/pictures/marauder3L.jpg?raw=true" width="300"></p>
 <p align="center">
   <b>A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32</b>

esp32_marauder/GpsInterface.cpp

@@ -6,11 +6,19 @@ char nmeaBuffer[100];
 
 MicroNMEA nmea(nmeaBuffer, sizeof(nmeaBuffer));
 
-HardwareSerial Serial2(GPS_SERIAL_INDEX);
+#ifndef GPS_SOFTWARE_SERIAL
+  HardwareSerial Serial2(GPS_SERIAL_INDEX);
+#else
+  EspSoftwareSerial::UART Serial2;
+#endif
 
 void GpsInterface::begin() {
 
-  Serial2.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX);
+  #ifndef GPS_SOFTWARE_SERIAL
+    Serial2.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX);
+  #else
+    Serial2.begin(9600, SWSERIAL_8N1, GPS_TX, GPS_RX);
+  #endif
 
   MicroNMEA::sendSentence(Serial2, "$PSTMSETPAR,1201,0x00000042");
   MicroNMEA::sendSentence(Serial2, "$PSTMSAVEPAR");

esp32_marauder/GpsInterface.h

@@ -2,6 +2,7 @@
 #define GpsInterface_h
 
 #include <MicroNMEA.h>
+#include <SoftwareSerial.h>
 
 #include "configs.h"
 

esp32_marauder/configs.h

@@ -22,7 +22,7 @@
   //#define XIAO_ESP32_S3
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v0.13.0"
+  #define MARAUDER_VERSION "v0.13.1"
 
  //// BOARD FEATURES
   #ifdef MARAUDER_M5STICKC
@@ -794,7 +794,11 @@
       #define GPS_RX 22
       #define mac_history_len 512
     #elif defined(MARAUDER_FLIPPER)
-      #define GPS_SERIAL_INDEX 1
+      #ifdef WRITE_PACKETS_SERIAL
+        #define GPS_SOFTWARE_SERIAL
+      #else
+        #define GPS_SERIAL_INDEX 1
+      #endif
       #define GPS_TX 9
       #define GPS_RX 21
       #define mac_history_len 512