1.0.6

Author: Pako2

include/config.h

@@ -18,12 +18,14 @@ struct Config {
 	uint8_t scrollgap = 5;
 	uint16_t idle = 30;
 	uint8_t tmode = 1;
+#if defined(BATTERY)
 	uint16_t bat0 = 4094;
 	uint16_t bat100 = 4095;
 	uint8_t lowbatt = 0;
 	uint8_t critbatt = 10;
 	uint16_t batw = 1000;
 	bool batenabled = false;
+#endif
 	uint8_t sdclock = 1;
 	uint8_t calendar = 0;
 	uint8_t bclkpin = 255;

include/websocket.h

@@ -116,7 +116,7 @@ void procMsg(AsyncWebSocketClient *client, size_t sz)
       time(&now);
       pwofftime = now + 60 * val;
 #if defined(DISP)
-      if (dispmode==DSP_CLOCK)
+      if (dispmode == DSP_CLOCK)
       {
         changeDispMode(DSP_PWOFF);
       }
@@ -128,8 +128,8 @@ void procMsg(AsyncWebSocketClient *client, size_t sz)
       pwoffminutes = config->dasd;
       ESP_LOGW(WSTAG, "Automatic shutdown mode canceled !");
 #if defined(DISP)
-        dispmode = DSP_OTHER;
-        changeDispMode(DSP_CLOCK);
+      dispmode = DSP_OTHER;
+      changeDispMode(DSP_CLOCK);
 #endif
     }
   }
@@ -181,25 +181,14 @@ void procMsg(AsyncWebSocketClient *client, size_t sz)
       configFile.close();
     }
   }
-#if defined(SDCARD)
-  else if (strcmp(command, "sdplayer") == 0)
-{
-  if (SD_okay)
-  {
-    if (pmode != PM_SDCARD)
-    {
-      oldsdix_req = true;
-    }
-    else
-    {
-      updateTrack(0);
-    }
-  }
-  else
+  else if (strcmp(command, "steppreset") == 0)
   {
-    sendRadio();
+#if defined(DISP)
+    changeDispMode(DSP_RADIO);
+#endif
+    int8_t val = root["val"];
+    updatePreset(val, true);
   }
-}
   else if (strcmp(command, "preset") == 0)
   {
 #if defined(DISP)
@@ -208,13 +197,24 @@ void procMsg(AsyncWebSocketClient *client, size_t sz)
     uint16_t prst = root["preset"];
     setPreset(prst - 1);
   }
-  else if (strcmp(command, "steppreset") == 0)
+#if defined(SDCARD)
+  else if (strcmp(command, "sdplayer") == 0)
   {
-#if defined(DISP)
-    changeDispMode(DSP_RADIO);
-#endif
-    int8_t val = root["val"];
-    updatePreset(val, true);
+    if (SD_okay)
+    {
+      if (pmode != PM_SDCARD)
+      {
+        oldsdix_req = true;
+      }
+      else
+      {
+        updateTrack(0);
+      }
+    }
+    else
+    {
+      sendRadio();
+    }
   }
   else if (strcmp(command, "steptrack") == 0)
   {
@@ -274,7 +274,7 @@ void procMsg(AsyncWebSocketClient *client, size_t sz)
     sendSDstat(0);
 #if defined(DISP)
     prgrssbar(0, false);
-  //prgrssbar(0, true);
+    // prgrssbar(0, true);
 #endif
   }
   else if (strcmp(command, "track") == 0)
@@ -336,7 +336,7 @@ void onWsEvent(AsyncWebSocket *server_, AsyncWebSocketClient *client, AwsEventTy
     }
     else
     {
-// message is comprised of multiple frames or the frame is split into multiple packets
+      // message is comprised of multiple frames or the frame is split into multiple packets
       if (index == 0)
       {
         if (info->num == 0 && client->_tempObject == NULL)

lib/ESP Async WebServer_SPEC/src/SPIFFSEditor.cpp

@@ -2,8 +2,8 @@
 ;======================================
 [platformio]
 default_envs = noota4mb
-;default_envs = wota8mb
 ;default_envs = noota4mbnodisp
+;default_envs = wota8mb
 ;default_envs = wota8mbnodisp
 
 [common]
@@ -36,18 +36,18 @@ lib_deps =
 extra_scripts = 
 	scripts/custom_targets.py
 build_flags = 
-	-D VERSION=1.0.5
+	-D VERSION=1.0.6
 	-D BOARD_HAS_PSRAM
 ;    -mfix-esp32-psram-cache-issue ;(not needed for rev.3 chips)
 	-D CORE_DEBUG_LEVEL=2
 	-D CONFIG_ARDUHAL_LOG_COLORS=1
 	-D ARDUINO_RUNNING_CORE=1
 	-D ARDUINO_EVENT_RUNNING_CORE=1
-    -D CONFIG_ASYNC_TCP_MAX_ACK_TIME=3000
-    -D CONFIG_ASYNC_TCP_PRIORITY=10
-    -D CONFIG_ASYNC_TCP_QUEUE_SIZE=128
-    -D CONFIG_ASYNC_TCP_RUNNING_CORE=1
-    -D CONFIG_ASYNC_TCP_STACK_SIZE=15360
+	-D CONFIG_ASYNC_TCP_MAX_ACK_TIME=3000
+	-D CONFIG_ASYNC_TCP_PRIORITY=10
+	-D CONFIG_ASYNC_TCP_QUEUE_SIZE=128
+	-D CONFIG_ASYNC_TCP_RUNNING_CORE=1
+	-D CONFIG_ASYNC_TCP_STACK_SIZE=15360
 	-D AUTOSHUTDOWN ; comment if HW is not equipped with a circuit for turning on and off with one button
 	-D SDCARD       ; comment if HW is not equipped with an SD card slot
 	-D BATTERY      ; comment if HW is not equipped with a circuit for measuring battery voltage

lib/ESP Async WebServer_SPEC/src/SPIFFSEditor.cpp.bak

@@ -1521,6 +1521,7 @@ void changeDispMode(disp_mode_t mode)
   }
   if (mode != DSP_LOWBATT)
   {
+#if defined(BATTERY)
     if (config->batenabled)
     {
       uint16_t val = adcval;
@@ -1532,6 +1533,7 @@ void changeDispMode(disp_mode_t mode)
         return;
       }
     }
+#endif
     dispmode = mode;
     asdmode = false;
 #if defined(DISP)
@@ -2469,15 +2471,15 @@ void setup()
       "\"encdtpin\":255,"
       "\"encswpin\":255,"
       "\"irpin\":255,"
-      "\"mutepin\":255,"
 #if defined(AUTOSHUTDOWN)
       "\"onoffipin\":255,"
       "\"onoffopin\":255,"
 #endif
 #if defined(SDCARD)
       "\"sdpullup\":0,"
-      "\"sddpin\":255"
+      "\"sddpin\":255,"
 #endif
+      "\"mutepin\":255"
       "},"
       "\"general\":{"
       "\"psswd\":\"YWRtaW4=\","