Prepping for better network control panel

Author: troyhacks

wled00/data/settings_wifi.htm

@@ -178,10 +178,12 @@ <h3>Configure Access Point</h3>
 		<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>
+		<span style="display:none;">
+    Force 802.11g mode (ESP8266 only): <input type="checkbox" name="FG"><br>
 		Disable Wi-Fi sleep: <input type="checkbox" name="WS"><br>
 		<i>Can help with connectivity issues.<br>
 		Do not enable if Wi-Fi is working correctly, increases power consumption.</i>
+    </span>
 
 		<div id="remd">
 			<h3>Wireless Remote</h3>
@@ -193,23 +195,20 @@ <h3>Wireless Remote</h3>
 			Last Seen: <span class="rlid">None</span> <br>
 		</div>
 
-		<div id="ethd">
-			<h3>Ethernet Type</h3>
-			<select name="ETH">
-				<option value="0">None</option>
-				<option value="9">ABC! WLED V43 & compatible</option>
-				<option value="2">ESP32-POE</option>
-				<option value="6">ESP32Deux</option>
-				<option value="7">KIT-VE</option>
-				<option value="11">Olimex-ESP32-Gateway</option> <!-- WLEDMM -->
-				<option value="8">QuinLED-Dig-Octa & T-ETH-POE</option>
-				<option value="4">QuinLED-ESP32</option>
-				<option value="10">Serg74-ETH32</option>
-				<option value="5">TwilightLord-ESP32</option>
-				<option value="3">WESP32</option>
-				<option value="1">WT32-ETH01</option>
-			</select><br><br>
-		</div>
+    <div id="ethd">
+      <h3>Ethernet Type</h3>
+      <select name="ETH">
+        <option value="0">None</option>
+        <option value="1">Almost every ESP32 P4 Board</option>
+      </select><br><br>
+    </div>
+    <div id="etho">
+      <h3>Ethernet Only</h3>
+      <p>For performance reasons, the ESP32-P4 WiFi can be a strain on the system with lage displays.<br />
+      This forces disabling of WiFi and all the high priority tasks associated with it.</p>
+      <label>Disable WiFI entirely: <input type="checkbox" name="ETHO"></label>
+      <br><br><br>
+    </div>
 		<hr>
 		<button type="button" onclick="B()">Back</button><button type="submit">Save &amp; Connect</button>
 	</form>

wled00/json.cpp

@@ -1202,7 +1202,11 @@ void serializeInfo(JsonObject root)
     "%s (wifi=%u, eth=%u)",
     route, wifi_metric, eth_metric);
 
+  #ifndef WLED_USE_ETHERNET_ONLY
   network_info["default_route"] = buf;
+  #else
+  network_info["default_route"] = "Ethernet Only Mode";
+  #endif
 
 
   JsonObject fs_info = root.createNestedObject("fs");

wled00/set.cpp

@@ -59,6 +59,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     #ifdef WLED_USE_ETHERNET
     ethernetType = request->arg(F("ETH")).toInt();
+    ethernetOnly = request->hasArg(F("ETHO"));
     // WLED::instance().initEthernet();
     #endif
 

wled00/wled.cpp

