Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🪄 Formats WiFiScanner

Browse Source
This commit is contained in:
Rune Harlyk
2024-07-09 19:59:47 +02:00
committed by Rune Harlyk
parent bec053ad18
commit 3ff5384b42
2 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/WiFiScanner.cpp
+12 -27
View File
@@ -14,49 +14,38 @@
#include <WiFiScanner.h> #include <WiFiScanner.h>
WiFiScanner::WiFiScanner(PsychicHttpServer *server, WiFiScanner::WiFiScanner(PsychicHttpServer *server, SecurityManager *securityManager)
SecurityManager *securityManager) : _server(server), : _server(server), _securityManager(securityManager) {}
_securityManager(securityManager)
{
}
void WiFiScanner::begin() void WiFiScanner::begin() {
{ _server->on(SCAN_NETWORKS_SERVICE_PATH, HTTP_GET,
_server->on(SCAN_NETWORKS_SERVICE_PATH,
HTTP_GET,
_securityManager->wrapRequest(std::bind(&WiFiScanner::scanNetworks, this, std::placeholders::_1), _securityManager->wrapRequest(std::bind(&WiFiScanner::scanNetworks, this, std::placeholders::_1),
AuthenticationPredicates::IS_ADMIN)); AuthenticationPredicates::IS_ADMIN));
ESP_LOGV("WiFiScanner", "Registered GET endpoint: %s", SCAN_NETWORKS_SERVICE_PATH); ESP_LOGV("WiFiScanner", "Registered GET endpoint: %s", SCAN_NETWORKS_SERVICE_PATH);
_server->on(LIST_NETWORKS_SERVICE_PATH, _server->on(LIST_NETWORKS_SERVICE_PATH, HTTP_GET,
HTTP_GET,
_securityManager->wrapRequest(std::bind(&WiFiScanner::listNetworks, this, std::placeholders::_1), _securityManager->wrapRequest(std::bind(&WiFiScanner::listNetworks, this, std::placeholders::_1),
AuthenticationPredicates::IS_ADMIN)); AuthenticationPredicates::IS_ADMIN));
ESP_LOGV("WiFiScanner", "Registered GET endpoint: %s", LIST_NETWORKS_SERVICE_PATH); ESP_LOGV("WiFiScanner", "Registered GET endpoint: %s", LIST_NETWORKS_SERVICE_PATH);
} }
esp_err_t WiFiScanner::scanNetworks(PsychicRequest *request) esp_err_t WiFiScanner::scanNetworks(PsychicRequest *request) {
{ if (WiFi.scanComplete() != -1) {
if (WiFi.scanComplete() != -1)
{
WiFi.scanDelete(); WiFi.scanDelete();
WiFi.scanNetworks(true); WiFi.scanNetworks(true);
} }
return request->reply(202); return request->reply(202);
} }
esp_err_t WiFiScanner::listNetworks(PsychicRequest *request) esp_err_t WiFiScanner::listNetworks(PsychicRequest *request) {
{
int numNetworks = WiFi.scanComplete(); int numNetworks = WiFi.scanComplete();
if (numNetworks > -1) if (numNetworks > -1) {
{
PsychicJsonResponse response = PsychicJsonResponse(request, false); PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot(); JsonObject root = response.getRoot();
JsonArray networks = root["networks"].to<JsonArray>(); JsonArray networks = root["networks"].to<JsonArray>();
for (int i = 0; i < numNetworks; i++) for (int i = 0; i < numNetworks; i++) {
{
JsonObject network = networks.add<JsonObject>(); JsonObject network = networks.add<JsonObject>();
network["rssi"] = WiFi.RSSI(i); network["rssi"] = WiFi.RSSI(i);
network["ssid"] = WiFi.SSID(i); network["ssid"] = WiFi.SSID(i);
@@ -66,13 +55,9 @@ esp_err_t WiFiScanner::listNetworks(PsychicRequest *request)
} }
return response.send(); return response.send();
} } else if (numNetworks == -1) {
else if (numNetworks == -1)
{
return request->reply(202); return request->reply(202);
} } else {
else
{
return scanNetworks(request); return scanNetworks(request);
} }
} }
esp32/lib/ESP32-sveltekit/WiFiScanner.h
+3 -4
View File
@@ -24,14 +24,13 @@
#define SCAN_NETWORKS_SERVICE_PATH "/api/scanNetworks" #define SCAN_NETWORKS_SERVICE_PATH "/api/scanNetworks"
#define LIST_NETWORKS_SERVICE_PATH "/api/listNetworks" #define LIST_NETWORKS_SERVICE_PATH "/api/listNetworks"
class WiFiScanner class WiFiScanner {
{ public:
public:
WiFiScanner(PsychicHttpServer *server, SecurityManager *securityManager); WiFiScanner(PsychicHttpServer *server, SecurityManager *securityManager);
void begin(); void begin();
private: private:
PsychicHttpServer *_server; PsychicHttpServer *_server;
SecurityManager *_securityManager; SecurityManager *_securityManager;