From f92e51377c5affe9fbad2a2e53f3197a0416367b Mon Sep 17 00:00:00 2001 From: RaffaelW Date: Sun, 15 Dec 2024 21:32:13 +0100 Subject: [PATCH] moved onGetNetworks function to new file --- src/main.cpp | 1 + src/routes/config.cpp | 28 ---------------------------- src/routes/config.h | 2 -- src/routes/networks.cpp | 29 +++++++++++++++++++++++++++++ src/routes/networks.h | 9 +++++++++ 5 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 src/routes/networks.cpp create mode 100644 src/routes/networks.h diff --git a/src/main.cpp b/src/main.cpp index 9a02be3..d4bac96 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,6 +16,7 @@ #include "ESPDMX.h" #include #include "routes/config.h" +#include "routes/networks.h" DMXESPSerial dmx1; DMXESPSerial dmx2; diff --git a/src/routes/config.cpp b/src/routes/config.cpp index 85cb4f5..d586feb 100644 --- a/src/routes/config.cpp +++ b/src/routes/config.cpp @@ -161,31 +161,3 @@ void onPutConfig(AsyncWebServerRequest *request, uint8_t *data, size_t len, size request->send(400, "text/plain", e.what()); } } - -void onGetNetworks(AsyncWebServerRequest *request) -{ - JsonDocument doc; - JsonArray array = doc.to(); - - int numberOfNetworks = WiFi.scanComplete(); - if (numberOfNetworks == WIFI_SCAN_FAILED) - { - WiFi.scanNetworks(true); - } - else if (numberOfNetworks) - { - for (int i = 0; i < numberOfNetworks; ++i) - { - array.add(WiFi.SSID(i)); - } - WiFi.scanDelete(); - if (WiFi.scanComplete() == WIFI_SCAN_FAILED) - { - WiFi.scanNetworks(true); - } - } - - String jsonString; - serializeJson(doc, jsonString); - request->send(200, "application/json", jsonString); -} diff --git a/src/routes/config.h b/src/routes/config.h index 4e928fa..bac228d 100644 --- a/src/routes/config.h +++ b/src/routes/config.h @@ -48,6 +48,4 @@ void onGetConfig(AsyncWebServerRequest *request); void onPutConfig(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total); -void onGetNetworks(AsyncWebServerRequest *request); - #endif \ No newline at end of file diff --git a/src/routes/networks.cpp b/src/routes/networks.cpp new file mode 100644 index 0000000..38bcf7c --- /dev/null +++ b/src/routes/networks.cpp @@ -0,0 +1,29 @@ +#include "networks.h"; + +void onGetNetworks(AsyncWebServerRequest *request) +{ + JsonDocument doc; + JsonArray array = doc.to(); + + int numberOfNetworks = WiFi.scanComplete(); + if (numberOfNetworks == WIFI_SCAN_FAILED) + { + WiFi.scanNetworks(true); + } + else if (numberOfNetworks) + { + for (int i = 0; i < numberOfNetworks; ++i) + { + array.add(WiFi.SSID(i)); + } + WiFi.scanDelete(); + if (WiFi.scanComplete() == WIFI_SCAN_FAILED) + { + WiFi.scanNetworks(true); + } + } + + String jsonString; + serializeJson(doc, jsonString); + request->send(200, "application/json", jsonString); +} diff --git a/src/routes/networks.h b/src/routes/networks.h new file mode 100644 index 0000000..33a742c --- /dev/null +++ b/src/routes/networks.h @@ -0,0 +1,9 @@ +#include +#include + +#ifndef NETWORKS_H +#define NETWORKS_H + +void onGetNetworks(AsyncWebServerRequest *request); + +#endif \ No newline at end of file