v0.8.901
This commit is contained in:
@@ -9,7 +9,6 @@ Config config;
|
||||
#if DSP_HSPI || TS_HSPI || VS_HSPI || SD_HSPI
|
||||
SPIClass SPI2(HSPI);
|
||||
#endif
|
||||
//SPIClass SDSPI(VSPI);
|
||||
|
||||
void u8fix(char *src){
|
||||
char last = src[strlen(src)-1];
|
||||
@@ -24,7 +23,6 @@ void Config::init() {
|
||||
eepromRead(EEPROM_START, store);
|
||||
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=0b100;
|
||||
sdSnuffle = bitRead(store.play_mode, 2);
|
||||
store.play_mode = store.play_mode & 0b11;
|
||||
@@ -37,10 +35,6 @@ void Config::init() {
|
||||
ssidsCount = 0;
|
||||
sdResumePos = 0;
|
||||
if(SDC_CS!=255){
|
||||
//pinMode(SDC_CS, OUTPUT); digitalWrite(SDC_CS, HIGH);
|
||||
//SDSPI.begin(SDC_SPI);
|
||||
//SDSPI.setFrequency(1000000);
|
||||
//SDSPI.setFrequency(100000);
|
||||
if(!SD.begin(SDC_CS)){
|
||||
store.play_mode=PM_WEB;
|
||||
Serial.println("##[ERROR]#\tCard Mount Failed");
|
||||
|
||||
@@ -332,7 +332,9 @@ void Display::_layoutChange(bool played){
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef DSP_QUEUE_TICKS
|
||||
#define DSP_QUEUE_TICKS 8
|
||||
#endif
|
||||
void Display::loop() {
|
||||
if(_bootStep==0) {
|
||||
_pager.begin();
|
||||
@@ -345,7 +347,7 @@ void Display::loop() {
|
||||
nextion.loop();
|
||||
#endif
|
||||
requestParams_t request;
|
||||
if(xQueueReceive(displayQueue, &request, 5)){
|
||||
if(xQueueReceive(displayQueue, &request, DSP_QUEUE_TICKS)){
|
||||
switch (request.type){
|
||||
case NEWMODE: _swichMode((displayMode_e)request.payload); break;
|
||||
case CLOCK:
|
||||
|
||||
@@ -512,7 +512,6 @@ void NetServer::onWsMessage(void *arg, uint8_t *data, size_t len, uint8_t client
|
||||
}
|
||||
}
|
||||
if (strcmp(cmd, "snuffle") == 0) {
|
||||
Serial.printf("snuffle=%s\t********************\n", val);
|
||||
config.setSnuffle(strcmp(val, "true") == 0);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user