From 629cdef31d39cd5c6d688c1f79107a8d56364496 Mon Sep 17 00:00:00 2001 From: e2002 Date: Mon, 24 Apr 2023 10:50:21 +0300 Subject: [PATCH] v0.9.161 --- README.md | 5 +++++ yoRadio/data/www/style.css.gz | Bin 7167 -> 7170 bytes yoRadio/src/audioI2S/Audio.cpp | 8 +++++--- yoRadio/src/audioVS1053/audioVS1053Ex.cpp | 8 +++++--- yoRadio/src/core/options.h | 2 +- yoRadio/src/displays/widgets/widgets.cpp | 1 + 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index beb7ec8..f2c2fbf 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,11 @@ Work is in progress... --- ## Version history +#### v0.9.161 +- fixed errors 403 Account already in use, 401 Authorization required +- fixed bitrate icon overflow bug +- fix html markup errors + #### v0.9.156 - fixed bug of random change of playback location when playing files from SD card diff --git a/yoRadio/data/www/style.css.gz b/yoRadio/data/www/style.css.gz index a6eb4183cd70ac1bbfd2f782de1d5fd2b5750ada..34c20335d46a7183e3dff41aa2bd15385c0beef6 100644 GIT binary patch delta 2635 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 diff --git a/yoRadio/src/audioI2S/Audio.cpp b/yoRadio/src/audioI2S/Audio.cpp index a47a4c1..7b8a534 100644 --- a/yoRadio/src/audioI2S/Audio.cpp +++ b/yoRadio/src/audioI2S/Audio.cpp @@ -461,9 +461,11 @@ bool Audio::connecttohost(const char* host, const char* user, const char* pwd) { strcat(rqh, hostwoext); strcat(rqh, "\r\n"); strcat(rqh, "Icy-MetaData:1\r\n"); - strcat(rqh, "Authorization: Basic "); - strcat(rqh, authorization); - strcat(rqh, "\r\n"); + if (auth > 0) { + strcat(rqh, "Authorization: Basic "); + strcat(rqh, authorization); + strcat(rqh, "\r\n"); + } strcat(rqh, "Accept-Encoding: identity;q=1,*;q=0\r\n"); strcat(rqh, "User-Agent: Mozilla/5.0\r\n"); strcat(rqh, "Connection: keep-alive\r\n\r\n"); diff --git a/yoRadio/src/audioVS1053/audioVS1053Ex.cpp b/yoRadio/src/audioVS1053/audioVS1053Ex.cpp index 772d39c..8df8819 100644 --- a/yoRadio/src/audioVS1053/audioVS1053Ex.cpp +++ b/yoRadio/src/audioVS1053/audioVS1053Ex.cpp @@ -1787,9 +1787,11 @@ bool Audio::connecttohost(const char* host, const char* user, const char* pwd) { strcat(rqh, hostwoext); strcat(rqh, "\r\n"); strcat(rqh, "Icy-MetaData:1\r\n"); - strcat(rqh, "Authorization: Basic "); - strcat(rqh, authorization); - strcat(rqh, "\r\n"); + if (auth > 0) { + strcat(rqh, "Authorization: Basic "); + strcat(rqh, authorization); + strcat(rqh, "\r\n"); + } strcat(rqh, "Accept-Encoding: identity;q=1,*;q=0\r\n"); strcat(rqh, "User-Agent: Mozilla/5.0\r\n"); strcat(rqh, "Connection: keep-alive\r\n\r\n"); diff --git a/yoRadio/src/core/options.h b/yoRadio/src/core/options.h index c525a62..9b582c8 100644 --- a/yoRadio/src/core/options.h +++ b/yoRadio/src/core/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define YOVERSION "0.9.156" +#define YOVERSION "0.9.161" /******************************************************* DO NOT EDIT THIS FILE. diff --git a/yoRadio/src/displays/widgets/widgets.cpp b/yoRadio/src/displays/widgets/widgets.cpp index 69c9402..4e5fc9e 100644 --- a/yoRadio/src/displays/widgets/widgets.cpp +++ b/yoRadio/src/displays/widgets/widgets.cpp @@ -467,6 +467,7 @@ void BitrateWidget::init(BitrateConfig bconf, uint16_t fgcolor, uint16_t bgcolor void BitrateWidget::setBitrate(uint16_t bitrate){ _bitrate = bitrate; + if(_bitrate>999) _bitrate=999; _draw(); }