Skip to content

Commit 1ee001f

Browse files
committed
v0.6.348
1 parent fb3e32c commit 1ee001f

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,10 @@ Work is in progress...
294294

295295
---
296296
## Version history
297+
#### v0.6.348
298+
- fixed display bugs in the rssibitrate plugin
299+
- fixed some compilation warnings
300+
297301
#### v0.6.345
298302
- fix compilation error in rssibitrate plugin with ILI9225 display
299303

exsamples/plugins/rssibitrate.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ bool dsp_before_rssi(DspCore *dsp){
1212
int16_t x1, y1;
1313
char buf[20]; /* buffer for the bitrate string */
1414
uint16_t w, h; /* width & height of the bitrate string */
15-
int16_t vTop = dsp->height() - TFT_FRAMEWDT * 2 - TFT_LINEHGHT - 2; /* vTop - Y cordnate of the bitrate string */
16-
17-
sprintf(buf, "%d kBits", config.station.bitrate);
18-
dsp->getTextBounds(buf, 0, 0, &x1, &y1, &w, &h);
15+
int16_t vTop = dsp->height() - TFT_FRAMEWDT * 2 - TFT_LINEHGHT - 2; /* vTop - Y cordnate of the bitrate string */;
16+
sprintf(buf, "RSSI:000dBm", config.station.bitrate);
1917
dsp->setTextSize(1);
20-
dsp->fillRect(dsp->width() - w - TFT_FRAMEWDT-40 /* left */, vTop /* top */, w+40 /* width */, TFT_LINEHGHT-4 /* height */, TFT_BG /* background color */);
18+
dsp->getTextBounds(buf, 0, 0, &x1, &y1, &w, &h);
19+
dsp->fillRect(dsp->width() - w - TFT_FRAMEWDT /* left */, vTop /* top */, w /* width */, TFT_LINEHGHT-2 /* height */, TFT_BG /* background color */);
20+
sprintf(buf, "%dkBits", config.station.bitrate);
21+
dsp->getTextBounds(buf, 0, 0, &x1, &y1, &w, &h);
2122
if(cnt<2){
2223
cnt++;
2324
return true; /* print RSSI and retrn */
@@ -27,7 +28,6 @@ bool dsp_before_rssi(DspCore *dsp){
2728
dsp->setTextColor(SILVER,TFT_BG);
2829
dsp->setCursor(dsp->width() - w - TFT_FRAMEWDT, vTop);
2930
dsp->print(buf); /* print bitrate */
30-
3131
return false; /* disable to print RSSI */
3232
}
3333

yoRadio/options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef options_h
22
#define options_h
33

4-
#define VERSION "0.6.345"
4+
#define VERSION "0.6.348"
55

66
/*******************************************************
77
DO NOT EDIT THIS FILE.
@@ -133,7 +133,7 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
133133
#ifndef BTN_RIGHT
134134
#define BTN_RIGHT 255
135135
#endif
136-
#ifndef BTN_UP5
136+
#ifndef BTN_UP
137137
#define BTN_UP 255
138138
#endif
139139
#ifndef BTN_DOWN
-1.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)