adc1_0__bugfix

Author: Pako2

include/config.h

@@ -18,11 +18,12 @@ struct Config {
 	uint8_t scrollgap = 5;
 	uint16_t idle = 30;
 	uint8_t tmode = 1;
-	uint16_t bat0 = 3095;
+	uint16_t bat0 = 4094;
 	uint16_t bat100 = 4095;
-	uint8_t lowbatt = 1;
+	uint8_t lowbatt = 0;
 	uint8_t critbatt = 10;
 	uint16_t batw = 1000;
+	bool batenabled = false;
 	uint8_t sdclock = 1;
 	uint8_t calendar = 0;
 	uint8_t bclkpin = 255;

include/loadConfig.h

@@ -33,12 +33,13 @@ bool loadConfiguration(Config *config)
 	RESERVEDGPIOS[resix++] = 17;
 #endif
 #if defined(DISP)
-	RESERVEDGPIOS[resix++] = 18;
-	RESERVEDGPIOS[resix++] = 23;
 	RESERVEDGPIOS[resix++] = 18;
 	RESERVEDGPIOS[resix++] = 21;
 	RESERVEDGPIOS[resix++] = 22;
 	RESERVEDGPIOS[resix++] = 23;
+#endif
+#if defined(BATTERY)
+	RESERVEDGPIOS[resix++] = 36;
 #endif
 	// ToDo for other display versions ?
 	File configFile = LittleFS.open("/config.json", "r");
@@ -103,6 +104,7 @@ bool loadConfiguration(Config *config)
 	config->batw = config->bat100 - config->bat0;
 	config->lowbatt = general["lowbatt"];
 	config->critbatt = general["critbatt"];
+	config->batenabled = ((config->bat100 <= 4095) && (config->bat0 < (config->bat100-1)));
 #endif
 	if (hardware["encclkpin"].is<uint8_t>())
 	{

include/wsResponses.h

@@ -350,12 +350,16 @@ void sendWebConfig(AsyncWebSocketClient *cl)
 			ircommands.add(cmdbuffer);
 		}
 		JsonArray reservedgpios = root["reservedgpios"].to<JsonArray>();
-		for (int i = 0; i < 8; i++)
+		for (int i = 0; i < 16; i++)
 		{
 			if (RESERVEDGPIOS[i] > 0)
 			{
 				reservedgpios.add(RESERVEDGPIOS[i]);
 			}
+			else
+			{
+				break;
+			}
 		}
 		size_t len = 0;
 		len = measureJson(root);

platformio.ini

@@ -36,7 +36,7 @@ lib_deps =
 extra_scripts = 
 	scripts/custom_targets.py
 build_flags = 
-	-D VERSION=1.0.0
+	-D VERSION=1.0.1
 	-D BOARD_HAS_PSRAM
 ;    -mfix-esp32-psram-cache-issue ;(not needed for rev.3 chips)
 	-D CORE_DEBUG_LEVEL=2