diff --git a/README.md b/README.md index 8c4e318..8a93396 100644 --- a/README.md +++ b/README.md @@ -281,6 +281,11 @@ Work is in progress... --- ## Version history +#### v0.6.202 +- fixed errors in the operation of the second encoder +- rewrote [plugin example](https://github.com/e2002/yoradio/blob/main/exsamples/displayhandlers.ino) +- fixed compilation errors on macOS #2 + #### v0.6.200 - please backup your playlist and wifi settings before updating (export) - accelerated displays up to ~30fps (everything except LCD) diff --git a/exsamples/displayhandlers.ino b/exsamples/displayhandlers.ino index 1882168..f8c8af9 100644 --- a/exsamples/displayhandlers.ino +++ b/exsamples/displayhandlers.ino @@ -134,7 +134,7 @@ void updateWeather() { NULL, /* parameter of the task */ 0, /* priority of the task */ &weatherUpdateTaskHandle, /* Task handle to keep track of created task */ - 1); /* pin task to core CORE_FOR_LOOP_CONTROLS */ + 0); /* pin task to core CORE_FOR_LOOP_CONTROLS */ } /*********************************************** diff --git a/yoRadio/controls.cpp b/yoRadio/controls.cpp index a8dc26d..f9984b6 100644 --- a/yoRadio/controls.cpp +++ b/yoRadio/controls.cpp @@ -153,7 +153,10 @@ void encoder2Loop() { if (ENC2_BTNB != 255) { bp = digitalRead(ENC2_BTNB); } - if (bp == HIGH && display.mode == PLAYER) display.putRequest({NEWMODE, STATIONS}); //display.swichMode(STATIONS); + if (bp == HIGH && display.mode == PLAYER) { + display.putRequest({NEWMODE, STATIONS}); + while(display.mode != STATIONS) {delay(5);} + } controlsEvent(encNewPosition > 0); } } diff --git a/yoRadio/display.cpp b/yoRadio/display.cpp index 4a17ed5..4d6eb48 100644 --- a/yoRadio/display.cpp +++ b/yoRadio/display.cpp @@ -444,6 +444,8 @@ void Display::loop() { plCurrent.loop(); break; } + default: + break; } dsp.loop(); if (dsp_on_loop) dsp_on_loop(&dsp); diff --git a/yoRadio/netserver.cpp b/yoRadio/netserver.cpp index 924e36d..cb337ab 100644 --- a/yoRadio/netserver.cpp +++ b/yoRadio/netserver.cpp @@ -33,6 +33,7 @@ bool NetServer::begin() { ssidCount = 0; int mcb = heap_caps_get_free_size(MALLOC_CAP_8BIT); int mci = heap_caps_get_free_size(MALLOC_CAP_INTERNAL); + (void)mci; log_i("[yoradio] webserver.on / - MALLOC_CAP_INTERNAL=%d, MALLOC_CAP_8BIT=%d", mci, mcb); netserver.resumePlay = mcb < MIN_MALLOC; if (netserver.resumePlay) { diff --git a/yoRadio/options.h b/yoRadio/options.h index 64a0690..2e2249e 100644 --- a/yoRadio/options.h +++ b/yoRadio/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define VERSION "0.6.200" +#define VERSION "0.6.202" /******************************************************* DO NOT EDIT THIS FILE. diff --git a/yoRadio/src/audioI2S/Audio.cpp b/yoRadio/src/audioI2S/Audio.cpp index fb9ef26..9608045 100644 --- a/yoRadio/src/audioI2S/Audio.cpp +++ b/yoRadio/src/audioI2S/Audio.cpp @@ -4246,7 +4246,7 @@ void Audio::setBalance(int8_t bal){ // bal -16...16 } //--------------------------------------------------------------------------------------------------------------------- void Audio::setVolume(uint8_t vol) { // vol 22 steps, 0...21 - if(vol > 255) vol = 254; + if(vol > 254) vol = 254; //volume = map(eeprom_config.volume, 0, 21, 0, 255); //m_vol = map(vol, 0, 254, 0, 64); m_vol = vol;