From 6064ee18f3fd935588bcb4b8f0a06886c32d7824 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 12 Aug 2026 00:47:52 +0300 Subject: [PATCH] Disable Wi-Fi code --- flix/wifi.ino | 193 +++++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 96 deletions(-) diff --git a/flix/wifi.ino b/flix/wifi.ino index 0673190..fec6d48 100644 --- a/flix/wifi.ino +++ b/flix/wifi.ino @@ -3,13 +3,13 @@ // Wi-Fi and ESP-NOW communication -#include -#include -#include -#include -#include -#include "prefs.h" -#include "util.h" +// #include +// #include +// #include +// #include +// #include +// #include "prefs.h" +// #include "util.h" extern Preferences storage; // use the main preferences storage @@ -20,120 +20,121 @@ int wifiLongRange = 0; int wifiBroadcast = 0; // 0 - broadcast until connected, 1 - always broadcast int udpLocalPort = 14550; int udpRemotePort = 14550; -IPAddress udpRemoteIP = "255.255.255.255"; -WiFiUDP udp; +// IPAddress udpRemoteIP = "255.255.255.255"; +// WiFiUDP udp; -ESPNOWSerial espnow(NULL, 0, WIFI_IF_AP); -ESPNOWSerial espnowBroadcast(ESP_NOW.BROADCAST_ADDR, 0, WIFI_IF_AP); +// ESPNOWSerial espnow(NULL, 0, WIFI_IF_AP); +// ESPNOWSerial espnowBroadcast(ESP_NOW.BROADCAST_ADDR, 0, WIFI_IF_AP); int espnowChannel = 6; void setupWiFi() { - print("Setup Wi-Fi\n"); - WiFi.enableLongRange(wifiLongRange); + // print("Setup Wi-Fi\n"); + // WiFi.enableLongRange(wifiLongRange); - if (wifiMode == W_AP) { - WiFi.softAP(storage.getString("WIFI_AP_SSID", "flix").c_str(), storage.getString("WIFI_AP_PASS", "flixwifi").c_str()); - udp.begin(udpLocalPort); - } + // if (wifiMode == W_AP) { + // WiFi.softAP(storage.getString("WIFI_AP_SSID", "flix").c_str(), storage.getString("WIFI_AP_PASS", "flixwifi").c_str()); + // udp.begin(udpLocalPort); + // } - if (wifiMode == W_STA) { - WiFi.begin(storage.getString("WIFI_STA_SSID", "").c_str(), storage.getString("WIFI_STA_PASS", "").c_str()); - udp.begin(udpLocalPort); - } + // if (wifiMode == W_STA) { + // WiFi.begin(storage.getString("WIFI_STA_SSID", "").c_str(), storage.getString("WIFI_STA_PASS", "").c_str()); + // udp.begin(udpLocalPort); + // } - if (wifiMode == W_ESPNOW) { - WiFi.mode(WIFI_AP); - WiFi.setChannel(espnowChannel); - espnow.addr(MacAddress(storage.getString("ESPNOW_PEER_MAC", "FF:FF:FF:FF:FF:FF").c_str())); - String key = storage.getString("ESPNOW_PEER_KEY", ""); - espnow.setKey(key.isEmpty() ? nullptr : (const uint8_t *)key.c_str()); - espnow.begin(); - espnowBroadcast.begin(); - } + // if (wifiMode == W_ESPNOW) { + // WiFi.mode(WIFI_AP); + // WiFi.setChannel(espnowChannel); + // espnow.addr(MacAddress(storage.getString("ESPNOW_PEER_MAC", "FF:FF:FF:FF:FF:FF").c_str())); + // String key = storage.getString("ESPNOW_PEER_KEY", ""); + // espnow.setKey(key.isEmpty() ? nullptr : (const uint8_t *)key.c_str()); + // espnow.begin(); + // espnowBroadcast.begin(); + // } - WiFi.setSleep(false); // disable power save + // WiFi.setSleep(false); // disable power save } void sendWiFi(const uint8_t *buf, int len) { - if (espnow) { - espnow.write(buf, len); + // if (espnow) { + // espnow.write(buf, len); - static Rate discovery(2); - if (espnow.isEncrypted() && discovery) espnowBroadcast.write((const uint8_t *)"flix", 4); // broadcast message to help finding this device - return; - } + // static Rate discovery(2); + // if (espnow.isEncrypted() && discovery) espnowBroadcast.write((const uint8_t *)"flix", 4); // broadcast message to help finding this device + // return; + // } - if (WiFi.softAPgetStationNum() == 0 && !WiFi.isConnected()) return; + // if (WiFi.softAPgetStationNum() == 0 && !WiFi.isConnected()) return; - bool broadcast = wifiBroadcast || !(t - mavlinkTime < 5); // broadcast if lost connection - udp.beginPacket(broadcast ? IPAddress(255, 255, 255, 255) : udpRemoteIP, udpRemotePort); - udp.write(buf, len); - udp.endPacket(); + // bool broadcast = wifiBroadcast || !(t - mavlinkTime < 5); // broadcast if lost connection + // udp.beginPacket(broadcast ? IPAddress(255, 255, 255, 255) : udpRemoteIP, udpRemotePort); + // udp.write(buf, len); + // udp.endPacket(); } int receiveWiFi(uint8_t *buf, int len) { - if (espnow) { - return espnow.read(buf, len); - } + // if (espnow) { + // return espnow.read(buf, len); + // } - if (WiFi.softAPgetStationNum() == 0 && !WiFi.isConnected()) return 0; + // if (WiFi.softAPgetStationNum() == 0 && !WiFi.isConnected()) return 0; - udp.parsePacket(); - if (udp.remoteIP()) udpRemoteIP = udp.remoteIP(); - return udp.read(buf, len); + // udp.parsePacket(); + // if (udp.remoteIP()) udpRemoteIP = udp.remoteIP(); + // return udp.read(buf, len); + return 0; } void printWiFiInfo() { - if (espnow) { - print("Mode: ESP-NOW\n"); - print("ESP-NOW version: %d\n", ESP_NOW.getVersion()); - print("Max packet size: %d\n", ESP_NOW.getMaxDataLen()); - print("MAC: %s\n", WiFi.softAPmacAddress().c_str()); - print("Peer MAC: %s\n", MacAddress(espnow.addr()).toString().c_str()); - print("Encrypted: %d\n", espnow.isEncrypted()); - print("Channel: %d\n", espnow.getChannel()); - print("Lost packets: %d\n", espnow.lost); - } else if (WiFi.getMode() == WIFI_MODE_AP) { - print("Mode: Access Point (AP)\n"); - print("MAC: %s\n", WiFi.softAPmacAddress().c_str()); - print("SSID: %s\n", WiFi.softAPSSID().c_str()); - print("Password: ***\n"); - print("Channel: %d\n", WiFi.channel()); - print("Clients: %d\n", WiFi.softAPgetStationNum()); - print("IP: %s\n", WiFi.softAPIP().toString().c_str()); - print("Remote IP: %s\n", udpRemoteIP.toString().c_str()); - } else if (WiFi.getMode() == WIFI_MODE_STA) { - print("Mode: Client (STA)\n"); - print("Connected: %d\n", WiFi.isConnected()); - print("MAC: %s\n", WiFi.macAddress().c_str()); - print("SSID: %s\n", WiFi.SSID().c_str()); - print("Password: ***\n"); - print("Channel: %d\n", WiFi.channel()); - print("RSSI: %d dBm\n", WiFi.RSSI()); - print("IP: %s\n", WiFi.localIP().toString().c_str()); - print("Remote IP: %s\n", udpRemoteIP.toString().c_str()); - } else { - print("Mode: Disabled\n"); - } - print("MAVLink connected: %d\n", valid(mavlinkTime)); + // if (espnow) { + // print("Mode: ESP-NOW\n"); + // print("ESP-NOW version: %d\n", ESP_NOW.getVersion()); + // print("Max packet size: %d\n", ESP_NOW.getMaxDataLen()); + // print("MAC: %s\n", WiFi.softAPmacAddress().c_str()); + // print("Peer MAC: %s\n", MacAddress(espnow.addr()).toString().c_str()); + // print("Encrypted: %d\n", espnow.isEncrypted()); + // print("Channel: %d\n", espnow.getChannel()); + // print("Lost packets: %d\n", espnow.lost); + // } else if (WiFi.getMode() == WIFI_MODE_AP) { + // print("Mode: Access Point (AP)\n"); + // print("MAC: %s\n", WiFi.softAPmacAddress().c_str()); + // print("SSID: %s\n", WiFi.softAPSSID().c_str()); + // print("Password: ***\n"); + // print("Channel: %d\n", WiFi.channel()); + // print("Clients: %d\n", WiFi.softAPgetStationNum()); + // print("IP: %s\n", WiFi.softAPIP().toString().c_str()); + // print("Remote IP: %s\n", udpRemoteIP.toString().c_str()); + // } else if (WiFi.getMode() == WIFI_MODE_STA) { + // print("Mode: Client (STA)\n"); + // print("Connected: %d\n", WiFi.isConnected()); + // print("MAC: %s\n", WiFi.macAddress().c_str()); + // print("SSID: %s\n", WiFi.SSID().c_str()); + // print("Password: ***\n"); + // print("Channel: %d\n", WiFi.channel()); + // print("RSSI: %d dBm\n", WiFi.RSSI()); + // print("IP: %s\n", WiFi.localIP().toString().c_str()); + // print("Remote IP: %s\n", udpRemoteIP.toString().c_str()); + // } else { + // print("Mode: Disabled\n"); + // } + // print("MAVLink connected: %d\n", valid(mavlinkTime)); } void configWiFi(int mode, const char *first, const char *second) { - MacAddress mac; - if (mode == W_AP && strlen(first) > 0 && strlen(second) >= 8) { - storage.putString("WIFI_AP_SSID", first); - storage.putString("WIFI_AP_PASS", second); - } else if (mode == W_STA && strlen(first) > 0 && strlen(second) >= 8) { - storage.putString("WIFI_STA_SSID", first); - storage.putString("WIFI_STA_PASS", second); - } else if (mode == W_ESPNOW && mac.fromString(first)) { - storage.putString("ESPNOW_PEER_MAC", first); - storage.putString("ESPNOW_PEER_KEY", strlen(second) == ESP_NOW_KEY_LEN ? second : ""); - } else { - print("Invalid configuration\n"); - return; - } - print("✓ Reboot to apply new settings\n"); + // MacAddress mac; + // if (mode == W_AP && strlen(first) > 0 && strlen(second) >= 8) { + // storage.putString("WIFI_AP_SSID", first); + // storage.putString("WIFI_AP_PASS", second); + // } else if (mode == W_STA && strlen(first) > 0 && strlen(second) >= 8) { + // storage.putString("WIFI_STA_SSID", first); + // storage.putString("WIFI_STA_PASS", second); + // } else if (mode == W_ESPNOW && mac.fromString(first)) { + // storage.putString("ESPNOW_PEER_MAC", first); + // storage.putString("ESPNOW_PEER_KEY", strlen(second) == ESP_NOW_KEY_LEN ? second : ""); + // } else { + // print("Invalid configuration\n"); + // return; + // } + // print("✓ Reboot to apply new settings\n"); } void setWiFiMode(const String& mode) {