More fixes for GPIOs.

UI fixes.

wled00/data/index.css

@@ -1194,7 +1194,7 @@ TD .checkmark, TD .radiomark {
   	/*filter: brightness(1);*/
 	font-size: 19px;
 	border-radius: 21px;
-	min-width: 280px;
+	/*min-width: 264px;*/
 }
 
 .seg {

wled00/data/index.js

@@ -399,7 +399,7 @@ function presetError(empty)
 		if (bckstr.length > 10) hasBackup = true;
 	} catch (e) {}
 
-	var cn = `<div class="pres c" ${empty?'style="padding:8px 0;margin-top: 15px;"':'onclick="loadPresets()" style="cursor:pointer;padding:8px 0;"'}>`;
+	var cn = `<div class="pres c" ${empty?'style="padding:8px;margin-top: 16px;"':'onclick="loadPresets()" style="cursor:pointer;padding:8px;margin-top: 16px;"'}>`;
 	if (empty)
 		cn += `You have no presets yet!`;
 	else

wled00/data/settings_leds.htm

@@ -62,8 +62,10 @@
         //check for pin conflicts
         if (nm=="L0" || nm=="L1" || nm=="L2" || nm=="L3" || nm=="L4" || nm=="RL" || nm=="BT" || nm=="IR")
           if (LCs[i].value!="" && LCs[i].value!="-1") {
-            if (d.um_p && d.um_p.some((e)=>e==parseInt(LCs[i].value,10))) {alert(`Sorry, pins ${JSON.stringify(d.um_p)} can't be used.`);LCs[i].value="";LCs[i].focus();return false;}
+            var p = []; // used pin array
-            //else if (LCs[i].value > 5 && LCs[i].value < 12) {alert("Sorry, pins 6-11 can not be used.");LCs[i].value="";LCs[i].focus();return false;}
+            for (k=0;k<d.rsvd.length;k++) p.push(d.rsvd[k]); // fill with reservations
+            for (k=0;k<d.um_p.length;k++) p.push(d.um_p[k]); // fill with usermod pins
+            if (p.some((e)=>e==parseInt(LCs[i].value,10))) {alert(`Sorry, pins ${JSON.stringify(p)} can't be used.`);LCs[i].value="";LCs[i].focus();return false;}
             else if (!(nm == "IR" || nm=="BT") && d.ro_pins.some((e)=>e==parseInt(LCs[i].value,10))) {alert(`Sorry, pins ${JSON.stringify(d.ro_gpio)} are input only.`);LCs[i].value="";LCs[i].focus();return false;}
             for (j=i+1; j<LCs.length; j++)
             {
@@ -279,25 +281,25 @@
       gId('wreason').innerHTML = (bquot > 80) ? "80% of max. LED memory" +(bquot>100 ? ` (<b>ERROR: Using over ${maxM}B!</b>)` : "") : "800 LEDs per output";
       // calculate power
       var val = Math.ceil((100 + sPC * laprev)/500)/2;
-			val = (val > 5) ? Math.ceil(val) : val;
+      val = (val > 5) ? Math.ceil(val) : val;
-			var s = "";
+      var s = "";
       var is12V = (d.Sf.LAsel.value == 30);
       var isWS2815 = (d.Sf.LAsel.value == 255);
-			if (val < 1.02 && !is12V && !isWS2815)
+      if (val < 1.02 && !is12V && !isWS2815)
-			{
+      {
-				s = "ESP 5V pin with 1A USB supply";
+        s = "ESP 5V pin with 1A USB supply";
-			} else
+      } else
-			{
+      {
-        		s += is12V ? "12V ": isWS2815 ? "WS2815 12V " : "5V ";
+        s += is12V ? "12V ": isWS2815 ? "WS2815 12V " : "5V ";
-				s += val;
+        s += val;
-				s += "A supply connected to LEDs";
+        s += "A supply connected to LEDs";
-			}
+      }
       var val2 = Math.ceil((100 + sPC * laprev)/1500)/2;
       val2 = (val2 > 5) ? Math.ceil(val2) : val2;
       var s2 = "(for most effects, ~";
       s2 += val2;
       s2 += "A is enough)<br>";
-			gId('psu').innerHTML = s;
+      gId('psu').innerHTML = s;
       gId('psu2').innerHTML = isWS2815 ? "" : s2;
       gId("json").style.display = d.Sf.IT.value==8 ? "" : "none";
     }

wled00/pin_manager.cpp

@@ -219,15 +219,16 @@ bool PinManagerClass::isPinOk(byte gpio, bool output)
 {
   #if defined(CONFIG_IDF_TARGET_ESP32C3)
     if ((gpio > 10) && (gpio < 18)) return false;  // 11-17 SPI FLASH
-    if (gpio<22) return true;
+    if (gpio < 22) return true;
   #else // S2 & S3
     #if defined(CONFIG_IDF_TARGET_ESP32S3)
-      if (gpio < 19) return  true;    // 00 to 18 are for general use. Be careful about straping pins GPIO0 and GPIO3 - these may be pulled-up or pulled-down on your board.
+      if (gpio < 19) return true;     // 00 to 18 are for general use. Be careful about straping pins GPIO0 and GPIO3 - these may be pulled-up or pulled-down on your board.
-      if (gpio < 21) return  false;   // 19 + 20 = USB-JTAG. Not recommended for other uses.
+      if (gpio < 21) return false;    // 19 + 20 = USB-JTAG. Not recommended for other uses.
       if ((gpio > 21) && (gpio < 33)) return false; // 22 to 32: not connected + SPI FLASH
       //if (gpio <38) return false;   // 33 to 37: not available if using _octal_ SPI Flash or _octal_ PSRAM
       if (gpio < 49) return true;     // 38 to 48 are for general use. Be careful about straping pins GPIO45 and GPIO46 - these may be pull-up or pulled-down on your board.
     #elif defined(CONFIG_IDF_TARGET_ESP32S2)
+      if (gpio < 22) return true;     // 00 to 21 are for general use.
       if ((gpio > 21) && (gpio < 33)) return false; // 22 to 32: not connected + SPI FLASH
       if (gpio < 46) return true;     // 33 to 45 are for general use.
       if (gpio == 46 && !output) return true; // 46 input only

wled00/wled.h

@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2209091
+#define VERSION 2209131
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
@@ -300,7 +300,7 @@ WLED_GLOBAL byte bootPreset   _INIT(0);                   // save preset to load
 WLED_GLOBAL bool autoSegments    _INIT(false);
 WLED_GLOBAL bool correctWB       _INIT(false); // CCT color correction of RGB color
 WLED_GLOBAL bool cctFromRgb      _INIT(false); // CCT is calculated from RGB instead of using seg.cct
-WLED_GLOBAL bool gammaCorrectCol _INIT(false); // use gamma correction on colors
+WLED_GLOBAL bool gammaCorrectCol _INIT(true);  // use gamma correction on colors
 WLED_GLOBAL bool gammaCorrectBri _INIT(false); // use gamma correction on brightness
 
 WLED_GLOBAL byte col[]    _INIT_N(({ 255, 160, 0, 0 }));  // current RGB(W) primary color. col[] should be updated if you want to change the color.