v0.9.686

README.md

@@ -235,6 +235,10 @@ Work is in progress...
 
 ---
 ## Version history
+#### v0.9.686
+- fixed SD card connection bug in configurations with `SD_SPIPINS` defined
+- time synchronization setting
+
 #### v0.9.682
 - fixed bug with redundant epoch time being added to the tag in SD mode https://t.me/yoradiochat/66688
 

yoRadio/src/core/netserver.cpp

@@ -111,6 +111,9 @@ size_t NetServer::chunkedHtmlPageCallback(uint8_t* buffer, size_t maxLen, size_t
     display.unlock();
     return 0;
   }
+  #ifdef MAX_PL_READ_BYTES
+    if(maxLen>MAX_PL_READ_BYTES) maxLen=MAX_PL_READ_BYTES;
+  #endif
   size_t canread = (needread > maxLen) ? maxLen : needread;
   DBGVB("[%s] seek to %d in %s and read %d bytes with maxLen=%d", __func__, index, netserver.chunkedPathBuffer, canread, maxLen);
   //netserver.loop();

yoRadio/src/core/options.h

@@ -2,7 +2,7 @@
 #define options_h
 #pragma once
 
-#define YOVERSION "0.9.682"
+#define YOVERSION "0.9.686"
 
 /*******************************************************
 DO NOT EDIT THIS FILE. 
@@ -481,16 +481,9 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
   #define L10N_LANGUAGE EN
 #endif
 
-#ifdef VSPI
+#include <SPI.h>
-#define VOOPSENb VSPI
+#if !defined(CONFIG_IDF_TARGET_ESP32)
-#else
+#define VSPI FSPI
-#define VOOPSENb 3
-#endif
-
-#ifdef HSPI
-#define HOOPSENb HSPI
-#else
-#define HOOPSENb 2
 #endif
 
 #ifndef SCREENSAVERSTARTUPDELAY

yoRadio/src/core/sdmanager.cpp

@@ -12,7 +12,7 @@
 #include "player.h"
 
 #if defined(SD_SPIPINS) || SD_HSPI
-SPIClass  SDSPI(HOOPSENb);
+SPIClass  SDSPI(HSPI);
 #define SDREALSPI SDSPI
 #else
   #define SDREALSPI SPI

yoRadio/src/core/timekeeper.cpp

@@ -177,20 +177,14 @@ void TimeKeeper::_doAfterWait(){
 
 void TimeKeeper::_upClock(){
 #if RTCSUPPORTED
-  if(config.isRTCFound()){
+  if(config.isRTCFound()) rtc.getTime(&network.timeinfo);
-    rtc.getTime(&network.timeinfo);
-    if(network.timeinfo.tm_year>100){
-      mktime(&network.timeinfo);
-      if(display.ready()) display.putRequest(CLOCK);
-    }
-  }
 #else
   if(network.timeinfo.tm_year>100 || network.status == SDREADY) {
     network.timeinfo.tm_sec++;
     mktime(&network.timeinfo);
-    if(display.ready()) display.putRequest(CLOCK);
   }
 #endif
+  if(display.ready()) display.putRequest(CLOCK);
 }
 
 void TimeKeeper::_upScreensaver(){

yoRadio/src/main.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if DSP_HSPI || TS_HSPI || VS_HSPI
-SPIClass  SPI2(HOOPSENb);
+SPIClass  SPI2(HSPI);
 #endif
 
 extern __attribute__((weak)) void yoradio_on_setup();