From ee2dc4f831883d839bd304879fabe98ac27f6d7d Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Sun, 11 Jun 2023 19:33:16 -0400
Subject: [PATCH] update for SPIFFS OTA

---
 platformio.ini        | 2 +-
 src/configuration.cpp | 2 ++
 src/configuration.h   | 2 --
 src/digi_utils.cpp    | 6 +++++-
 src/utils.cpp         | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index a79037e..d29d236 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ platform = espressif32 @ 6.2.0
 board = ttgo-lora32-v21
 framework = arduino
 monitor_speed = 115200
-lib_deps = 
+lib_deps =
 	bblanchon/ArduinoJson@^6.20.2
 	sandeepmistry/LoRa@^0.8.0
 	adafruit/Adafruit GFX Library @ 1.11.5
diff --git a/src/configuration.cpp b/src/configuration.cpp
index f5eaae5..664abd7 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -1,3 +1,5 @@
+#include <ArduinoJson.h>
+#include <SPIFFS.h>
 #include "configuration.h"
 #include "display.h"
 
diff --git a/src/configuration.h b/src/configuration.h
index f45bf66..9e622ce 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -1,9 +1,7 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
 
-#include <ArduinoJson.h>
 #include <Arduino.h>
-#include <SPIFFS.h>
 #include <vector>
 #include <FS.h>
 
diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp
index d5bdcf4..c7be0a9 100644
--- a/src/digi_utils.cpp
+++ b/src/digi_utils.cpp
@@ -26,7 +26,11 @@ void processPacket(String packet) {
                 lastScreenOn = millis();
             } else if (stationMode ==4){
                 utils::typeOfPacket(packet);
-                loraPacket = packet.substring(3,packet.indexOf(",")+1) + Config.callsign + "*" + packet.substring(packet.indexOf(","));
+                if (packet.indexOf("WIDE1-1") == -1) {
+                    loraPacket = packet.substring(3,packet.indexOf(":")) + "," + Config.callsign + "*" + packet.indexOf(":");
+                } else {
+                    loraPacket = packet.substring(3,packet.indexOf(",")+1) + Config.callsign + "*" + packet.substring(packet.indexOf(","));
+                }
                 delay(500);
                 if (stationMode == 4) {
                     LoRa_Utils::changeFreqTx();
diff --git a/src/utils.cpp b/src/utils.cpp
index 75ba112..a087199 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,6 +1,7 @@
 #include <ESPAsyncWebServer.h>
 #include <AsyncElegantOTA.h>
 #include <AsyncTCP.h>
+#include <SPIFFS.h>
 #include <WiFi.h>
 #include "configuration.h"
 #include "pins_config.h"