v0.9.686
This commit is contained in:
@@ -235,6 +235,10 @@ Work is in progress...
|
|||||||
|
|
||||||
---
|
---
|
||||||
## Version history
|
## Version history
|
||||||
|
#### v0.9.686
|
||||||
|
- fixed SD card connection bug in configurations with `SD_SPIPINS` defined
|
||||||
|
- time synchronization setting
|
||||||
|
|
||||||
#### v0.9.682
|
#### v0.9.682
|
||||||
- fixed bug with redundant epoch time being added to the tag in SD mode https://t.me/yoradiochat/66688
|
- fixed bug with redundant epoch time being added to the tag in SD mode https://t.me/yoradiochat/66688
|
||||||
|
|
||||||
|
|||||||
@@ -111,6 +111,9 @@ size_t NetServer::chunkedHtmlPageCallback(uint8_t* buffer, size_t maxLen, size_t
|
|||||||
display.unlock();
|
display.unlock();
|
||||||
return 0;
|
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;
|
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);
|
DBGVB("[%s] seek to %d in %s and read %d bytes with maxLen=%d", __func__, index, netserver.chunkedPathBuffer, canread, maxLen);
|
||||||
//netserver.loop();
|
//netserver.loop();
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#define options_h
|
#define options_h
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define YOVERSION "0.9.682"
|
#define YOVERSION "0.9.686"
|
||||||
|
|
||||||
/*******************************************************
|
/*******************************************************
|
||||||
DO NOT EDIT THIS FILE.
|
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
|
#define L10N_LANGUAGE EN
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
|
||||||
#ifndef SCREENSAVERSTARTUPDELAY
|
#ifndef SCREENSAVERSTARTUPDELAY
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
#include "player.h"
|
#include "player.h"
|
||||||
|
|
||||||
#if defined(SD_SPIPINS) || SD_HSPI
|
#if defined(SD_SPIPINS) || SD_HSPI
|
||||||
SPIClass SDSPI(HOOPSENb);
|
SPIClass SDSPI(HSPI);
|
||||||
#define SDREALSPI SDSPI
|
#define SDREALSPI SDSPI
|
||||||
#else
|
#else
|
||||||
#define SDREALSPI SPI
|
#define SDREALSPI SPI
|
||||||
|
|||||||
@@ -177,20 +177,14 @@ void TimeKeeper::_doAfterWait(){
|
|||||||
|
|
||||||
void TimeKeeper::_upClock(){
|
void TimeKeeper::_upClock(){
|
||||||
#if RTCSUPPORTED
|
#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
|
#else
|
||||||
if(network.timeinfo.tm_year>100 || network.status == SDREADY) {
|
if(network.timeinfo.tm_year>100 || network.status == SDREADY) {
|
||||||
network.timeinfo.tm_sec++;
|
network.timeinfo.tm_sec++;
|
||||||
mktime(&network.timeinfo);
|
mktime(&network.timeinfo);
|
||||||
if(display.ready()) display.putRequest(CLOCK);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
if(display.ready()) display.putRequest(CLOCK);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TimeKeeper::_upScreensaver(){
|
void TimeKeeper::_upScreensaver(){
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if DSP_HSPI || TS_HSPI || VS_HSPI
|
#if DSP_HSPI || TS_HSPI || VS_HSPI
|
||||||
SPIClass SPI2(HOOPSENb);
|
SPIClass SPI2(HSPI);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern __attribute__((weak)) void yoradio_on_setup();
|
extern __attribute__((weak)) void yoradio_on_setup();
|
||||||
|
|||||||
Reference in New Issue
Block a user