Skip to content

Commit 442d970

Browse files
e2002e2002
committed
v0.7.330
1 parent 19fede3 commit 442d970

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1361
-357
lines changed

‎README.md‎

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- [Software dependencies](#dependencies)
99
- [Hardware setup](#hardware-setup)
1010
- [Quick start](#quick-start)
11+
- [Detailed start](https://github.com/e2002/yoradio/wiki/How-to-flash)
1112
- [Update](#update)
1213
- [Update over web-interface](#update-over-web-interface)
1314
- [Controls](Controls.md)
@@ -63,17 +64,19 @@ https://www.aliexpress.com/item/33009687492.html
6364

6465
---
6566
## Connection tables
66-
| SPI Display | ESP-32 | options.h |
67+
##### SPI Displays
68+
| Display | ESP-32 | myoptions.h |
6769
| ------ | ------ | ------ |
6870
| GND | GND | - |
6971
| VCC | +5v | - |
7072
| SCL | 18 | - |
7173
| SDA | 23 | - |
7274
| CSL | 5* | TFT_CS |
73-
| RSTL | 15* | TFT_RST |
75+
| RST | 15* | TFT_RST |
7476
| DCL | 4* | TFT_DC |
7577

76-
| NOKIA5110 | ESP-32 | options.h |
78+
##### Nokia 5110
79+
| NOKIA5110 | ESP-32 | myoptions.h |
7780
| ------ | ------ | ------ |
7881
| RST | 15* | TFT_RST |
7982
| CE | 5* | TFT_CS |
@@ -83,14 +86,16 @@ https://www.aliexpress.com/item/33009687492.html
8386
| VCC | +3v3 | - |
8487
| GND | GND | - |
8588

86-
| I2C Display | ESP-32 | options.h |
89+
##### I2C Displays
90+
| Display | ESP-32 | myoptions.h |
8791
| ------ | ------ | ------ |
8892
| GND | GND | - |
8993
| VCC | +5v | - |
90-
| SDA | 13* | I2C_SDA |
91-
| SCL | 14* | I2C_SCL |
94+
| SDA | 21* | I2C_SDA |
95+
| SCL | 22* | I2C_SCL |
9296

93-
| LCD 1602 | ESP-32 | options.h |
97+
##### LCD Displays (1602, 2004)
98+
| Display | ESP-32 | myoptions.h |
9499
| ------ | ------ | ------ |
95100
| GND | GND | - |
96101
| VCC | +5v | - |
@@ -101,7 +106,8 @@ https://www.aliexpress.com/item/33009687492.html
101106
| D6 | any* | LCD_D6 |
102107
| D7 | any* | LCD_D7 |
103108

104-
| Touchscreen | ESP-32 | options.h |
109+
##### Touchscreen
110+
| Touchscreen | ESP-32 | myoptions.h |
105111
| ------ | ------ | ------ |
106112
| GND | GND | - |
107113
| VCC | +3.3v | - |
@@ -111,15 +117,17 @@ https://www.aliexpress.com/item/33009687492.html
111117
| IRQ | N/C | - |
112118
| CS | any* | TS_CS |
113119

114-
| I2S DAC | ESP-32 | options.h |
120+
##### I2S DAC
121+
| I2S DAC | ESP-32 | myoptions.h |
115122
| ------ | ------ | ------ |
116123
| GND | GND | - |
117124
| VIN | +5v | - |
118125
| DOUT(DIN) | 27* | I2S_DOUT |
119126
| BCLK | 26* | I2S_BCLK |
120127
| LRC(WSEL) | 25* | I2S_LRC |
121128

122-
| VS1053 | ESP-32 | options.h |
129+
##### VS1053
130+
| VS1053 | ESP-32 | myoptions.h |
123131
| ------ | ------ | ------ |
124132
| XDCS | 25* | VS1053_DCS |
125133
| XCS | 27* | VS1053_CS |
@@ -132,10 +140,19 @@ https://www.aliexpress.com/item/33009687492.html
132140
| DGND | GND | - |
133141

134142
_\#\# Important! You must choose between I2S DAC and VS1053 by disabling the second module in the settings (see below)_
143+
##### Nextion Displays
144+
| Display | ESP-32 | myoptions.h |
145+
| ------ | ------ | ------ |
146+
| GND | GND | - |
147+
| VCC | +5v | - |
148+
| TX | 14* | NEXTION_RX |
149+
| RX | 15* | NEXTION_TX |
135150

136-
| Buttons, Encoder, LED, IR, Joystick | ESP-32 | options.h |
151+
##### Controls
152+
| Buttons, Encoder, LED, IR, Joystick | ESP-32 | myoptions.h |
137153
| ------ | ------ | ------ |
138154
| GND | GND | - |
155+
| 5v | 3v3 | - |
139156
| PIN | any* | ENC_BTNx, BTN_xxx, LED_BUILTIN, IR_PIN |
140157

141158
_\* Any free pin, configured in myoptions.h_ \
@@ -150,7 +167,9 @@ _\** GPIO 16 and 17 are used by PSRAM on the WROVER modules._
150167
\* _if you need MQTT support_
151168

152169
#### Tool:
153-
[ESP32 Filesystem Uploader](https://randomnerdtutorials.com/install-esp32-filesystem-uploader-arduino-ide/)
170+
[ESP32 Filesystem Uploader](https://randomnerdtutorials.com/install-esp32-filesystem-uploader-arduino-ide/) \
171+
172+
**See [wiki](https://github.com/e2002/yoradio/wiki/How-to-flash#preparing) for details**
154173

155174
---
156175
## Hardware setup
@@ -206,6 +225,8 @@ _\*this step can be skipped if you add WiFiSSID WiFiPassword pairs to the [yoRad
206225
**Localization:**
207226
Если Adafruit_GFX ещё не русифицирована, русифицировать её, заменив файл Arduino/libraries/Adafruit_GFX_Library/glcdfont.c файлом [yoRadio/fonts/glcdfont.c](yoRadio/fonts/glcdfont.c)
208227

228+
**See [wiki](https://github.com/e2002/yoradio/wiki/How-to-flash#build--flash) for details**
229+
209230
---
210231
## Update
211232
1. Backup your settings: \
@@ -291,11 +312,22 @@ download _http://\<yoradioip\>/data/playlist.csv_ and _http://\<yoradioip\>/data
291312

292313
---
293314
## Plugins
294-
At the moment, you can display additional information on the display by writing a few additional functions. There is no documentation yet, you will have to deal with the example, which is in file [exsamples/plugins/displayhandlers.ino](exsamples/plugins/displayhandlers.ino).\
315+
At the moment, you can display additional information on the display by writing a few additional functions. There is no documentation yet, you will have to deal with the examples, which is in directory [exsamples/plugins/](https://github.com/e2002/yoradio/tree/main/exsamples/plugins).\
295316
Work is in progress...
296317

297318
---
298319
## Version history
320+
#### v0.7.330
321+
**!!! a [full update](#update-over-web-interface) with Sketch data upload is required. After updating please press CTRL+F5 in browser !!!** \
322+
**Please backup playlist.csv and wifi.csv before updating.**
323+
- added the ability to configure parameters through the [web interface](images/settings.png)
324+
- new parameter BRIGHTNESS_PIN - pin for adjusting the brightness of the display. Details in [exsamples/myoptions.h](exsamples/myoptions.h#L105)
325+
- the weather plugin is integrated into the code, the settings are made through the web interface
326+
327+
_**PS:** Due to the change in the storage location of settings in the ESP memory, settings such as:_ \
328+
**smartstart, audioinfo, time zone, IR remote, last volume level, last played station, equalizer** \
329+
_will have to be configured again through the web interface. Please understand and forgive._
330+
299331
#### v0.7.017
300332
- fix initialization of some vs1053b green boards
301333
- fix VU initialization on vs1053b boards
@@ -317,7 +349,7 @@ Work is in progress...
317349

318350
#### v0.6.494
319351
- adding VU meter for displays ST7735 160x128, ST7735 128x128, ILI9341 320x240, ST7789 320x240 \
320-
option ENABLE_VU_METER (see [myoptions.h](exsamples/myoptions.h#L113) for exsample) \
352+
option ENABLE_VU_METER (see [myoptions.h](exsamples/myoptions.h) for exsample) \
321353
**!!! Important !!!** \
322354
if you enable this feathure on the esp32 wroom, due to lack of memory, you must modify the file Arduino/libraries/AsyncTCP/src/AsyncTCP.cpp \
323355
**replace the line 221** \
@@ -344,8 +376,8 @@ Work is in progress...
344376

345377
#### v0.6.355
346378
- added support for ST7789 1.3' 240x240 SPI displays \
347-
_!!! Important !!! This display requires further development when used in conjunction with the VS1053 module. \
348-
See this link for details https://www.instructables.com/Adding-CS-Pin-to-13-LCD/_
379+
_!!! Important !!! This display requires further development when used in conjunction with the VS1053 module._ \
380+
See this link for details https://www.instructables.com/Adding-CS-Pin-to-13-LCD/
349381

350382
#### v0.6.348
351383
- fixed display bugs in the rssibitrate plugin
@@ -368,7 +400,7 @@ Work is in progress...
368400
- added support for ILI9225 220x176 SPI displays
369401
- added support for I2S internal DAC, option I2S_INTERNAL (see [myoptions.h](exsamples/myoptions.h#L111) for exsample) \
370402
_(this option worked only with esp32 core version==2.0.0)_
371-
- new option SOFT_AP_REBOOT_DELAY (see [myoptions.h](exsamples/myoptions.h#L112) for exsample)
403+
- new option SOFT_AP_REBOOT_DELAY (see [myoptions.h](exsamples/myoptions.h) for exsample)
372404
- fixed MQTT connection when WiFi reconnected
373405
- fixed date display for ILI9341 displays
374406
- fixed garbage on volume control with displays ILI9341

‎exsamples/myoptions.h‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
1313
/* DSP_MODEL. See description/available values in the options.h file */
1414
/* This option is required. Use DSP_DUMMY if no display is connected */
1515
#define DSP_MODEL DSP_DUMMY
16+
/*
17+
* !!! Important !!!
18+
* if you use colored TFT displays with the esp32 wroom, due to lack of memory, you must modify the file Arduino/libraries/AsyncTCP/src/AsyncTCP.cpp
19+
* replace the line 221
20+
* xTaskCreateUniversal(_async_service_task, "async_tcp", 8192 * 2, NULL, 3, &_async_service_task_handle, CONFIG_ASYNC_TCP_RUNNING_CORE);
21+
* with
22+
* xTaskCreateUniversal(_async_service_task, "async_tcp", 8192 / 2, NULL, 3, &_async_service_task_handle, CONFIG_ASYNC_TCP_RUNNING_CORE);
23+
*/
1624
/******************************************/
1725

1826
/* SPI PINS. SCL(SCK, CLK) must be connected to pin 18
@@ -25,9 +33,6 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
2533
/* NEXTION */
2634
//#define NEXTION_RX 255 /* Nextion RX pin */
2735
//#define NEXTION_TX 255 /* Nextion TX pin */
28-
//#define NEXTION_WEATHER_LAT "55.7512" /* Nextion latitude for display Weather */
29-
//#define NEXTION_WEATHER_LON "37.6184" /* Nextion longitude for display Weather */
30-
//#define NEXTION_WEATHER_KEY "" /* Openweathermap API key https://openweathermap.org/appid */
3136

3237
/* I2C PINS */
3338
//#define I2C_SDA 21 /* I2C SDA pin. It is best to connect to pin 21. */
@@ -41,11 +46,12 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
4146
/******************************************/
4247

4348
/* VS1053 PINS. VS1053 SCK must be connected to pin 18
49+
VS1053 MISO must be connected to pin 19
4450
VS1053 MOSI must be connected to pin 23 */
45-
//#define VS1053_CS 255 /* Should be set to 255 if the board is not used */
46-
//#define VS1053_DCS 25
47-
//#define VS1053_DREQ 26
48-
//#define VS1053_RST -1 /* Set to -1 if connected to Esp EN pin */
51+
//#define VS1053_CS 255 /* XCS pin. Should be set to 255 if the board is not used */
52+
//#define VS1053_DCS 25 /* XDCS pin. */
53+
//#define VS1053_DREQ 26 /* DREQ pin. */
54+
//#define VS1053_RST -1 /* XRESET pin. Set to -1 if connected to Esp EN pin */
4955
/******************************************/
5056

5157
/* ENCODER */
@@ -91,41 +97,25 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
9197
DO must be connected to pin 19
9298
IRQ - not connected */
9399
//#define TS_CS 255 /* Touch screen CS pin
94-
//#define TS_ROTATE 1 /* Touch screen rotation. 0 - 0, 1 - 90, 2 - 180, 3 - 270 degrees */
95-
//#define TS_DBG false /* Generate debug to Serial output */
96100
/******************************************/
97101

98102
/* Other settings. */
99103
//#define DTYPE INITR_BLACKTAB /* ST7735 display submodel */
100-
/* Could be one of: */
101-
/* INITR_BLACKTAB 1.8' https://aliexpress.com/item/1005002822797745.html */
102-
/* (See this note If INITR_BLACKTAB have a noisy line on one side of the screen https://github.com/e2002/yoradio#note-if-initr_blacktab-dsp-have-a-noisy-line-on-one-side-of-the-screen-then-in-adafruit_st7735cpp ) */
103-
/* INITR_144GREENTAB // 1.44' https://aliexpress.com/item/1005002822797745.html */
104-
/* INITR_MINI160x80 // 0.96' 160x80 ST7735S https://???? */
105-
/* INITR_GREENTAB */
106-
/* INITR_REDTAB */
104+
/* Could be one of: */
105+
/* INITR_BLACKTAB 1.8' https://aliexpress.com/item/1005002822797745.html */
106+
/* (See this note If INITR_BLACKTAB have a noisy line on one side of the screen https://github.com/e2002/yoradio#note-if-initr_blacktab-dsp-have-a-noisy-line-on-one-side-of-the-screen-then-in-adafruit_st7735cpp ) */
107+
/* INITR_144GREENTAB // 1.44' https://aliexpress.com/item/1005002822797745.html */
108+
/* INITR_MINI160x80 // 0.96' 160x80 ST7735S https://???? */
109+
/* INITR_GREENTAB */
110+
/* INITR_REDTAB */
107111
//#define LED_BUILTIN 2 /* LED Pin */
108-
//#define TFT_ROTATE 3 /* Display rotation. 0 - 0, 1 - 90, 2 - 180, 3 - 270 degrees */
109-
//#define TFT_CONTRAST 55 /* Nokia 5110 contrast */
110-
//#define TFT_INVERT true /* Invert the display colors (usually true) */
111-
//#define VOL_STEP 1 /* Volume control step */
112-
//#define VOL_ACCELERATION 200 /* Encoder vol acceleration; 0 or 1 means disabled acceleration */
113112
//#define MUTE_PIN 255 /* MUTE Pin */
114113
//#define MUTE_VAL HIGH /* Write this to MUTE_PIN when player is stopped */
115-
//#define PL_WITH_NUMBERS /* show the number of station in the playlist */
114+
//#define BRIGHTNESS_PIN 255 /* Pin for adjusting the brightness of the display (output 0 - 3v3) */
116115
//#define PLAYER_FORCE_MONO false /* mono option on boot - false stereo, true mono */
117-
//#define SNTP_SERVER "pool.ntp.org", "0.ru.pool.ntp.org" /* custom ntp servers min 1 max 3 comma separated values */
118116
//#define I2S_INTERNAL false /* If true - use esp32 internal DAC */
119-
//#define SOFT_AP_REBOOT_DELAY 0 /* Delay in milliseconds after which ESP is rebooting if it is in softAP mode (0 - disabled) */
120-
//#define ENABLE_VU_METER false /* enable? vu meter for some displays */
121-
/*
122-
* !!! Important !!!
123-
* if you enable this feathure on the esp32 wroom, due to lack of memory, you must modify the file Arduino/libraries/AsyncTCP/src/AsyncTCP.cpp
124-
* replace the line 221
125-
* xTaskCreateUniversal(_async_service_task, "async_tcp", 8192 * 2, NULL, 3, &_async_service_task_handle, CONFIG_ASYNC_TCP_RUNNING_CORE);
126-
* with
127-
* xTaskCreateUniversal(_async_service_task, "async_tcp", 8192 / 2, NULL, 3, &_async_service_task_handle, CONFIG_ASYNC_TCP_RUNNING_CORE);
128-
*/
117+
//#define ROTATE_90 false /* Optional 90 degree rotation for square displays */
118+
129119
/* VU settings. See the default settings for your display in file yoRadio/display_vu.h */
130120
/************************************************************************************************************************************************************************************/
131121
/* vu left | vu top | band width | band height | band space | num of bands | fade speed | horisontal | Max Bands Color | Min Bands Color */
@@ -136,7 +126,6 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
136126
/* IR control */
137127
//#define IR_PIN 255
138128
//#define IR_TIMEOUT 80 /* see kTimeout description in IRremoteESP8266 exsample https://github.com/crankyoldgit/IRremoteESP8266/blob/master/examples/IRrecvDumpV2/IRrecvDumpV2.ino */
139-
//#define IR_TLP 40 /* see kTolerancePercentage description in IRremoteESP8266 exsample https://github.com/crankyoldgit/IRremoteESP8266/blob/master/examples/IRrecvDumpV2/IRrecvDumpV2.ino */
140129

141130
/******************************************/
142131

‎images/settings.png‎

159 KB
Loading

0 commit comments

Comments
 (0)