iot/yoradio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'trip5-screensaver' into new

Browse Source
This commit is contained in:
e2002
2025-01-15 16:26:37 +03:00
parent c2c1908f96 e339e820fc
commit 98c005d5e0
9 changed files with 104 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
yoRadio/data/www/script.js.gz
View File

Binary file not shown.

24
yoRadio/data/www/settings.html
View File

@@ -78,12 +78,30 @@
<div class="row-title"><span>screensaver</span></div> <div class="row-title"><span>screensaver</span></div>
<div class="flex-row group group_tft group_oled group_nextion hidden" style="margin-top:20px;"> <div class="flex-row group group_tft group_oled group_nextion hidden" style="margin-top:20px;">
<div class="inputwrap"> <div class="inputwrap">
<span class="inputtitle">screensaver enabled</span> <span class="inputtitle">while not playing</span>
<div class="checkbox off nous" id="screensaverenabled" style="padding-top:16px;"></div> <div class="checkbox off nous" id="screensaverenabled" style="padding-top:16px;"></div>
</div> </div>
<div class="inputwrap"> <div class="inputwrap">
<span class="inputtitle">screensaver timeout (sec)</span> <span class="inputtitle">blank screen</span>
<input type="number" id="screensavertimeout" class="textinput inputchange" name="screensavertimeout" value="" maxlength="3" min="0" max="65520" /> <div class="checkbox off nous" id="screensaverblank"></div>
</div>
<div class="inputwrap">
<span class="inputtitle">timeout (sec)</span>
<input type="number" id="screensavertimeout" class="textinput inputchange" name="screensavertimeout" value="" maxlength="3" min="5" max="65520" />
</div>
</div>
<div class="flex-row group group_tft group_oled group_nextion hidden">
<div class="inputwrap">
<span class="inputtitle">while playing</span>
<div class="checkbox off nous" id="screensaverplayingenabled"></div>
</div>
<div class="inputwrap">
<span class="inputtitle">blank screen</span>
<div class="checkbox off nous" id="screensaverplayingblank"></div>
</div>
<div class="inputwrap">
<span class="inputtitle">timeout (min)</span>
<input type="number" id="screensaverplayingtimeout" class="textinput inputchange" name="screensaverplayingtimeout" value="" maxlength="3" min="1" max="1080" />
</div> </div>
</div> </div>
</section> </section>

2
yoRadio/src/core/common.h
View File

@@ -1,7 +1,7 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
enum displayMode_e { PLAYER, VOL, STATIONS, NUMBERS, LOST, UPDATING, INFO, SETTINGS, TIMEZONE, WIFI, CLEAR, SLEEPING, SDCHANGE, SCREENSAVER }; enum displayMode_e { PLAYER, VOL, STATIONS, NUMBERS, LOST, UPDATING, INFO, SETTINGS, TIMEZONE, WIFI, CLEAR, SLEEPING, SDCHANGE, SCREENSAVER, SCREENBLANK };
enum pages_e : uint8_t { PG_PLAYER=0, PG_DIALOG=1, PG_PLAYLIST=2, PG_SCREENSAVER=3 }; enum pages_e : uint8_t { PG_PLAYER=0, PG_DIALOG=1, PG_PLAYLIST=2, PG_SCREENSAVER=3 };
enum displayRequestType_e { BOOTSTRING, NEWMODE, CLOCK, NEWTITLE, NEWSTATION, NEXTSTATION, DRAWPLAYLIST, DRAWVOL, DBITRATE, AUDIOINFO, SHOWVUMETER, DSPRSSI, SHOWWEATHER, NEWWEATHER, PSTOP, PSTART, DSP_START, WAITFORSD, SDFILEINDEX, NEWIP, NOPE }; enum displayRequestType_e { BOOTSTRING, NEWMODE, CLOCK, NEWTITLE, NEWSTATION, NEXTSTATION, DRAWPLAYLIST, DRAWVOL, DBITRATE, AUDIOINFO, SHOWVUMETER, DSPRSSI, SHOWWEATHER, NEWWEATHER, PSTOP, PSTART, DSP_START, WAITFORSD, SDFILEINDEX, NEWIP, NOPE };

9
yoRadio/src/core/config.cpp
View File

