From 036942f4f401299983b84bbd112ebc891d83dc15 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 21 Dec 2023 15:56:59 -0300 Subject: [PATCH] no OTA version --- README.md | 3 +++ platformio.ini | 3 --- src/LoRa_APRS_iGate.cpp | 4 ++-- src/aprs_is_utils.cpp | 4 ++-- src/utils.cpp | 18 +++++++++--------- src/utils.h | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 8d230b6..2bdd80e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # Richonguzman / CA2RXU LoRa APRS iGate/Digirepeater ___________________________________________________ +NO OTA FOR NOW!!!! + + BAD NEWS : AsyncTCP library has a bug and gets this new and old firmware as NOT COMPILING STATUE, SO PLEASE WAIT, as soon as I can I will have it running again! ___________________________________________________ diff --git a/platformio.ini b/platformio.ini index f7fb1d7..62944b1 100644 --- a/platformio.ini +++ b/platformio.ini @@ -20,9 +20,6 @@ lib_deps = sandeepmistry/LoRa@^0.8.0 adafruit/Adafruit GFX Library @ 1.11.5 adafruit/Adafruit SSD1306 @ 2.5.7 - ayushsharma82/ElegantOTA@^3.1.0 - ottowinter/ESPAsyncWebServer-esphome@^3.1.0 - esphome/AsyncTCP-esphome@^2.0.0 mikalhart/TinyGPSPlus @ 1.0.3 adafruit/Adafruit Unified Sensor@^1.1.9 adafruit/Adafruit BME280 Library@^2.2.2 diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 97d92e0..dc0eaf1 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -58,7 +58,7 @@ void setup() { LoRa_Utils::setup(); Utils::validateDigiFreqs(); iGateBeaconPacket = GPS_Utils::generateBeacon(); - Utils::startServer(); + //Utils::startServer(); SYSLOG_Utils::setup(); BME_Utils::setup(); } @@ -82,7 +82,7 @@ void loop() { if (lastStationModeState == 1) { iGateBeaconPacket = GPS_Utils::generateBeacon(); lastStationModeState = 0; - Utils::startServer(); + //Utils::startServer(); } APRS_IS_Utils::loop(); } else { // DigiRepeater Mode diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp index 4cbb3cb..4a8d7a7 100644 --- a/src/aprs_is_utils.cpp +++ b/src/aprs_is_utils.cpp @@ -1,4 +1,4 @@ -#include +//#include #include #include "configuration.h" #include "aprs_is_utils.h" @@ -220,7 +220,7 @@ namespace APRS_IS_Utils { aprsisPacket.concat(espClient.readStringUntil('\r')); processAPRSISPacket(aprsisPacket); } - ElegantOTA.loop(); + //ElegantOTA.loop(); } } } \ No newline at end of file diff --git a/src/utils.cpp b/src/utils.cpp index d290163..7773fc9 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1,6 +1,6 @@ -#include +/*#include #include -#include +#include */ #include #include #include "configuration.h" @@ -16,7 +16,7 @@ #include "display.h" #include "utils.h" -AsyncWebServer server(80); +//AsyncWebServer server(80); extern WiFiClient espClient; extern Configuration Config; @@ -50,9 +50,9 @@ unsigned long ota_progress_millis = 0; namespace Utils { - void notFound(AsyncWebServerRequest *request) { + /*void notFound(AsyncWebServerRequest *request) { request->send(404, "text/plain", "Not found"); - } + }*/ void processStatus() { String status = Config.callsign + ">APLRG1,WIDE1-1"; @@ -314,7 +314,7 @@ namespace Utils { } } - void onOTAStart() { + /*void onOTAStart() { Serial.println("OTA update started!"); display_toggle(true); lastScreenOn = millis(); @@ -342,8 +342,8 @@ namespace Utils { show_display("", "", " OTA update fail!", "", "", "", "", 4000); } } - - void startServer() { + */ + /*void startServer() { if (stationMode==1 || stationMode==2 || (stationMode==5 && WiFi.status()==WL_CONNECTED)) { server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) { request->send(200, "text/plain", "Hi " + Config.callsign + ", \n\nthis is your (Richonguzman/CA2RXU) LoRa APRS iGate , version " + versionDate + "\n\nTo update your firmware or filesystem go to: http://" + getLocalIP().substring(getLocalIP().indexOf(":")+3) + "/update\n\n\n73!"); @@ -391,6 +391,6 @@ namespace Utils { server.begin(); Serial.println("init : OTA Server ... done!"); } - } + }*/ } \ No newline at end of file diff --git a/src/utils.h b/src/utils.h index 701ea1d..9b2a261 100644 --- a/src/utils.h +++ b/src/utils.h @@ -14,10 +14,10 @@ namespace Utils { void checkWiFiInterval(); void validateDigiFreqs(); void typeOfPacket(String packet, String packetType); - void onOTAStart(); + /*void onOTAStart(); void onOTAProgress(size_t current, size_t final); void onOTAEnd(bool success); - void startServer(); + void startServer();*/ }