From 11b45a2345c661fc7cb58ed210696c1846361ca1 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Sat, 10 Jun 2023 20:11:20 -0400 Subject: [PATCH] test OTA also (only Firmwares and not Filesystem!) --- src/LoRa_APRS_iGate.cpp | 13 ++----------- src/lora_utils.cpp | 2 +- src/utils.cpp | 16 ++++++++++++++++ src/utils.h | 1 + 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index fdc4ba3..f5c628d 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -13,15 +13,11 @@ #include "gps_utils.h" #include "display.h" #include "utils.h" -/*#include -#include -#include */ Configuration Config; WiFiClient espClient; -//AsyncWebServer server(80); -String versionDate = "2023.06.09"; +String versionDate = "2023.06.10"; int myWiFiAPIndex = 0; int myWiFiAPSize = Config.wifiAPs.size(); WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; @@ -49,12 +45,7 @@ void setup() { LoRa_Utils::setup(); utils::validateDigiFreqs(); iGateBeaconPacket = GPS_Utils::generateBeacon(); - /*server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) { - request->send(200, "text/plain", "Hi! I am ESP32."); - }); - AsyncElegantOTA.begin(&server); // Start ElegantOTA - server.begin(); - Serial.println("HTTP server started");*/ + utils::startOTAServer(); } void loop() { diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index ee1db59..4a6253e 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -29,7 +29,7 @@ void setup() { LoRa.setCodingRate4(Config.loramodule.codingRate4); LoRa.enableCrc(); LoRa.setTxPower(Config.loramodule.power); - Serial.println("LoRa init done!\n"); + Serial.println("LoRa init done!"); } void sendNewPacket(const String &typeOfMessage, const String &newPacket) { diff --git a/src/utils.cpp b/src/utils.cpp index 52ac3b9..7aad27c 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -5,6 +5,11 @@ #include "lora_utils.h" #include "display.h" #include "utils.h" +#include +#include +#include + +AsyncWebServer server(80); extern WiFiClient espClient; extern Configuration Config; @@ -132,4 +137,15 @@ void typeOfPacket(String packet) { } } +void startOTAServer() { + if (stationMode==1 || stationMode==2) { + server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) { + request->send(200, "text/plain", "Hi This is your Richonguzman / CD2RXU LoRa iGate.\nIf you want tu update your firmware please go to: {iGate-IP-Adress}/update"); + }); + AsyncElegantOTA.begin(&server); + server.begin(); + Serial.println("HTTP server started (OTA Firmware Updates)!\n"); + } +} + } \ No newline at end of file diff --git a/src/utils.h b/src/utils.h index 80c3c64..6b389ae 100644 --- a/src/utils.h +++ b/src/utils.h @@ -12,6 +12,7 @@ void checkBeaconInterval(); void checkDisplayInterval(); void validateDigiFreqs(); void typeOfPacket(String packet); +void startOTAServer(); }