From 1ee001fa4d77d26a18e4cf28b446b987576aa7f5 Mon Sep 17 00:00:00 2001 From: e2002 Date: Wed, 29 Jun 2022 10:33:51 +0300 Subject: [PATCH] v0.6.348 --- README.md | 4 ++++ exsamples/plugins/rssibitrate.ino | 12 ++++++------ yoRadio/options.h | 4 ++-- yoRadio/src/displays/displayILI9225.h.zip | Bin 1431 -> 0 bytes 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 yoRadio/src/displays/displayILI9225.h.zip diff --git a/README.md b/README.md index e20bfa2..0de321e 100644 --- a/README.md +++ b/README.md @@ -294,6 +294,10 @@ Work is in progress... --- ## Version history +#### v0.6.348 +- fixed display bugs in the rssibitrate plugin +- fixed some compilation warnings + #### v0.6.345 - fix compilation error in rssibitrate plugin with ILI9225 display diff --git a/exsamples/plugins/rssibitrate.ino b/exsamples/plugins/rssibitrate.ino index ce2e52c..56528f2 100644 --- a/exsamples/plugins/rssibitrate.ino +++ b/exsamples/plugins/rssibitrate.ino @@ -12,12 +12,13 @@ bool dsp_before_rssi(DspCore *dsp){ int16_t x1, y1; char buf[20]; /* buffer for the bitrate string */ uint16_t w, h; /* width & height of the bitrate string */ - int16_t vTop = dsp->height() - TFT_FRAMEWDT * 2 - TFT_LINEHGHT - 2; /* vTop - Y cordnate of the bitrate string */ - - sprintf(buf, "%d kBits", config.station.bitrate); - dsp->getTextBounds(buf, 0, 0, &x1, &y1, &w, &h); + int16_t vTop = dsp->height() - TFT_FRAMEWDT * 2 - TFT_LINEHGHT - 2; /* vTop - Y cordnate of the bitrate string */; + sprintf(buf, "RSSI:000dBm", config.station.bitrate); dsp->setTextSize(1); - dsp->fillRect(dsp->width() - w - TFT_FRAMEWDT-40 /* left */, vTop /* top */, w+40 /* width */, TFT_LINEHGHT-4 /* height */, TFT_BG /* background color */); + dsp->getTextBounds(buf, 0, 0, &x1, &y1, &w, &h); + dsp->fillRect(dsp->width() - w - TFT_FRAMEWDT /* left */, vTop /* top */, w /* width */, TFT_LINEHGHT-2 /* height */, TFT_BG /* background color */); + sprintf(buf, "%dkBits", config.station.bitrate); + dsp->getTextBounds(buf, 0, 0, &x1, &y1, &w, &h); if(cnt<2){ cnt++; return true; /* print RSSI and retrn */ @@ -27,7 +28,6 @@ bool dsp_before_rssi(DspCore *dsp){ dsp->setTextColor(SILVER,TFT_BG); dsp->setCursor(dsp->width() - w - TFT_FRAMEWDT, vTop); dsp->print(buf); /* print bitrate */ - return false; /* disable to print RSSI */ } diff --git a/yoRadio/options.h b/yoRadio/options.h index 86c8aa9..8a8cf91 100644 --- a/yoRadio/options.h +++ b/yoRadio/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define VERSION "0.6.345" +#define VERSION "0.6.348" /******************************************************* DO NOT EDIT THIS FILE. @@ -133,7 +133,7 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti #ifndef BTN_RIGHT #define BTN_RIGHT 255 #endif -#ifndef BTN_UP5 +#ifndef BTN_UP #define BTN_UP 255 #endif #ifndef BTN_DOWN diff --git a/yoRadio/src/displays/displayILI9225.h.zip b/yoRadio/src/displays/displayILI9225.h.zip deleted file mode 100644 index 1624449c0bdbb8546729238d628557bd204f18d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1431 zcmV;I1!($EO9KQH0{{RB0GFEFR3O3l6!8QA0D%qw01yBG0Ay)%aBN|DNlZyOGBPzT zXr)(MZ<{a_e$TJ)Hfc(-XieBH*|Z0em=ujbM`*ilnj!)wK_eL1W=(hb?=v`nO|$i3 zmMS^t`_BE?xKH9J4N(Nbm}ZH8XIkb&(_XE2ohMuxr|3S=c@n2Vl7|R9)=8MhDSp0t zED1fsTWi|-sGwpIP8mI$uhw&OVQS-yz1b9m+F7A%nKnFMoO^(;(NKX5S6{;Gc?rF& zktOu>^~(GVfmm9nO3E`m3zpERV#~6U%@LG_adbjSJE5fAQv#0!DeSIhu47qqXnA@M z{QA`fJaY+qwMmH#UMNz*1TTh_lN!CSmZk@nD{x$sHex|rRPN=l4V^<%K$@o3^iuc} zX{klnJ2q+iucS0~Nj7dsqGpc0K`FvP5bArK%@$8iYaG-mT|jX$LUK`6bAL$(`$ws?o)?T+;%bw68`NLLny#J{!h z7AwLaK|bLLs6v!7L_Bn0-2kVQl_~WB;{wV1owSd((vQtnHb#oz{=?P)Y%oqhl*Ac9 z0ec_$2}KekL<#f3doYxpQpDDU&sF>bm1P`rCOyTN;RKWJ!-)uuSxzXYSA@d=)EUUs zjBxS&oDb|CX;ySzWyO0$8Tkv7BYD68+n2mJjqtHPA!hWrC8%gMFG*P{$xwAMpCdmr zFqxxGzP&dhS2)S{XzG)0Y3w#;J3HTR5NQ+bqQ1;$F-|$5DPfxL1@)Lv&Z4oKQzc2B z#xdAD%Mb~CirVJ+1mh$zh`&d*?Q(1w&IUk{hy(D~#%&QRjZHT=PeXcQ4wcYQ<`bXc zBEUO_N(SX)B%eEW-9CxzydA?+T9WP^Hj&qVrW6%r@nV*sc3EW>p)~#%9%pT|-GmE1 zElEsS6K;?bf>LHOv>ymPS>z#g#uJP)F-H+50TPF|b*K!Svg(ZXIWJ|$(b(e@uQH(n zPAQ4t7sjVT3G^dA@;3i8wWtr?0}o#V?}vvWUoE`{FN4~IIKgVMl?fF=OxyDb`jl}^ z9?U5x&9;9S4Lab&Y8ZDTDWm?a{6m@1C{7X=1+4pTkGIWsciOf3fh)=@+%zVN;n)>OsoW5LLfmSqlR2K2MuJ5C9Q=E zq1|Y`fep0O7tr?fT1zr`11-zBt_>QJ*7dpR!NwO~k}v(H3FFNaHqcymKdc4LA#L*V zRSj9i3sqnon!O&4C1@$7JeGskKVIq$^lCnu)zIulw}F(h(F&u$1@uCS&~bHp0qeYG zy7ZPd?GI9UCvO_9sq0+ZO@x|M`76`0pjSbY(PUCX;;mXi`m2%DFUR7&Y@lIN4O_pu z0rG4ZQY&4@vFpmq18{NaURY3qq?9f53d;Q&s{fNs7bPTyQb7!Xh+$9=%UL+W9(+BX zg0nNAX)gyr8%_pbqIIhG`yWtC0Rle*6axSN2mqIw+*BaJ_!RL3004mw000mGBme*a z00000Ab_NS00000WNCA7Y+-pxOi4L1GBqw}3IHGg000000RR{PfGpkw3yatRfQCQ^ l3yatRfGpkw3yatRP)h{{000000RRC2VgLXD9|Zsa000;UeRTi;