@@ -34,6 +34,7 @@ void Config::init() {
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
sdResumePos = 0; sdResumePos = 0;
screensaverTicks = 0; screensaverTicks = 0;
screensaverPlayingTicks = 0;
isScreensaver = false; isScreensaver = false;
bootInfo(); bootInfo();
#if RTCSUPPORTED #if RTCSUPPORTED
@@ -97,6 +98,12 @@ void Config::_setupVersion(){
saveValue(store.mdnsname, buf, MDNS_LENGTH); saveValue(store.mdnsname, buf, MDNS_LENGTH);
saveValue(&store.skipPlaylistUpDown, false); saveValue(&store.skipPlaylistUpDown, false);
break; break;
case 3:
saveValue(&store.screensaverBlank, false);
saveValue(&store.screensaverPlayingEnabled, false);
saveValue(&store.screensaverPlayingTimeout, (uint16_t)5);
saveValue(&store.screensaverPlayingBlank, false);
break;
default: default:
break; break;
} }
@@ -353,6 +360,8 @@ void Config::setDefaults() {
store.screensaverTimeout = 20; store.screensaverTimeout = 20;
snprintf(store.mdnsname, MDNS_LENGTH, "yoradio-%x", getChipId()); snprintf(store.mdnsname, MDNS_LENGTH, "yoradio-%x", getChipId());
store.skipPlaylistUpDown = false; store.skipPlaylistUpDown = false;
store.screensaverPlayingEnabled = false;
store.screensaverPlayingTimeout = 5;
eepromWrite(EEPROM_START, store); eepromWrite(EEPROM_START, store);
} }

7
yoRadio/src/core/config.h
View File

