v0.7.355

Author: e2002

README.md

@@ -317,6 +317,12 @@ Work is in progress...
 
 ---
 ## Version history
+#### v0.7.355
+- updating libraries ESP32-audioI2S and ESP32-vs1053_ext to the latest version
+- optimization of the web interface during playback
+- fixed one js bug. a [full update](#update-over-web-interface) with Sketch data upload is desirable
+- plugin example for esp deep sleep when playback is stopped (exsamples/plugins/deepsleep.ino)
+
 #### v0.7.330
 **!!! a [full update](#update-over-web-interface) with Sketch data upload is required. After updating please press CTRL+F5 in browser !!!** \
 **Please backup playlist.csv and wifi.csv before updating.**

exsamples/plugins/deepsleep.ino

@@ -0,0 +1,29 @@
+/**************************************************************
+
+    Example of esp32 deep sleep when playback is stopped.
+    This file must be in the root directory of the sketch.
+
+**************************************************************/
+#define SLEEP_DELAY     60  // 1 min
+#define WAKEUP_PIN_1    GPIO_NUM_12
+#define WAKEUP_LEVEL    LOW
+
+Ticker deepSleepTicker;
+
+void goToSleep(){
+  if(BRIGHTNESS_PIN!=255) analogWrite(BRIGHTNESS_PIN, 0); /*  BRIGHTNESS_PIN added in v0.7.330  */
+  esp_deep_sleep_start();
+}
+
+void yoradio_on_setup(){
+  esp_sleep_enable_ext0_wakeup(WAKEUP_PIN_1, WAKEUP_LEVEL);
+  deepSleepTicker.attach(SLEEP_DELAY, goToSleep);
+}
+
+void player_on_start_play(){
+  deepSleepTicker.detach();
+}
+
+void player_on_stop_play(){
+  deepSleepTicker.attach(SLEEP_DELAY, goToSleep);
+}

yoRadio/audiohandlers.ino

@@ -15,6 +15,15 @@ void audio_info(const char *info) {
     player.mode = STOPPED;
     player.stopInfo();
   }
+  if (strstr(info, "not supported") != NULL){
+    config.setTitle(info);
+    netserver.requestOnChange(TITLE, 0);
+    player.setOutputPins(false);
+    player.setDefaults();
+    if (player_on_stop_play) player_on_stop_play();
+    player.mode = STOPPED;
+    player.stopInfo();
+  }
 }
 
 void audio_bitrate(const char *info)

yoRadio/config.cpp

@@ -5,6 +5,18 @@
 #include "player.h"
 Config config;
 
+void DBGVB(const char *format, ...) {
+#ifdef DEBUG_V
+  char buf[200];
+  va_list args;
+  va_start (args, format );
+  vsnprintf(buf, 200, format, args);
+  Serial.print("[DEBUG]                           ");
+  Serial.print(buf);
+  Serial.println();
+#endif
+}
+
 void Config::init() {
   EEPROM.begin(EEPROM_SIZE);
 #if IR_PIN!=255

yoRadio/config.h

@@ -13,6 +13,8 @@
 #define TMP_PATH          "/data/tmpfile.txt"
 #define INDEX_PATH        "/data/index.dat"
 
+void DBGVB(const char *format, ...);
+
 struct config_t
 {
   unsigned int config_set; //must be 4262

yoRadio/data/www/script.js.gz

@@ -38,7 +38,7 @@ enum : uint16_t { VU_X = 4,   VU_Y = 116, VU_BW = 24,   VU_BH = 80,   VU_BS = 4,
 enum : uint16_t { VU_X = 4,   VU_Y = 90,  VU_BW = 120,  VU_BH = 20,   VU_BS = 0,    VU_NB = 12,    VU_FS = 3,   VU_HOR = 1,   VU_COLOR_MAX = TFT_LOGO,   VU_COLOR_MIN = GRAY      };
 
 #elif DSP_MODEL==DSP_ILI9225                              /* ILI9225 220x176 */
-enum : uint16_t { VU_X = 4,   VU_Y = 80,  VU_BW = 13,   VU_BH = 56,   VU_BS = 2,    VU_NB = 8,     VU_FS = 3,   VU_HOR = 0,   VU_COLOR_MAX = TFT_LOGO,   VU_COLOR_MIN = GRAY      };
+enum : uint16_t { VU_X = 4,   VU_Y = 80,  VU_BW = 13,   VU_BH = 56,   VU_BS = 2,    VU_NB = 8,     VU_FS = 4,   VU_HOR = 0,   VU_COLOR_MAX = TFT_LOGO,   VU_COLOR_MIN = GRAY      };
 
 #elif (DSP_MODEL==DSP_ST7735 && DTYPE==INITR_MINI160x80) || (DSP_MODEL==DSP_GC9106)  /* ST7735 160x80, GC9106 160x80 */
 enum : uint16_t { VU_X = 1,   VU_Y = 30,  VU_BW = 12,   VU_BH = 36,   VU_BS = 4,    VU_NB = 8,     VU_FS = 2,   VU_HOR = 0,   VU_COLOR_MAX = TFT_LOGO,   VU_COLOR_MIN = GRAY      };

yoRadio/display_vu.h

@@ -15,7 +15,7 @@
 #define MIN_MALLOC 24112
 #endif
 
-#define CORS_DEBUG
+//#define CORS_DEBUG
 
 NetServer netserver;
 
@@ -40,21 +40,20 @@ void NetServer::takeMallocDog(){
   int mcb = heap_caps_get_free_size(MALLOC_CAP_8BIT);
   int mci = heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
   (void)mci;
-  log_i("[yoradio] webserver.on / - MALLOC_CAP_INTERNAL=%d, MALLOC_CAP_8BIT=%d", mci, mcb);
+  DBGVB("MALLOC_CAP_8BIT=%d, MALLOC_CAP_INTERNAL=%d", mcb, mci);
   resumePlay = mcb < MIN_MALLOC;
   if (resumePlay) {
     player.toggle();
-    while (player.isRunning()) {
-     vTaskDelay(10);
-    }
-    vTaskDelay(50);
+    vTaskDelay(150);
+    xSemaphoreTake(player.playmutex, portMAX_DELAY);
   }
 }
 
 void NetServer::giveMallocDog(){
   if (resumePlay) {
     resumePlay = false;
-    vTaskDelay(100);
+    vTaskDelay(150);
+    xSemaphoreGive(player.playmutex);
     player.toggle();
   }
 }
@@ -63,13 +62,13 @@ bool NetServer::begin() {
   importRequest = false;
   irRecordEnable = false;
   webserver.on("/", HTTP_GET, [](AsyncWebServerRequest * request) {
-    netserver.takeMallocDog();
     if (network.status == CONNECTED) {
-      request->send(SPIFFS, "/www/index.html", String(), false, processor);
+      netserver.htmlPath = PINDEX;
+      netserver.chunkedHtmlPage(String(), request);
     }else{
-      request->send(SPIFFS, "/www/settings.html", String(), false, processor);
+      netserver.htmlPath = PSETTINGS;
+      netserver.chunkedHtmlPage(String(), request);
     }
-    netserver.giveMallocDog();
   });
 
   webserver.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age=31536000");
@@ -81,34 +80,35 @@ bool NetServer::begin() {
     netserver.takeMallocDog();
     request->send(SPIFFS, PLAYLIST_PATH, "application/octet-stream");
     netserver.giveMallocDog();
+    DBGVB("PLAYLIST_PATH client ip=%s", request->client()->remoteIP().toString().c_str());
+    /*netserver.htmlPath = PPLAYLIST; // TODO
+    netserver.chunkedHtmlPage("application/octet-stream", request);
+    netserver.giveMallocDog();*/
   });
   webserver.on(INDEX_PATH, HTTP_GET, [](AsyncWebServerRequest * request) {
     request->send(SPIFFS, INDEX_PATH, "application/octet-stream");
   });
   webserver.on(SSIDS_PATH, HTTP_GET, [](AsyncWebServerRequest * request) {
-    netserver.takeMallocDog();
-    request->send(SPIFFS, SSIDS_PATH, "application/octet-stream");
-    netserver.giveMallocDog();
+    netserver.htmlPath = PSSIDS;
+    netserver.chunkedHtmlPage("application/octet-stream", request);
   });
   webserver.on("/upload", HTTP_POST, [](AsyncWebServerRequest * request) {
     //request->send(200);
 
   }, handleUpload);
   webserver.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
-    netserver.takeMallocDog();
-    request->send(SPIFFS, "/www/update.html", String(), false, processor);
-    netserver.giveMallocDog();
+      netserver.htmlPath = PUPDATE;
+      netserver.chunkedHtmlPage(String(), request);
   });
   webserver.on("/settings", HTTP_GET, [](AsyncWebServerRequest *request){
-    netserver.takeMallocDog();
-    request->send(SPIFFS, "/www/settings.html", String(), false, processor);
-    netserver.giveMallocDog();
+    netserver.htmlPath = PSETTINGS;
+    netserver.chunkedHtmlPage(String(), request);
   });
+  
 #if IR_PIN!=255
   webserver.on("/ir", HTTP_GET, [](AsyncWebServerRequest *request){
-    netserver.takeMallocDog();
-    request->send(SPIFFS, "/www/ir.html", String(), false, processor);
-    netserver.giveMallocDog();
+      netserver.htmlPath = PIR;
+      netserver.chunkedHtmlPage(String(), request);
   });
 #endif
   webserver.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){
@@ -160,6 +160,66 @@ bool NetServer::begin() {
   return true;
 }
 
+void NetServer::chunkedHtmlPage(const String& contentType, AsyncWebServerRequest *request){
+  max = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 32;   
+  htmlpos = 0;
+  theend  = false;
+  DBGVB("chunkedHtmlPage client ip=%s", request->client()->remoteIP().toString().c_str());
+  AsyncWebServerResponse *response = request->beginChunkedResponse(contentType, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+    if(netserver.theend) return 0;
+    File htmlpage;
+    switch(netserver.htmlPath){
+      case PINDEX: {
+        htmlpage = SPIFFS.open("/www/index.html", "r");
+        break;
+      }
+      case PSETTINGS: {
+        htmlpage = SPIFFS.open("/www/settings.html", "r");
+        break;
+      }
+      case PUPDATE: {
+        htmlpage = SPIFFS.open("/www/update.html", "r");
+        break;
+      }
+      case PIR: {
+        htmlpage = SPIFFS.open("/www/ir.html", "r");
+        break;
+      }
+      case PPLAYLIST: {
+        htmlpage = SPIFFS.open(PLAYLIST_PATH, "r");
+        DBGVB("SPIFFS.open(PLAYLIST_PATH)");
+        break;
+      }
+      case PSSIDS: {
+        htmlpage = SPIFFS.open(SSIDS_PATH, "r");
+        break;
+      }
+      default: {
+        return 0;
+        break;
+      }
+    }
+    if(!htmlpage) return 0;
+    uint32_t htmlpagesize = htmlpage.size();
+    uint32_t len =  htmlpagesize - netserver.htmlpos;
+    if (len > maxLen) len = maxLen;
+    if (len > netserver.max) len = netserver.max;
+    if (len + netserver.htmlpos > htmlpagesize) {
+      netserver.theend = true;
+      len = htmlpagesize - netserver.htmlpos;
+    }
+    if (len > 0) {
+      DBGVB("seek to %d in %s and read %d bytes", netserver.htmlpos, htmlpage.name(), len);
+      htmlpage.seek(netserver.htmlpos, SeekSet);
+      htmlpage.read(buffer, len);
+      netserver.htmlpos = netserver.htmlpos + len;
+    }
+    if(htmlpage) htmlpage.close();
+    return len;
+  }, processor); // AsyncWebServerResponse
+  request->send(response);
+}
+
 void NetServer::loop() {
   if(shouldReboot){
     Serial.println("Rebooting...");
@@ -173,7 +233,7 @@ void NetServer::loop() {
   }
   if (importRequest) {
     if (importPlaylist()) {
-      //requestOnChange(PLAYLIST, 0);
+      requestOnChange(PLAYLIST, 0);
     }
     importRequest = false;
   }
@@ -400,7 +460,7 @@ void NetServer::onWsMessage(void *arg, uint8_t *data, size_t len, uint8_t client
         display.putRequest({NEWMODE, PLAYER});
         return;
       }
-
+      /*  RESETS  */
       if (strcmp(cmd, "reset") == 0) {
         if (strcmp(val, "system") == 0) {
           config.store.smartstart=2;
@@ -465,7 +525,7 @@ void NetServer::onWsMessage(void *arg, uint8_t *data, size_t len, uint8_t client
           requestOnChange(GETCONTROLS,clientId);
           return;
         }
-      }
+      } /*  RESETS  */
       if (strcmp(cmd, "volume") == 0) {
         byte v = atoi(val);
         player.setVol(v, false);
@@ -541,6 +601,9 @@ void NetServer::onWsMessage(void *arg, uint8_t *data, size_t len, uint8_t client
           player.toggle();
           resumePlay=false;
         }
+#ifdef MQTT_HOST
+        mqttPublishPlaylist();
+#endif
         return;
       }
 #if IR_PIN!=255
@@ -589,6 +652,7 @@ bool NetServer::savePlaylist(const char* post) {
   } else {
     file.print(post);
     file.close();
+    vTaskDelay(150);
     netserver.requestOnChange(PLAYLISTSAVED, 0);
     return true;
   }
@@ -650,9 +714,9 @@ void NetServer::requestOnChange(requestType_e request, uint8_t clientId) {
         config.indexPlaylist();
         config.initPlaylist();
         getPlaylist(clientId);
-#ifdef MQTT_HOST
+/*#ifdef MQTT_HOST
         mqttPublishPlaylist();
-#endif
+#endif*/
         break;
       }
     case GETACTIVE: {
@@ -808,6 +872,7 @@ String processor(const String& var) { // %Templates%
 
 void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
   if (!index) {
+    netserver.takeMallocDog();
     request->_tempFile = SPIFFS.open(TMP_PATH , "w");
   }
   if (len) {
@@ -824,7 +889,7 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index,
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
   switch (type) {
     case WS_EVT_CONNECT:
-      if(config.store.audioinfo) Serial.printf("WebSocket client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str());
+      if(config.store.audioinfo) Serial.printf("[WEBSOCKET] client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str());
       /*netserver.requestOnChange(STATION, client->id());
       netserver.requestOnChange(TITLE, client->id());
       netserver.requestOnChange(VOLUME, client->id());
@@ -836,7 +901,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
 
       break;
     case WS_EVT_DISCONNECT:
-      if(config.store.audioinfo) Serial.printf("WebSocket client #%u disconnected\n", client->id());
+      if(config.store.audioinfo) Serial.printf("[WEBSOCKET] client #%u disconnected\n", client->id());
       break;
     case WS_EVT_DATA:
       netserver.onWsMessage(arg, data, len, client->id());

yoRadio/netserver.cpp

@@ -5,13 +5,15 @@
 #include "ESPAsyncWebServer.h"
 #include "AsyncUDP.h"
 
-enum requestType_e { PLAYLIST, STATION, ITEM, TITLE, VOLUME, NRSSI, BITRATE, MODE, EQUALIZER, BALANCE, PLAYLISTSAVED, GETMODE, GETINDEX, GETACTIVE, GETSYSTEM, GETSCREEN, GETTIMEZONE, GETWEATHER, GETCONTROLS };
+enum requestType_e : uint8_t  { PLAYLIST=1, STATION=2, ITEM=3, TITLE=4, VOLUME=5, NRSSI=6, BITRATE=7, MODE=8, EQUALIZER=9, BALANCE=10, PLAYLISTSAVED=11, GETMODE=12, GETINDEX=13, GETACTIVE=14, GETSYSTEM=15, GETSCREEN=16, GETTIMEZONE=17, GETWEATHER=18, GETCONTROLS=19 };
+enum htmlPath_e    : uint8_t  { PINDEX=1, PSETTINGS=2, PUPDATE=3, PIR=4, PPLAYLIST=5, PSSIDS=6 };
 
 class NetServer {
   public:
     uint8_t playlistrequest; // ClientId want the playlist
     bool importRequest;
     bool resumePlay;
+    htmlPath_e htmlPath;
   public:
     NetServer() {};
     bool begin();
@@ -22,10 +24,13 @@ class NetServer {
     bool savePlaylist(const char* post);
     void takeMallocDog();
     void giveMallocDog();
+    uint32_t max, htmlpos;
+    bool theend;
 #if IR_PIN!=255
     bool irRecordEnable;
     void irToWs(const char* protocol, uint64_t irvalue);
     void irValsToWs();
+    void chunkedHtmlPage(const String& contentType, AsyncWebServerRequest *request);
 #endif
   private:
     requestType_e request;

yoRadio/netserver.h

@@ -1,7 +1,7 @@
 #ifndef options_h
 #define options_h
 
-#define VERSION "0.7.330"
+#define VERSION "0.7.355"
 
 /*******************************************************
 DO NOT EDIT THIS FILE.