From 738df1847a883c0dca412bb1cf375a0cda88046f Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Sat, 23 Dec 2023 20:58:55 +0100
Subject: [PATCH] Fix for #2922

---
 wled00/cfg.cpp                | 4 ++--
 wled00/data/settings_wifi.htm | 1 +
 wled00/set.cpp                | 1 +
 wled00/wled.cpp               | 2 +-
 wled00/wled.h                 | 1 +
 wled00/xml.cpp                | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 4046be49..7b842d63 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -83,7 +83,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
 
   noWifiSleep = doc[F("wifi")][F("sleep")] | !noWifiSleep; // inverted
   noWifiSleep = !noWifiSleep;
-  //int wifi_phy = doc[F("wifi")][F("phy")]; //force phy mode n?
+  force802_3g = doc[F("wifi")][F("phy")] | force802_3g; //force phy mode g?
 
   JsonObject hw = doc[F("hw")];
 
@@ -735,7 +735,7 @@ void serializeConfig() {
 
   JsonObject wifi = doc.createNestedObject("wifi");
   wifi[F("sleep")] = !noWifiSleep;
-  //wifi[F("phy")] = 1;
+  wifi[F("phy")] = (int)force802_3g;
 
   #ifdef WLED_USE_ETHERNET
   JsonObject ethernet = doc.createNestedObject("eth");
diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
index b66a1b09..8b40c3c1 100644
--- a/wled00/data/settings_wifi.htm
+++ b/wled00/data/settings_wifi.htm
@@ -178,6 +178,7 @@
 		<option value="3">Never (not recommended)</option></select><br>
 		AP IP: <span class="sip"> Not active </span><br>
 		<h3>Experimental</h3>
+		Force 802.11g mode (ESP8266 only): <input type="checkbox" name="FG"><br>
 		Disable WiFi sleep: <input type="checkbox" name="WS"><br>
 		<i>Can help with connectivity issues.<br>
 		Do not enable if WiFi is working correctly, increases power consumption.</i>
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 746f0de1..115b3f6a 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -46,6 +46,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     if (passlen == 0 || (passlen > 7 && !isAsterisksOnly(request->arg(F("AP")).c_str(), 65))) strlcpy(apPass, request->arg(F("AP")).c_str(), 65);
     int t = request->arg(F("AC")).toInt(); if (t > 0 && t < 14) apChannel = t;
 
+    force802_3g = request->hasArg(F("FG"));
     noWifiSleep = request->hasArg(F("WS"));
 
     #ifndef WLED_DISABLE_ESPNOW
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 61f8b2df..8f31bfbf 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -1027,7 +1027,7 @@ void WLED::initConnection()
 
   WiFi.disconnect(true);        // close old connections
 #ifdef ESP8266
-  WiFi.setPhyMode(WIFI_PHY_MODE_11N);
+  WiFi.setPhyMode(force802_3g ? WIFI_PHY_MODE_11G : WIFI_PHY_MODE_11N);
 #endif
 
   if (staticIP[0] != 0 && staticGateway[0] != 0) {
diff --git a/wled00/wled.h b/wled00/wled.h
index c5ccd66d..1b14c822 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -342,6 +342,7 @@ WLED_GLOBAL bool noWifiSleep _INIT(true);                          // disabling
 #else
 WLED_GLOBAL bool noWifiSleep _INIT(false);
 #endif
+WLED_GLOBAL bool force802_3g _INIT(false);
 
 #ifdef WLED_USE_ETHERNET
   #ifdef WLED_ETH_DEFAULT                                          // default ethernet board type if specified
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 71f7f2ef..26eac522 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -343,6 +343,7 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
     sappends('s',SET_F("AP"),fapass);
 
     sappend('v',SET_F("AC"),apChannel);
+    sappend('c',SET_F("FG"),force802_3g);
     sappend('c',SET_F("WS"),noWifiSleep);
 
     #ifndef WLED_DISABLE_ESPNOW