This commit is contained in:
e2002
2022-06-29 10:33:51 +03:00
parent fb3e32c554
commit 1ee001fa4d
4 changed files with 12 additions and 8 deletions

View File

@@ -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

View File

@@ -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 */
}

View File

@@ -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