Skip to content

Commit 144f80f

Browse files
e2002e2002
committed
v0.8.112
1 parent 58f1665 commit 144f80f

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

‎README.md‎

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

302302
---
303303
## Version history
304+
#### v0.8.112
305+
- fixed compilation error with BOOMBOX_STYLE parameter
306+
- fixes in default configuration for GC9A01A display
307+
304308
#### v0.8.100
305309
- added support for GC9A01A display https://aliexpress.com/item/1005004069703494.html?sku_id=12000029869654615
306310

‎yoRadio/src/core/options.h‎

Lines changed: 1 addition & 1 deletion
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.8.100"
4+
#define VERSION "0.8.112"
55

66
/*******************************************************
77
DO NOT EDIT THIS FILE.

‎yoRadio/src/displays/conf/displayGC9A01Aconf.h‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
More info on https://github.com/e2002/yoradio/wiki/Widgets#widgets-description
66
*************************************************************************************/
77

8-
#ifndef displayST7789conf_h
9-
#define displayST7789conf_h
8+
#ifndef displayGC9A01Aconf_h
9+
#define displayGC9A01Aconf_h
1010

1111
#define DSP_WIDTH 240
1212
#define TFT_FRAMEWDT 8
@@ -17,14 +17,16 @@
1717

1818
#define bootLogoTop 68
1919
#define HIDE_TITLE2
20+
#define BOOMBOX_STYLE
21+
2022
/* SROLLS */ /* {{ left, top, fontsize, align }, buffsize, uppercase, width, scrolldelay, scrolldelta, scrolltime } */
2123
const ScrollConfig metaConf PROGMEM = {{ TFT_FRAMEWDT+12, TFT_FRAMEWDT+28+20, 3, WA_CENTER }, 140, true, MAX_WIDTH-24, 5000, 5, 30 };
2224
const ScrollConfig title1Conf PROGMEM = {{ TFT_FRAMEWDT, /*70*/90, 2, WA_CENTER }, 140, true, MAX_WIDTH, 5000, 4, 30 };
2325
const ScrollConfig title2Conf PROGMEM = {{ TFT_FRAMEWDT, 90, 2, WA_CENTER }, 140, true, MAX_WIDTH, 5000, 4, 30 };
2426
const ScrollConfig playlistConf PROGMEM = {{ TFT_FRAMEWDT, 112, 2, WA_LEFT }, 140, true, MAX_WIDTH, 0, 2, 30 };
25-
const ScrollConfig apTitleConf PROGMEM = {{ TFT_FRAMEWDT+12, TFT_FRAMEWDT+28+20, 3, WA_CENTER }, 140, false, MAX_WIDTH, 0, 4, 20 };
26-
const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 240-TFT_FRAMEWDT-16, 2, WA_LEFT }, 140, false, MAX_WIDTH, 0, 4, 30 };
27-
const ScrollConfig weatherConf PROGMEM = {{ TFT_FRAMEWDT+30, 36, 1, WA_LEFT }, 140, true, MAX_WIDTH-60, 0, 3, 30 };
27+
const ScrollConfig apTitleConf PROGMEM = {{ TFT_FRAMEWDT+12, TFT_FRAMEWDT+28+20, 3, WA_CENTER }, 140, false, MAX_WIDTH-24, 0, 4, 20 };
28+
const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT+32, 240-TFT_FRAMEWDT-34, 2, WA_LEFT }, 140, false, MAX_WIDTH-64, 0, 4, 30 };
29+
const ScrollConfig weatherConf PROGMEM = {{ TFT_FRAMEWDT+30, 37, 1, WA_LEFT }, 140, true, MAX_WIDTH-60, 0, 3, 30 };
2830
/* BACKGROUNDS */ /* {{ left, top, fontsize, align }, width, height, outlined } */
2931
const FillConfig metaBGConf PROGMEM = {{ 0, 32+20, 0, WA_LEFT }, DSP_WIDTH, 30, false };
3032
const FillConfig volbarConf PROGMEM = {{ TFT_FRAMEWDT+56, 240-TFT_FRAMEWDT-6, 0, WA_LEFT }, MAX_WIDTH-112, 6+TFT_FRAMEWDT+1, true };
@@ -33,23 +35,23 @@ const FillConfig heapbarConf PROGMEM = {{ 0, 83, 0, WA_LEFT }, DSP_WIDTH, 1
3335

3436
/* WIDGETS */ /* { left, top, fontsize, align } */
3537
const WidgetConfig bootstrConf PROGMEM = { 0, 182, 1, WA_CENTER };
36-
const WidgetConfig bitrateConf PROGMEM = { 134, 20, 1, WA_RIGHT };
37-
const WidgetConfig voltxtConf PROGMEM = { 80, 6, 1, WA_CENTER };
38+
const WidgetConfig bitrateConf PROGMEM = { 134, 23, 1, WA_RIGHT };
39+
const WidgetConfig voltxtConf PROGMEM = { 80, 12, 1, WA_CENTER };
3840
const WidgetConfig iptxtConf PROGMEM = { TFT_FRAMEWDT, 214, 1, WA_CENTER };
39-
const WidgetConfig rssiConf PROGMEM = { 134, 20, 1, WA_LEFT };
41+
const WidgetConfig rssiConf PROGMEM = { 134, 23, 1, WA_LEFT };
4042
const WidgetConfig numConf PROGMEM = { 0, 120+30+20, 52, WA_CENTER };
41-
const WidgetConfig apNameConf PROGMEM = { TFT_FRAMEWDT, 86, 2, WA_CENTER };
42-
const WidgetConfig apName2Conf PROGMEM = { TFT_FRAMEWDT, 110, 2, WA_CENTER };
43-
const WidgetConfig apPassConf PROGMEM = { TFT_FRAMEWDT, 150, 2, WA_CENTER };
44-
const WidgetConfig apPass2Conf PROGMEM = { TFT_FRAMEWDT, 174, 2, WA_CENTER };
43+
const WidgetConfig apNameConf PROGMEM = { TFT_FRAMEWDT, 96, 2, WA_CENTER };
44+
const WidgetConfig apName2Conf PROGMEM = { TFT_FRAMEWDT, 118, 2, WA_CENTER };
45+
const WidgetConfig apPassConf PROGMEM = { TFT_FRAMEWDT, 146, 2, WA_CENTER };
46+
const WidgetConfig apPass2Conf PROGMEM = { TFT_FRAMEWDT, 168, 2, WA_CENTER };
4547
const WidgetConfig clockConf PROGMEM = { 0, 176, 52, WA_CENTER }; /* 52 is a fixed font size. do not change */
46-
const WidgetConfig vuConf PROGMEM = { TFT_FRAMEWDT+10, 188, 1, WA_CENTER };
48+
const WidgetConfig vuConf PROGMEM = { TFT_FRAMEWDT+20, 188, 1, WA_CENTER };
4749

4850
const WidgetConfig bootWdtConf PROGMEM = { 0, 162, 1, WA_CENTER };
4951
const ProgressConfig bootPrgConf PROGMEM = { 90, 14, 4 };
5052

5153
/* BANDS */ /* { onebandwidth, onebandheight, bandsHspace, bandsVspace, numofbands, fadespeed } */
52-
const VUBandsConfig bandsConf PROGMEM = { 90, 20, 10, 2, 10, 5 };
54+
const VUBandsConfig bandsConf PROGMEM = { 90, 20, 6, 2, 10, 5 };
5355

5456
/* STRINGS */
5557
const char numtxtFmt[] PROGMEM = "%d";

‎yoRadio/src/displays/widgets/widgets.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ void VuWidget::_draw(){
332332
#else
333333
_canvas->fillRect(0, 0, _bands.width-(_bands.width-measL), _bands.width, _bgcolor);
334334
_canvas->fillRect(_bands.width * 2 + _bands.space - measR, 0, measR, _bands.width, _bgcolor);
335-
dsp->drawRGBBitmap(_config.left, _config.top, _canvas->getBuffer(), _bands.width * 2 + _bands.space, _bands.height);
335+
dsp.drawRGBBitmap(_config.left, _config.top, _canvas->getBuffer(), _bands.width * 2 + _bands.space, _bands.height);
336336
#endif
337337
}else{
338338
_canvas->fillRect(0, 0, _bands.width, measL, _bgcolor);

‎yoRadio/yoRadio.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void audio_info(const char *info) {
100100
nextion.audioinfo(info);
101101
#endif
102102
if (strstr(info, "failed!") != NULL || strstr(info, " 404") != NULL || strstr(info, " 403") != NULL || strstr(info, "address is empty") != NULL) player.stop(info);
103-
if (strstr(info, "not supported") != NULL || strstr(info, "Account already in use") != NULL) player.stop(info);
103+
if (strstr(info, "not supported") != NULL || strstr(info, "Account already in use") != NULL || strstr(info, "HTTP/1.0 401") != NULL) player.stop(info);
104104
}
105105

106106
void audio_bitrate(const char *info)
@@ -134,7 +134,7 @@ void audio_showstation(const char *info) {
134134

135135
void audio_showstreamtitle(const char *info) {
136136
DBGH();
137-
if (strstr(info, "Account already in use") != NULL){
137+
if (strstr(info, "Account already in use") != NULL || strstr(info, "HTTP/1.0 401") != NULL){
138138
player.stop(info);
139139
return;
140140
}

0 commit comments

Comments
 (0)