@@ -46,7 +46,7 @@
#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
#define ESP_ARDUINO_3 1 #define ESP_ARDUINO_3 1
#endif #endif
#define CONFIG_VERSION 3 #define CONFIG_VERSION 4
enum playMode_e : uint8_t { PM_WEB=0, PM_SDCARD=1 }; enum playMode_e : uint8_t { PM_WEB=0, PM_SDCARD=1 };
enum BitrateFormat { BF_UNCNOWN, BF_MP3, BF_AAC, BF_FLAC, BF_OGG, BF_WAV }; enum BitrateFormat { BF_UNCNOWN, BF_MP3, BF_AAC, BF_FLAC, BF_OGG, BF_WAV };
@@ -136,6 +136,10 @@ struct config_t
bool rotate90; bool rotate90;
bool screensaverEnabled; bool screensaverEnabled;
uint16_t screensaverTimeout; uint16_t screensaverTimeout;
bool screensaverBlank;
bool screensaverPlayingEnabled;
uint16_t screensaverPlayingTimeout;
bool screensaverPlayingBlank;
char mdnsname[24]; char mdnsname[24];
bool skipPlaylistUpDown; bool skipPlaylistUpDown;
}; };
@@ -181,6 +185,7 @@ class Config {
bool emptyFS; bool emptyFS;
uint16_t vuThreshold; uint16_t vuThreshold;
uint16_t screensaverTicks; uint16_t screensaverTicks;
uint16_t screensaverPlayingTicks;
bool isScreensaver; bool isScreensaver;
public: public:
Config() {}; Config() {};

6
yoRadio/src/core/display.cpp
View File

@@ -284,11 +284,13 @@ void Display::_swichMode(displayMode_e newmode) {
_pager.setPage( pages[PG_PLAYER]); _pager.setPage( pages[PG_PLAYER]);
pm.on_display_player(); pm.on_display_player();
} }
if (newmode == SCREENSAVER) { if (newmode == SCREENSAVER || newmode == SCREENBLANK) {
config.isScreensaver = true; config.isScreensaver = true;
_pager.setPage( pages[PG_SCREENSAVER]); _pager.setPage( pages[PG_SCREENSAVER]);
if (newmode == SCREENBLANK) dsp.clearClock();
}else{ }else{
config.screensaverTicks=SCREENSAVERSTARTUPDELAY; config.screensaverTicks=SCREENSAVERSTARTUPDELAY;
config.screensaverPlayingTicks=SCREENSAVERSTARTUPDELAY;
config.isScreensaver = false; config.isScreensaver = false;
} }
if (newmode == VOL) { if (newmode == VOL) {
@@ -533,7 +535,7 @@ void Display::_time(bool redraw) {
} }
#endif #endif
if(config.isScreensaver && network.timeinfo.tm_sec % 60 == 0) if(config.isScreensaver && network.timeinfo.tm_sec % 60 == 0)
_clock.moveTo({clockConf.left, random(TFT_FRAMEWDT+clockConf.textsize, (dsp.height()-TFT_FRAMEWDT*2)), 0}); _clock.moveTo({clockConf.left, static_cast<uint16_t>(random(TFT_FRAMEWDT+clockConf.textsize, (dsp.height()-dsp.plItemHeight-TFT_FRAMEWDT*2))), 0});
_clock.draw(); _clock.draw();
/*#ifdef USE_NEXTION /*#ifdef USE_NEXTION
nextion.printClock(network.timeinfo); nextion.printClock(network.timeinfo);

47
yoRadio/src/core/netserver.cpp
View File

@@ -298,7 +298,7 @@ void NetServer::processQueue(){
config.vuThreshold, config.vuThreshold,
config.store.mdnsname); config.store.mdnsname);
break; break;
case GETSCREEN: sprintf (wsbuf, "{\"flip\":%d,\"inv\":%d,\"nump\":%d,\"tsf\":%d,\"tsd\":%d,\"dspon\":%d,\"br\":%d,\"con\":%d,\"scre\":%d,\"scrt\":%d}", case GETSCREEN: sprintf (wsbuf, "{\"flip\":%d,\"inv\":%d,\"nump\":%d,\"tsf\":%d,\"tsd\":%d,\"dspon\":%d,\"br\":%d,\"con\":%d,\"scre\":%d,\"scrt\":%d,\"scrb\":%d,\"scrpe\":%d,\"scrpt\":%d,\"scrpb\":%d}",
config.store.flipscreen, config.store.flipscreen,
config.store.invertdisplay, config.store.invertdisplay,
config.store.numplaylist, config.store.numplaylist,
@@ -308,7 +308,11 @@ void NetServer::processQueue(){
config.store.brightness, config.store.brightness,
config.store.contrast, config.store.contrast,
config.store.screensaverEnabled, config.store.screensaverEnabled,
config.store.screensaverTimeout); config.store.screensaverTimeout,
config.store.screensaverBlank,
config.store.screensaverPlayingEnabled,
config.store.screensaverPlayingTimeout,
config.store.screensaverPlayingBlank);
break; break;
case GETTIMEZONE: sprintf (wsbuf, "{\"tzh\":%d,\"tzm\":%d,\"sntp1\":\"%s\",\"sntp2\":\"%s\"}", case GETTIMEZONE: sprintf (wsbuf, "{\"tzh\":%d,\"tzm\":%d,\"sntp1\":\"%s\",\"sntp2\":\"%s\"}",
config.store.tzHour, config.store.tzHour,
@@ -507,13 +511,46 @@ void NetServer::onWsMessage(void *arg, uint8_t *data, size_t len, uint8_t client
} }
if (strcmp(cmd, "screensavertimeout") == 0) { if (strcmp(cmd, "screensavertimeout") == 0) {
uint16_t valb = atoi(val); uint16_t valb = atoi(val);
valb = constrain(valb,0,65520); valb = constrain(valb,5,65520);
config.saveValue(&config.store.screensaverTimeout, valb); config.saveValue(&config.store.screensaverTimeout, valb);
#ifndef DSP_LCD #ifndef DSP_LCD
display.putRequest(NEWMODE, PLAYER); display.putRequest(NEWMODE, PLAYER);
#endif #endif
return; return;
} }
if (strcmp(cmd, "screensaverblank") == 0) {
bool valb = static_cast<bool>(atoi(val));
config.saveValue(&config.store.screensaverBlank, valb);
#ifndef DSP_LCD
display.putRequest(NEWMODE, PLAYER);
#endif
return;
}
if (strcmp(cmd, "screensaverplayingenabled") == 0) {
bool valb = static_cast<bool>(atoi(val));
config.saveValue(&config.store.screensaverPlayingEnabled, valb);
#ifndef DSP_LCD
display.putRequest(NEWMODE, PLAYER);
#endif
return;
}
if (strcmp(cmd, "screensaverplayingtimeout") == 0) {
uint16_t valb = atoi(val);
valb = constrain(valb,1,1080);
config.saveValue(&config.store.screensaverPlayingTimeout, valb);
#ifndef DSP_LCD
display.putRequest(NEWMODE, PLAYER);
#endif
return;
}
if (strcmp(cmd, "screensaverplayingblank") == 0) {
bool valb = static_cast<bool>(atoi(val));
config.saveValue(&config.store.screensaverPlayingBlank, valb);
#ifndef DSP_LCD
display.putRequest(NEWMODE, PLAYER);
#endif
return;
}
if (strcmp(cmd, "tzh") == 0) { if (strcmp(cmd, "tzh") == 0) {
int8_t vali = atoi(val); int8_t vali = atoi(val);
config.saveValue(&config.store.tzHour, vali); config.saveValue(&config.store.tzHour, vali);
@@ -613,6 +650,10 @@ void NetServer::onWsMessage(void *arg, uint8_t *data, size_t len, uint8_t client
config.saveValue(&config.store.numplaylist, false); config.saveValue(&config.store.numplaylist, false);
config.saveValue(&config.store.screensaverEnabled, false); config.saveValue(&config.store.screensaverEnabled, false);
config.saveValue(&config.store.screensaverTimeout, (uint16_t)20); config.saveValue(&config.store.screensaverTimeout, (uint16_t)20);
config.saveValue(&config.store.screensaverBlank, false);
config.saveValue(&config.store.screensaverPlayingEnabled, false);
config.saveValue(&config.store.screensaverPlayingTimeout, (uint16_t)5);
config.saveValue(&config.store.screensaverPlayingBlank, false);
display.putRequest(NEWMODE, CLEAR); display.putRequest(NEWMODE, PLAYER); display.putRequest(NEWMODE, CLEAR); display.putRequest(NEWMODE, PLAYER);
requestOnChange(GETSCREEN, clientId); requestOnChange(GETSCREEN, clientId);
return; return;

19
yoRadio/src/core/network.cpp
View File

@@ -51,7 +51,24 @@ void ticks() {
} }
#ifndef DSP_LCD #ifndef DSP_LCD
if(config.store.screensaverEnabled && display.mode()==PLAYER && !player.isRunning()){ if(config.store.screensaverEnabled && display.mode()==PLAYER && !player.isRunning()){
if(config.screensaverTicks++ > config.store.screensaverTimeout+SCREENSAVERSTARTUPDELAY) display.putRequest(NEWMODE, SCREENSAVER); config.screensaverTicks++;
if(config.screensaverTicks > config.store.screensaverTimeout+SCREENSAVERSTARTUPDELAY){
if(config.store.screensaverBlank){
display.putRequest(NEWMODE, SCREENBLANK);
}else{
display.putRequest(NEWMODE, SCREENSAVER);
}
}
}
if(config.store.screensaverPlayingEnabled && display.mode()==PLAYER && player.isRunning()){
config.screensaverPlayingTicks++;
if(config.screensaverPlayingTicks > config.store.screensaverPlayingTimeout*60+SCREENSAVERSTARTUPDELAY){
if(config.store.screensaverPlayingBlank){
display.putRequest(NEWMODE, SCREENBLANK);
}else{
display.putRequest(NEWMODE, SCREENSAVER);
}
}
} }
#endif #endif
#if RTCSUPPORTED #if RTCSUPPORTED

1
yoRadio/src/core/player.cpp
View File

@@ -191,6 +191,7 @@ void Player::_play(uint16_t stationId) {
config.vuThreshold = 0; config.vuThreshold = 0;
//display.putRequest(PSTOP); //display.putRequest(PSTOP);
config.screensaverTicks=SCREENSAVERSTARTUPDELAY; config.screensaverTicks=SCREENSAVERSTARTUPDELAY;
config.screensaverPlayingTicks=SCREENSAVERSTARTUPDELAY;
if(config.getMode()!=PM_SDCARD) { if(config.getMode()!=PM_SDCARD) {
display.putRequest(PSTOP); display.putRequest(PSTOP);
} }