From 9373e8d90b47f7bd2543fa6bd6bca8e192a9b3d0 Mon Sep 17 00:00:00 2001 From: e2002 Date: Fri, 28 Apr 2023 10:36:53 +0300 Subject: [PATCH] v0.9.174 --- README.md | 5 + yoRadio/data/www/index.html | 2 +- yoRadio/data/www/settings.html | 2 +- yoRadio/data/www/style.css.gz | Bin 7170 -> 7175 bytes yoRadio/data/www/update.html | 2 +- yoRadio/fonts/glcdfont_EN.c | 287 ++++++++++++++++++++++ yoRadio/src/audioI2S/Audio.cpp | 25 +- yoRadio/src/audioVS1053/audioVS1053Ex.cpp | 6 + yoRadio/src/core/audiohandlers.h | 1 + yoRadio/src/core/options.h | 2 +- yoRadio/src/core/player.cpp | 1 + yoRadio/src/displays/tools/utf8RusGFX.h | 1 + 12 files changed, 325 insertions(+), 9 deletions(-) create mode 100644 yoRadio/fonts/glcdfont_EN.c diff --git a/README.md b/README.md index f2c2fbf..9ed9443 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,11 @@ Work is in progress... --- ## Version history +#### v0.9.174 +- added forced shutdown of smartstart when WebSocket freezes on problem stations +- added bitrate icon when playing files from SD card +- fix html markup errors + #### v0.9.161 - fixed errors 403 Account already in use, 401 Authorization required - fixed bitrate icon overflow bug diff --git a/yoRadio/data/www/index.html b/yoRadio/data/www/index.html index 8dd0600..09846dc 100644 --- a/yoRadio/data/www/index.html +++ b/yoRadio/data/www/index.html @@ -1,7 +1,7 @@ - + diff --git a/yoRadio/data/www/settings.html b/yoRadio/data/www/settings.html index ea4d647..0c09f8a 100644 --- a/yoRadio/data/www/settings.html +++ b/yoRadio/data/www/settings.html @@ -1,7 +1,7 @@ - + diff --git a/yoRadio/data/www/style.css.gz b/yoRadio/data/www/style.css.gz index 34c20335d46a7183e3dff41aa2bd15385c0beef6..35d35ffeb09ae1d20b2c2fb02c0be47667ec557f 100644 GIT binary patch delta 1831 zcmV+?2iW+6IEOd~ABzYGSa(XX2M-bgCsmUe5?ukblXemy2XKjJ&Q&VT&n+s@XOm*u>0-z+ko@_WPrWOEkkQ7b@(2_id$4PI&y zqFF^pDn4O5;=-lRO`59~c+g2)SHKSwoeY7kvH|9>Z?DXKTce`ih|0>hN#SFE3CMxFvW987kqys)c-Wq9 zH_`hmmm6)4U46iE%gXXPW|+FTuoZ4_2ucYqcp_U ztDx?Pk&bT%{WZ`S(^=%Qb5CQ_BrhJ@Yp^rtEMZdlHfirj`sN?nC$e~(&Q~1;Te9nY zXE7Td1dF;(*hQz-8a1}EbMk*^lWtoJPq5lme6*5JOr_sD*LY=E_f1#htkv5q9`mRk zHywDrA=etv{G6N@x3_6gGTHH9FKSy`=QmerN|o3#$CsS5GMSY&+LazUO=8$Q3(R0I z&z-KS&e{#L#0X{Fy<$zQAzEIEl~#P&Z^UWyzjZ1WtB;)hv?m%o*{xW`=H=WXH0)TJHVy=R?NIt@Qld_S zHrL!8+S86kiR)qCW1C)kPjDBrKHFCIHZ@i+7N!prO5q8@#n-K-B$Z9CG^W=$=CO=h zt-QX9lCQzpq1?yB>al;@7|91>s5Lt7rM4zqo2zQfx~r7k9oM92e+g@vcfzL1NS54lTH_Zb_lnr6a%{#J1=?lC(lH{$(Uu$nK(=hCm4a<(219&Pw9k)%876{DTy?^C< z|IW7QZ;pBpH#3bGPmSUi#vMRK$V<5m|9gPQQjY-8s2P3-zntuFB7ZCVb-q$7rDXyC z8}vO4?Pb0L0LL}gw51S)X@h`m8pMDi|D@~@h%AHvy#*#hBzwtQ6et?sIfbRaExZ_3 zItr}r_x{@fEJ0F7lZh8oJTCxdB>0~1Jd}j&_@fE^6M7whul@-j)qf9q^?SC9M>Rr4 zzHQy6)-kL!asacG&kb21M2h=DwN}ptXppbN*4CsOJfVu;5o#Yf){l6rVRk$2?IG@G?Ne+EPwaz z+tI!tO!7O$I-5IzPoveu{lyF`;2GR64S^W7xuXY|-T*$1ock(*GeR=&n6y~+x{kkk zou%oIFJy&2NO8~!h=-^FN&xq0&4*CCwm*Ny$&2Ree!8N6`{kD(563lsy~GDPmTC;9m!m2|77X#&(Ygtyww&bDDUw9)ADznYyx3I9ltI5T%;oRz)Yc!qOev-+J#YQ{cknM-`h!jHaYJBF&%M`2+dw!Zjm&9~s3LuwAlE|zRTU}`<})BYf8Q^16+;C96+V>U z)cVFLNJgUH5A3pcG!ykN)ky3ChJSuOH2pH%t8ke?_Y3_a7LV=HTOGj#YlW3>;S1p) z`uUHxZ$_t0q{1IT0@&u#2?R*+>-(&Fc1z7rf$zY#sSB#56~4e%aD4?;C-Qio`%+k%Kfn$DdlMAxMK03H~+CvpsW>IEKJp-bO=Kn{v7`ah%2?$cuk^u=Xtjis!Kr(#b%id8JzvcZ7zTD=Ur(l6sOX3CSZbohaI4a>6E&dwa zgqV6kkTdR587PaidI|fo0E*OqS#Wn$bi~bcHK-#WGx?Cv6(D9=AWJFTllU_tLnX!c zx))Be)+Llv008M}d8GgV delta 1826 zcmV+-2i^FGID$9_ABzYG21Y`$2M-bgqMnl&5?uk*lXemy2+AR#4_q$Xmb0D`Jpq68 z0|#JI1PFM9B_uC}e#Ccpo&WgDx1FsmFUxu1zFA~E<@bmM$mT56qgH?n6GV0h8@$va zM6-&HRD8mA#Dz1G~@Su~pu7DpVIvE06WdqD%-(H#fwnjz25tWs1lgz!w2IO1g zO|X3la_vwKmQ^iUR#BE;rg7yZV6TmX+mo$gw!yWyhT|&MPeG5(0NHW1c24FMnMe3SJqJEzAl z^rJ|!ZTUhe!~KApZO%=TW%@N%q!pGPbnq$Xztg;0?jr`gFwF7^A6?FOpUC2EI$w1ZY{{KvJEHHz; zJa@XPI%_w~5+jsx_lh;KhG=;uR$B38k1vzhNa{(Kg`iXq^zbktdM$t2SIszo6P@@>#kCEcU+UA{Uxkv-U*v3BYC1N z^xD$mPR2lO?N+tkW+5;&xqGv3S7ozp3c9+lOZA52b;UE!d4{+*iK**vg7&&Zk!@c0oA`aRpkqZ*+i z-?na3>ljuVIe=Np=Z1VCM2h=DwN}ptsFN5NVF4+VdKe=ChLfHcJ2%NOY$^9FDF?ct zB2#RM1b=XQzr}DN#KQ;eO9>pbN*4CsOJfVu;5o#Yf)2WS(*}U>gn^uXHIon-EPuD| z+tI!tO!7O$I-5IzPoveuy<>(I@C@#khCqzk+|dI}ZvY=h&V3cZ86lZ>Oj@jZUB_R& z&eHV97qUVhq&VmV#6#2oC4hUh=0m7m+n+z<6Py0IdV& zho5=-q$P>QOq~~D?_+*^jv%oidbqN zEG^0VU0t0bQ}Mp!e);9c!*R`DFY$qfr7DBz<*0&?FNS#RXx#);Th4L_NZ1{Kq*284 z_rOen6iFiYk51)xUTo^kltI5T%;oRz)Yc!qOev-+J+J-ycknM-@`Fw9aYbNH&-Lr0bs!v)M&>j~RFOVTkn16VstUak<})BYf8Q^11w$_aDtsux zsr8Lhkc>pXAJ}E@s3vM(s*>0P41fK6X!>QiSK%^)?icz;EFRmXw>p9g)(R`%!WY6p z^z$EW-;7S1NQFOw1hCDe69|ytm-kua?3S9L0^fmeQx{ZAD|~^k;Q9)RPVPY~Wbcgv z#i!gxnWdXe1IPT_CKqIheRS~aX%AIknMIi`^^B@1a-ZfB5M-#w^;F|V#ee*+Y}QQY z-c1+x?tb@PZqv0##3&17D5Y}}KSpGrqRYDRlnP+*xG$h|@1oK{8Oi;T{#nKj95LVM@Qpx2r;H3|p_ - + diff --git a/yoRadio/fonts/glcdfont_EN.c b/yoRadio/fonts/glcdfont_EN.c new file mode 100644 index 0000000..6018dbc --- /dev/null +++ b/yoRadio/fonts/glcdfont_EN.c @@ -0,0 +1,287 @@ +// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. +// See gfxfont.h for newer custom bitmap font info. + +#ifndef FONT5X7_H +#define FONT5X7_H + +#ifdef __AVR__ +#include +#include +#elif defined(ESP8266) +#include +#elif defined(__IMXRT1052__) || defined(__IMXRT1062__) +// PROGMEM is defefind for T4 to place data in specific memory section +#undef PROGMEM +#define PROGMEM +#else +#define PROGMEM +#endif + +// Standard ASCII 5x7 font + +static const unsigned char font[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x20, 0x20, 0x00, 0x10, 0x10, // \001 rssi 00__ + 0x08, 0x08, 0x00, 0x04, 0x04, // \002 rssi __00 + 0x60, 0x60, 0x00, 0x10, 0x10, // \003 rssi 10__ + 0x60, 0x60, 0x00, 0x70, 0x70, // \004 rssi 11__ + 0x78, 0x78, 0x00, 0x04, 0x04, // \005 rssi __10 + 0x78, 0x78, 0x00, 0x7C, 0x7C, // \006 rssi __11 + 0x00, 0x1C, 0x1C, 0x1C, 0x00, // \007 weather div + 0x7A, 0x00, 0x7E, 0x12, 0x1E, // \010 ip + 0x06, 0x09, 0x09, 0x06, 0x00, // \011 degree + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, + 0x30, 0x48, 0x3A, 0x06, 0x0E, + 0x26, 0x29, 0x79, 0x29, 0x26, + 0x40, 0x7F, 0x05, 0x05, 0x07, + 0x60, 0x7F, 0x05, 0x35, 0x3F, // \016 note + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, + 0x00, 0x7F, 0x3E, 0x1C, 0x08, // \020 next/play + 0x08, 0x1C, 0x3E, 0x7F, 0x00, // \021 prev + 0x14, 0x22, 0x7F, 0x22, 0x14, + 0x00, 0x00, 0x18, 0x3C, 0x7E, // \023 speaker + 0x18, 0x00, 0x00, 0x00, 0x00, // \024 25% + 0x18, 0x42, 0x3C, 0x00, 0x00, // \025 50% + 0x18, 0x42, 0x3C, 0x42, 0x3C, // \026 100% + 0x94, 0xA2, 0xFF, 0xA2, 0x94, + 0x08, 0x04, 0x7E, 0x04, 0x08, + 0x10, 0x20, 0x7E, 0x20, 0x10, + 0x08, 0x08, 0x2A, 0x1C, 0x08, + 0x08, 0x1C, 0x2A, 0x08, 0x08, + 0x7F, 0x7F, 0x00, 0x7F, 0x7F, // \034 pause + 0x55, 0x00, 0x55, 0x55, 0x55, // \035 list + 0x30, 0x38, 0x3E, 0x38, 0x30, + 0x06, 0x0E, 0x3E, 0x0E, 0x06, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x5F, 0x00, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x00, + 0x14, 0x7F, 0x14, 0x7F, 0x14, + 0x24, 0x2A, 0x7F, 0x2A, 0x12, + 0x23, 0x13, 0x08, 0x64, 0x62, + 0x36, 0x49, 0x56, 0x20, 0x50, + 0x00, 0x08, 0x07, 0x03, 0x00, + 0x00, 0x1C, 0x22, 0x41, 0x00, + 0x00, 0x41, 0x22, 0x1C, 0x00, + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, + 0x08, 0x08, 0x3E, 0x08, 0x08, + 0x00, 0x80, 0x70, 0x30, 0x00, + 0x08, 0x08, 0x08, 0x08, 0x08, + 0x00, 0x00, 0x60, 0x60, 0x00, + 0x20, 0x10, 0x08, 0x04, 0x02, + 0x3E, 0x51, 0x49, 0x45, 0x3E, + 0x00, 0x42, 0x7F, 0x40, 0x00, + 0x72, 0x49, 0x49, 0x49, 0x46, + 0x21, 0x41, 0x49, 0x4D, 0x33, + 0x18, 0x14, 0x12, 0x7F, 0x10, + 0x27, 0x45, 0x45, 0x45, 0x39, + 0x3C, 0x4A, 0x49, 0x49, 0x31, + 0x41, 0x21, 0x11, 0x09, 0x07, + 0x36, 0x49, 0x49, 0x49, 0x36, + 0x46, 0x49, 0x49, 0x29, 0x1E, + 0x00, 0x00, 0x14, 0x00, 0x00, + 0x00, 0x40, 0x34, 0x00, 0x00, + 0x00, 0x08, 0x14, 0x22, 0x41, + 0x14, 0x14, 0x14, 0x14, 0x14, + 0x00, 0x41, 0x22, 0x14, 0x08, + 0x02, 0x01, 0x59, 0x09, 0x06, + 0x3E, 0x41, 0x5D, 0x59, 0x4E, + 0x7C, 0x12, 0x11, 0x12, 0x7C, + 0x7F, 0x49, 0x49, 0x49, 0x36, + 0x3E, 0x41, 0x41, 0x41, 0x22, + 0x7F, 0x41, 0x41, 0x41, 0x3E, + 0x7F, 0x49, 0x49, 0x49, 0x41, + 0x7F, 0x09, 0x09, 0x09, 0x01, + 0x3E, 0x41, 0x41, 0x51, 0x73, + 0x7F, 0x08, 0x08, 0x08, 0x7F, + 0x00, 0x41, 0x7F, 0x41, 0x00, + 0x20, 0x40, 0x41, 0x3F, 0x01, + 0x7F, 0x08, 0x14, 0x22, 0x41, + 0x7F, 0x40, 0x40, 0x40, 0x40, + 0x7F, 0x02, 0x1C, 0x02, 0x7F, + 0x7F, 0x04, 0x08, 0x10, 0x7F, + 0x3E, 0x41, 0x41, 0x41, 0x3E, + 0x7F, 0x09, 0x09, 0x09, 0x06, + 0x3E, 0x41, 0x51, 0x21, 0x5E, + 0x7F, 0x09, 0x19, 0x29, 0x46, + 0x26, 0x49, 0x49, 0x49, 0x32, + 0x03, 0x01, 0x7F, 0x01, 0x03, + 0x3F, 0x40, 0x40, 0x40, 0x3F, + 0x1F, 0x20, 0x40, 0x20, 0x1F, + 0x3F, 0x40, 0x38, 0x40, 0x3F, + 0x63, 0x14, 0x08, 0x14, 0x63, + 0x03, 0x04, 0x78, 0x04, 0x03, + 0x61, 0x59, 0x49, 0x4D, 0x43, + 0x00, 0x7F, 0x41, 0x41, 0x41, + 0x02, 0x04, 0x08, 0x10, 0x20, + 0x00, 0x41, 0x41, 0x41, 0x7F, + 0x04, 0x02, 0x01, 0x02, 0x04, + 0x40, 0x40, 0x40, 0x40, 0x40, + 0x00, 0x03, 0x07, 0x08, 0x00, + 0x20, 0x54, 0x54, 0x78, 0x40, + 0x7F, 0x28, 0x44, 0x44, 0x38, + 0x38, 0x44, 0x44, 0x44, 0x28, + 0x38, 0x44, 0x44, 0x28, 0x7F, + 0x38, 0x54, 0x54, 0x54, 0x18, + 0x00, 0x08, 0x7E, 0x09, 0x02, + 0x18, 0xA4, 0xA4, 0x9C, 0x78, + 0x7F, 0x08, 0x04, 0x04, 0x78, + 0x00, 0x44, 0x7D, 0x40, 0x00, + 0x20, 0x40, 0x40, 0x3D, 0x00, + 0x7F, 0x10, 0x28, 0x44, 0x00, + 0x00, 0x41, 0x7F, 0x40, 0x00, + 0x7C, 0x04, 0x78, 0x04, 0x78, + 0x7C, 0x08, 0x04, 0x04, 0x78, + 0x38, 0x44, 0x44, 0x44, 0x38, + 0xFC, 0x18, 0x24, 0x24, 0x18, + 0x18, 0x24, 0x24, 0x18, 0xFC, + 0x7C, 0x08, 0x04, 0x04, 0x08, + 0x48, 0x54, 0x54, 0x54, 0x24, + 0x04, 0x04, 0x3F, 0x44, 0x24, + 0x3C, 0x40, 0x40, 0x20, 0x7C, + 0x1C, 0x20, 0x40, 0x20, 0x1C, + 0x3C, 0x40, 0x30, 0x40, 0x3C, + 0x44, 0x28, 0x10, 0x28, 0x44, + 0x4C, 0x90, 0x90, 0x90, 0x7C, + 0x44, 0x64, 0x54, 0x4C, 0x44, + 0x00, 0x08, 0x36, 0x41, 0x00, + 0x00, 0x00, 0x77, 0x00, 0x00, + 0x00, 0x41, 0x36, 0x08, 0x00, + 0x02, 0x01, 0x02, 0x04, 0x02, + 0x3C, 0x26, 0x23, 0x26, 0x3C, + 0x1E, 0xA1, 0xA1, 0x61, 0x12, + 0x3A, 0x40, 0x40, 0x20, 0x7A, + 0x38, 0x54, 0x54, 0x55, 0x59, + 0x21, 0x55, 0x55, 0x79, 0x41, + 0x22, 0x54, 0x54, 0x78, 0x42, // a-umlaut + 0x21, 0x55, 0x54, 0x78, 0x40, + 0x20, 0x54, 0x55, 0x79, 0x40, + 0x0C, 0x1E, 0x52, 0x72, 0x12, + 0x39, 0x55, 0x55, 0x55, 0x59, + 0x39, 0x54, 0x54, 0x54, 0x59, + 0x39, 0x55, 0x54, 0x54, 0x58, + 0x00, 0x00, 0x45, 0x7C, 0x41, + 0x00, 0x02, 0x45, 0x7D, 0x42, + 0x00, 0x01, 0x45, 0x7C, 0x40, + 0x7D, 0x12, 0x11, 0x12, 0x7D, // A-umlaut + 0xF0, 0x28, 0x25, 0x28, 0xF0, + 0x7C, 0x54, 0x55, 0x45, 0x00, + 0x20, 0x54, 0x54, 0x7C, 0x54, + 0x7C, 0x0A, 0x09, 0x7F, 0x49, + 0x32, 0x49, 0x49, 0x49, 0x32, + 0x3A, 0x44, 0x44, 0x44, 0x3A, // o-umlaut + 0x32, 0x4A, 0x48, 0x48, 0x30, + 0x3A, 0x41, 0x41, 0x21, 0x7A, + 0x3A, 0x42, 0x40, 0x20, 0x78, + 0x00, 0x9D, 0xA0, 0xA0, 0x7D, + 0x3D, 0x42, 0x42, 0x42, 0x3D, // O-umlaut + 0x3D, 0x40, 0x40, 0x40, 0x3D, + 0x3C, 0x24, 0xFF, 0x24, 0x24, + 0x48, 0x7E, 0x49, 0x43, 0x66, + 0x2B, 0x2F, 0xFC, 0x2F, 0x2B, + 0xFF, 0x09, 0x29, 0xF6, 0x20, + 0xC0, 0x88, 0x7E, 0x09, 0x03, + 0x20, 0x54, 0x54, 0x79, 0x41, + 0x00, 0x00, 0x44, 0x7D, 0x41, + 0x30, 0x48, 0x48, 0x4A, 0x32, + 0x38, 0x40, 0x40, 0x22, 0x7A, + 0x00, 0x7A, 0x0A, 0x0A, 0x72, + 0x7D, 0x0D, 0x19, 0x31, 0x7D, + 0x26, 0x29, 0x29, 0x2F, 0x28, + 0x26, 0x29, 0x29, 0x29, 0x26, + 0x30, 0x48, 0x4D, 0x40, 0x20, + 0x38, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x38, + 0x2F, 0x10, 0xC8, 0xAC, 0xBA, + 0x2F, 0x10, 0x28, 0x34, 0xFA, + 0x00, 0x00, 0x7B, 0x00, 0x00, + 0x08, 0x14, 0x2A, 0x14, 0x22, + 0x22, 0x14, 0x2A, 0x14, 0x08, + 0x55, 0x00, 0x55, 0x00, 0x55, // #176 (25% block) missing in old + // code + 0xAA, 0x55, 0xAA, 0x55, 0xAA, // 50% block + 0xFF, 0x55, 0xFF, 0x55, 0xFF, // 75% block + 0x00, 0x00, 0x00, 0xFF, 0x00, + 0x10, 0x10, 0x10, 0xFF, 0x00, + 0x14, 0x14, 0x14, 0xFF, 0x00, + 0x10, 0x10, 0xFF, 0x00, 0xFF, + 0x10, 0x10, 0xF0, 0x10, 0xF0, + 0x14, 0x14, 0x14, 0xFC, 0x00, + 0x14, 0x14, 0xF7, 0x00, 0xFF, + 0x00, 0x00, 0xFF, 0x00, 0xFF, + 0x14, 0x14, 0xF4, 0x04, 0xFC, + 0x14, 0x14, 0x17, 0x10, 0x1F, + 0x10, 0x10, 0x1F, 0x10, 0x1F, + 0x14, 0x14, 0x14, 0x1F, 0x00, + 0x10, 0x10, 0x10, 0xF0, 0x00, + 0x00, 0x00, 0x00, 0x1F, 0x10, + 0x10, 0x10, 0x10, 0x1F, 0x10, + 0x10, 0x10, 0x10, 0xF0, 0x10, + 0x00, 0x00, 0x00, 0xFF, 0x10, + 0x10, 0x10, 0x10, 0x10, 0x10, + 0x10, 0x10, 0x10, 0xFF, 0x10, + 0x00, 0x00, 0x00, 0xFF, 0x14, + 0x00, 0x00, 0xFF, 0x00, 0xFF, + 0x00, 0x00, 0x1F, 0x10, 0x17, + 0x00, 0x00, 0xFC, 0x04, 0xF4, + 0x14, 0x14, 0x17, 0x10, 0x17, + 0x14, 0x14, 0xF4, 0x04, 0xF4, + 0x00, 0x00, 0xFF, 0x00, 0xF7, + 0x14, 0x14, 0x14, 0x14, 0x14, + 0x14, 0x14, 0xF7, 0x00, 0xF7, + 0x14, 0x14, 0x14, 0x17, 0x14, + 0x10, 0x10, 0x1F, 0x10, 0x1F, + 0x14, 0x14, 0x14, 0xF4, 0x14, + 0x10, 0x10, 0xF0, 0x10, 0xF0, + 0x00, 0x00, 0x1F, 0x10, 0x1F, + 0x00, 0x00, 0x00, 0x1F, 0x14, + 0x00, 0x00, 0x00, 0xFC, 0x14, + 0x00, 0x00, 0xF0, 0x10, 0xF0, + 0x10, 0x10, 0xFF, 0x10, 0xFF, + 0x14, 0x14, 0x14, 0xFF, 0x14, + 0x10, 0x10, 0x10, 0x1F, 0x00, + 0x00, 0x00, 0x00, 0xF0, 0x10, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0xFF, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFF, 0xFF, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x38, 0x44, 0x44, 0x38, 0x44, + 0xFC, 0x4A, 0x4A, 0x4A, 0x34, // sharp-s or beta + 0x7E, 0x02, 0x02, 0x06, 0x06, + 0x02, 0x7E, 0x02, 0x7E, 0x02, + 0x63, 0x55, 0x49, 0x41, 0x63, + 0x38, 0x44, 0x44, 0x3C, 0x04, + 0x40, 0x7E, 0x20, 0x1E, 0x20, + 0x06, 0x02, 0x7E, 0x02, 0x02, + 0x99, 0xA5, 0xE7, 0xA5, 0x99, + 0x1C, 0x2A, 0x49, 0x2A, 0x1C, + 0x4C, 0x72, 0x01, 0x72, 0x4C, + 0x30, 0x4A, 0x4D, 0x4D, 0x30, + 0x30, 0x48, 0x78, 0x48, 0x30, + 0xBC, 0x62, 0x5A, 0x46, 0x3D, + 0x3E, 0x49, 0x49, 0x49, 0x00, + 0x7E, 0x01, 0x01, 0x01, 0x7E, + 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, + 0x44, 0x44, 0x5F, 0x44, 0x44, + 0x40, 0x51, 0x4A, 0x44, 0x40, + 0x40, 0x44, 0x4A, 0x51, 0x40, + 0x00, 0x00, 0xFF, 0x01, 0x03, + 0xE0, 0x80, 0xFF, 0x00, 0x00, + 0x08, 0x08, 0x6B, 0x6B, 0x08, + 0x36, 0x12, 0x36, 0x24, 0x36, + 0x06, 0x0F, 0x09, 0x0F, 0x06, + 0x00, 0x00, 0x18, 0x18, 0x00, + 0x00, 0x00, 0x10, 0x10, 0x00, + 0x30, 0x40, 0xFF, 0x01, 0x01, + 0x00, 0x1F, 0x01, 0x01, 0x1E, + 0x00, 0x19, 0x1D, 0x17, 0x12, + 0x00, 0x3C, 0x3C, 0x3C, 0x3C, + 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP +}; + +// allow clean compilation with [-Wunused-const-variable=] and [-Wall] +static inline void avoid_unused_const_variable_compiler_warning(void) { + (void)font; +} + +#endif // FONT5X7_H diff --git a/yoRadio/src/audioI2S/Audio.cpp b/yoRadio/src/audioI2S/Audio.cpp index 7b8a534..f72fda1 100644 --- a/yoRadio/src/audioI2S/Audio.cpp +++ b/yoRadio/src/audioI2S/Audio.cpp @@ -724,11 +724,26 @@ cardLock(false); afn[i] = toLowerCase(afn[i]); } - if(endsWith(afn, ".mp3")) m_codec = CODEC_MP3; // m_codec is by default CODEC_NONE - if(endsWith(afn, ".m4a")) m_codec = CODEC_M4A; - if(endsWith(afn, ".aac")) m_codec = CODEC_AAC; - if(endsWith(afn, ".wav")) m_codec = CODEC_WAV; - if(endsWith(afn, ".flac")) m_codec = CODEC_FLAC; + if(endsWith(afn, ".mp3")) { + m_codec = CODEC_MP3; // m_codec is by default CODEC_NONE + if(audio_info) audio_info("format is mp3"); + } + if(endsWith(afn, ".m4a")) { + m_codec = CODEC_M4A; + if(audio_info) audio_info("format is aac"); + } + if(endsWith(afn, ".aac")) { + m_codec = CODEC_AAC; + if(audio_info) audio_info("format is aac"); + } + if(endsWith(afn, ".wav")) { + m_codec = CODEC_WAV; + if(audio_info) audio_info("format is wav"); + } + if(endsWith(afn, ".flac")) { + m_codec = CODEC_FLAC; + if(audio_info) audio_info("format is flac"); + } if(m_codec == CODEC_NONE) { AUDIO_INFO("The %s format is not supported", afn + dotPos); diff --git a/yoRadio/src/audioVS1053/audioVS1053Ex.cpp b/yoRadio/src/audioVS1053/audioVS1053Ex.cpp index 8df8819..760cac2 100644 --- a/yoRadio/src/audioVS1053/audioVS1053Ex.cpp +++ b/yoRadio/src/audioVS1053/audioVS1053Ex.cpp @@ -1966,17 +1966,20 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) { if(endsWith(afn, ".mp3")){ // MP3 section m_codec = CODEC_MP3; m_f_running = true; + if(audio_info) audio_info("format is mp3"); return true; } // end MP3 section if(endsWith(afn, ".m4a")){ // M4A section, iTunes m_codec = CODEC_M4A; m_f_running = true; + if(audio_info) audio_info("format is aac"); return true; } // end M4A section if(endsWith(afn, ".aac")){ // AAC section, without FileHeader m_codec = CODEC_AAC; + if(audio_info) audio_info("format is aac"); m_f_running = true; return true; } // end AAC section @@ -1984,18 +1987,21 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) { if(endsWith(afn, ".wav")){ // WAVE section m_codec = CODEC_WAV; m_f_running = true; + if(audio_info) audio_info("format is wav"); return true; } // end WAVE section if(endsWith(afn, ".flac")) { // FLAC section m_codec = CODEC_FLAC; m_f_running = true; + if(audio_info) audio_info("format is flac"); return true; } // end FLAC section if(endsWith(afn, ".ogg")) { // FLAC section m_codec = CODEC_OGG; m_f_running = true; + if(audio_info) audio_info("format is ogg"); return true; } // end FLAC section diff --git a/yoRadio/src/core/audiohandlers.h b/yoRadio/src/core/audiohandlers.h index 0154dae..b359859 100644 --- a/yoRadio/src/core/audiohandlers.h +++ b/yoRadio/src/core/audiohandlers.h @@ -39,6 +39,7 @@ void audio_bitrate(const char *info) } bool printable(const char *info) { + if(L10N_LANGUAGE!=RU) return true; bool p = true; for (int c = 0; c < strlen(info); c++) { diff --git a/yoRadio/src/core/options.h b/yoRadio/src/core/options.h index 9b582c8..f43500a 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.161" +#define YOVERSION "0.9.174" /******************************************************* DO NOT EDIT THIS FILE. diff --git a/yoRadio/src/core/player.cpp b/yoRadio/src/core/player.cpp index 203ea20..5660fd3 100644 --- a/yoRadio/src/core/player.cpp +++ b/yoRadio/src/core/player.cpp @@ -181,6 +181,7 @@ void Player::_play(uint16_t stationId) { netserver.requestOnChange(STATION, 0); netserver.loop(); netserver.loop(); + config.setSmartStart(0); if (config.store.play_mode==PM_WEB?connecttohost(config.station.url):connecttoFS(SD,config.station.url,config.sdResumePos==0?_resumeFilePos:config.sdResumePos-player.sd_min)) { _status = PLAYING; if(config.store.play_mode==PM_SDCARD) config.sdResumePos = 0; diff --git a/yoRadio/src/displays/tools/utf8RusGFX.h b/yoRadio/src/displays/tools/utf8RusGFX.h index f3f779a..49fc035 100644 --- a/yoRadio/src/displays/tools/utf8RusGFX.h +++ b/yoRadio/src/displays/tools/utf8RusGFX.h @@ -40,6 +40,7 @@ char* DspCore::utf8Rus(const char* str, bool uppercase) { *iter = toupper(*iter); } } + if(L10N_LANGUAGE==EN) return strn; while (strn[index]) { if (strn[index] >= 0xBF)