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

last_station

Browse Source
This commit is contained in:
e2002
2022-12-27 13:03:47 +03:00
parent fa2d1a33c9
commit bc10a6c0de
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,8 @@ void Config::init() {
#endif #endif
eepromRead(EEPROM_START, store); eepromRead(EEPROM_START, store);
if (store.config_set != 4262) setDefaults(); if (store.config_set != 4262) setDefaults();
backupLastStation = store.lastStation;
Serial.print("Config::init, backupLastStation=\t"); Serial.println(backupLastStation);
if(store.play_mode==80) store.play_mode=PM_WEB; if(store.play_mode==80) store.play_mode=PM_WEB;
//if (!SPIFFS.begin(false, "/spiffs", 30)) { //if (!SPIFFS.begin(false, "/spiffs", 30)) {
@@ -188,7 +190,11 @@ uint16_t Config::getTimezoneOffset() {
} }
void Config::save() { void Config::save() {
uint16_t ls = store.lastStation;
if(store.play_mode==PM_SDCARD) store.lastStation = backupLastStation;
if(store.play_mode==PM_WEB) backupLastStation = store.lastStation;
eepromWrite(EEPROM_START, store); eepromWrite(EEPROM_START, store);
store.lastStation = ls;
} }
#if IR_PIN!=255 #if IR_PIN!=255

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

@@ -153,6 +153,7 @@ class Config {
byte ssidsCount; byte ssidsCount;
uint16_t sleepfor; uint16_t sleepfor;
uint32_t sdResumePos; uint32_t sdResumePos;
uint16_t backupLastStation;
public: public:
Config() {}; Config() {};
void save(); void save();

2
yoRadio/src/core/controls.cpp
View File

@@ -500,10 +500,12 @@ void onBtnClick(int id) {
} }
case EVT_BTNMODE: { case EVT_BTNMODE: {
if(SDC_CS==255) break; if(SDC_CS==255) break;
if(config.store.play_mode==PM_SDCARD) config.store.lastStation = config.backupLastStation;
config.store.play_mode++; config.store.play_mode++;
if(config.store.play_mode > MAX_PLAY_MODE){ if(config.store.play_mode > MAX_PLAY_MODE){
config.store.play_mode=0; config.store.play_mode=0;
} }
config.save(); config.save();
ESP.restart(); ESP.restart();
break; break;