@@ -1087,8 +1087,11 @@ void WLED::setup() {
         ESP_ERROR_CHECK_WITHOUT_ABORT(esp_wifi_restore());
         esp_hosted_coprocessor_fwver_t c6_fw_version;
         ESP_ERROR_CHECK_WITHOUT_ABORT(esp_hosted_get_coprocessor_fwversion(&c6_fw_version));
-        USER_PRINTF("ESP-Hosted C6 Firmware is version %d.%d.%d\n", c6_fw_version.major1, c6_fw_version.minor1, c6_fw_version.patch1);
-        if (c6_fw_version.major1 < 2) USER_PRINTLN("-> ESP-Hosted versions below 2.15.12 don't return a proper version!");
+        if (c6_fw_version.major1 >= 2) {
+          USER_PRINTF("ESP-Hosted C6 Firmware is version %d.%d.%d\n", c6_fw_version.major1, c6_fw_version.minor1, c6_fw_version.patch1);
+        } else {
+          USER_PRINTF("ESP-Hosted C6 Firmware is older than verion 2.15.12\n");
+        }
         esp_err_t check = ota_littlefs_perform(true);
         if (check == ESP_HOSTED_SLAVE_OTA_COMPLETED) {
           esp_err_t ret = esp_hosted_slave_ota_activate();
@@ -1168,7 +1171,7 @@ void WLED::setup() {
           esp_err_t err = esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT40);
           USER_PRINTF("Set bandwidth result: %d (%s)\n", err, esp_err_to_name(err));
         }
-        
+
         esp_wifi_get_protocols(WIFI_IF_STA, &xprotocols);
 
         print_wifi_protocols("2.4GHz protocols after set:", xprotocols.ghz_2g);
@@ -1739,6 +1742,47 @@ void WLED::initAP(bool resetAP) {
   if (hasValidSTA) {
     // APSTA mode - run both AP and try to connect to configured network
     ESP_ERROR_CHECK_WITHOUT_ABORT(esp_wifi_set_mode(WIFI_MODE_APSTA));
+    vTaskDelay(pdMS_TO_TICKS(100));
+    USER_PRINTLN("Checking WiFi Stuff");
+
+    wifi_band_mode_t band_mode;
+    esp_wifi_get_band_mode(&band_mode);
+    USER_PRINTF("Band mode: %s\n", wifi_band_mode_to_string(band_mode));
+
+    wifi_protocols_t protocols;
+    esp_wifi_get_protocols(WIFI_IF_STA, &protocols);
+    print_wifi_protocols("2.4GHz protocols before set:", protocols.ghz_2g);
+    if (band_mode != WIFI_BAND_MODE_2G_ONLY) print_wifi_protocols("5GHz protocols before set:", protocols.ghz_5g);
+
+    wifi_country_t country_check;
+    esp_wifi_get_country(&country_check);
+    USER_PRINTF("Country: %.2s, channels %d-%d\n", country_check.cc, country_check.schan, country_check.schan + country_check.nchan - 1);
+
+    wifi_protocols_t xprotocols;
+    wifi_bandwidths_t bw_config;
+
+    if (band_mode != WIFI_BAND_MODE_2G_ONLY) {
+      xprotocols = {
+        .ghz_2g = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N,
+        .ghz_5g = WIFI_PROTOCOL_11A | WIFI_PROTOCOL_11N
+      };
+      ESP_ERROR_CHECK_WITHOUT_ABORT(esp_wifi_set_protocols(WIFI_IF_STA, &xprotocols));
+      bw_config = {
+        .ghz_2g = WIFI_BW_HT40,
+        .ghz_5g = WIFI_BW_HT40,
+      };
+      esp_err_t err = esp_wifi_set_bandwidths(WIFI_IF_STA, &bw_config);
+      USER_PRINTF("Set bandwidths result: %d (%s)\n", err, esp_err_to_name(err));
+    } else {
+      ESP_ERROR_CHECK_WITHOUT_ABORT(esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N));
+      esp_err_t err = esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT40);
+      USER_PRINTF("Set bandwidth result: %d (%s)\n", err, esp_err_to_name(err));
+    }
+
+    esp_wifi_get_protocols(WIFI_IF_STA, &xprotocols);
+
+    print_wifi_protocols("2.4GHz protocols after set:", xprotocols.ghz_2g);
+    if (band_mode != WIFI_BAND_MODE_2G_ONLY) print_wifi_protocols("5GHz protocols after set:", xprotocols.ghz_5g);
 
     wifi_config_t wifi_sta_config = {};
     strncpy(reinterpret_cast<char*>(wifi_sta_config.sta.ssid), clientSSID, sizeof(wifi_sta_config.sta.ssid));

wled00/wled.h

@@ -441,6 +441,7 @@ WLED_GLOBAL int s_retry_num _INIT(0);
     WLED_GLOBAL int ethernetType _INIT(WLED_ETH_DEFAULT);          // ethernet board type
   #else
     WLED_GLOBAL int ethernetType _INIT(WLED_ETH_NONE);             // use none for ethernet board type if default not defined
+    WLED_GLOBAL bool ethernetOnly _INIT(false);             // use none for ethernet board type if default not defined
   #endif
 #endif
 WLED_GLOBAL esp_eth_handle_t eth_handle;