Merge branch 'You69Man-feature/PR_0_8_29_fix_esp8266_pin_settings' into development03

src/web/html/setup.html

@@ -897,10 +897,12 @@
 
             function parsePinout(obj, type, system) {
                 var e = document.getElementById("pinout");
+                var pinList = esp8266pins;
+                /*IF_ESP32*/
                 var pinList = esp32pins;
-                if("ESP8266" == type) pinList = esp8266pins;
+                if ("ESP32-S3" == system["chip_model"]) pinList = esp32s3pins;
-                else if ("ESP32-S3" == system["chip_model"]) pinList = esp32s3pins;
                 else if("ESP32-C3" == system["chip_model"]) pinList = esp32c3pins;
+                /*ENDIF_ESP32*/
                 pins = [['led0', 'pinLed0', 'At least one inverter is producing'], ['led1', 'pinLed1', 'MqTT connected']];
                 for(p of pins) {
                     e.append(
@@ -927,10 +929,12 @@
                 var en = inp("nrfEnable", null, null, ["cb"], "nrfEnable", "checkbox");
                 en.checked = obj["en"];
 
+                var pinList = esp8266pins;
+                /*IF_ESP32*/
                 var pinList = esp32pins;
-                if("ESP8266" == type) pinList = esp8266pins;
+                if ("ESP32-S3" == system["chip_model"]) pinList = esp32s3pins;
-                else if ("ESP32-S3" == system["chip_model"]) pinList = esp32s3pins;
                 else if("ESP32-C3" == system["chip_model"]) pinList = esp32c3pins;
+                /*ENDIF_ESP32*/
 
                 e.replaceChildren (
                     ml("div", {class: "row mb-3"}, [
@@ -992,10 +996,12 @@
             }
 
             function parseDisplay(obj, type, system) {
+                var pinList = esp8266pins;
+                /*IF_ESP32*/
                 var pinList = esp32pins;
-                if("ESP8266" == type) pinList = esp8266pirpins;
+                if ("ESP32-S3" == system["chip_model"]) pinList = esp32s3pins;
-                else if ("ESP32-S3" == system["chip_model"]) pinList = esp32s3pins;
                 else if("ESP32-C3" == system["chip_model"]) pinList = esp32c3pins;
+                /*ENDIF_ESP32*/
 
                 for(var i of ["disp_pwr"])
                     document.getElementsByName(i)[0].checked = obj[i];
@@ -1061,7 +1067,7 @@
                 document.getElementById("pirPin").append(
                     ml("div", {class: "row mb-3"}, [
                         ml("div", {class: "col-12 col-sm-3 my-2"}, "PIR sensor"),
-                        ml("div", {class: "col-12 col-sm-9"}, sel("pir_pin", pinList, obj["pir_pin"]))
+                        ml("div", {class: "col-12 col-sm-9"}, sel("pir_pin", ("ESP8266" == type) ? esp8266pirpins : pinList, obj["pir_pin"]))
                     ])
                 );