This commit is contained in:
e2002
2022-02-15 16:10:14 +03:00
parent 559a99f5e4
commit f913f1f103
4 changed files with 33 additions and 7 deletions

View File

@@ -124,16 +124,16 @@ Define display model:
*/ */
#define DSP_MODEL 1 #define DSP_MODEL 1
```` ````
The ST7735 display submodel is configured in the file [src/displays/displayST7735.cpp](yoRadio/src/displays/displayST7735.cpp) The ST7735 display submodel:
````c++ ````c++
#define DTYPE INITR_BLACKTAB // 1.8' https://aliexpress.ru/item/1005002822797745.html #define DTYPE INITR_BLACKTAB // 1.8' https://aliexpress.ru/item/1005002822797745.html
//#define DTYPE INITR_144GREENTAB // 1.44' https://aliexpress.ru/item/1005002822797745.html //#define DTYPE INITR_144GREENTAB // 1.44' https://aliexpress.ru/item/1005002822797745.html
```` ````
Rotation of the displays is configured in the files [src/displays/displayXXXXX.h](yoRadio/src/displays/displayST7735.h) Rotation of the display:
````c++ ````c++
#define TFT_ROTATE 3 // 180 degress #define TFT_ROTATE 3 // 180 degress
```` ````
##### If there is a noisy line on one side of the screen, then in Adafruit_ST7735.cpp: ##### Note: If INITR_BLACKTAB dsp have a noisy line on one side of the screen, then in Adafruit_ST7735.cpp:
````c++ ````c++
// Black tab, change MADCTL color filter // Black tab, change MADCTL color filter
if ((options == INITR_BLACKTAB) || (options == INITR_MINI160x80)) { if ((options == INITR_BLACKTAB) || (options == INITR_MINI160x80)) {
@@ -183,11 +183,15 @@ _\*this step can be skipped if you add WiFiSSID WiFiPassword pairs to the [yoRad
--- ---
## Version history ## Version history
#### v0.4.260
- added control of balance and equalizer for VS1053
- **TFT_ROTATE** and st7735 **DTYPE** moved to myoptions.h
#### v0.4.251 #### v0.4.251
- fixed compilation error bug when using VS1053 together with ST7735 - fixed compilation error bug when using VS1053 together with ST7735
#### v0.4.249 #### v0.4.249
- fix VS10003/1053 reseting - fix VS1003/1053 reseting
- fix css in Firefox - fix css in Firefox
- fix font in NOKIA5110 display - fix font in NOKIA5110 display

View File

@@ -16,6 +16,7 @@
#if HWID==0 #if HWID==0
#define DSP_MODEL 2 #define DSP_MODEL 2
#define TFT_ROTATE 0
#define I2S_DOUT 22 #define I2S_DOUT 22
#define BTN_LEFT 16 #define BTN_LEFT 16
#define BTN_CENTER 5 #define BTN_CENTER 5
@@ -23,34 +24,42 @@
#elif HWID==1 #elif HWID==1
#define DSP_MODEL 2 #define DSP_MODEL 2
#define TFT_ROTATE 0
#define I2S_DOUT 22 #define I2S_DOUT 22
#elif HWID==2 #elif HWID==2
#define DSP_MODEL 1 #define DSP_MODEL 1
#define TFT_ROTATE 3
#define ENC_BTNL 13 #define ENC_BTNL 13
#define ENC_BTNB 12 #define ENC_BTNB 12
#define ENC_BTNR 14 #define ENC_BTNR 14
#elif HWID==3 #elif HWID==3
#define DSP_MODEL 3 #define DSP_MODEL 3
#define TFT_ROTATE 0
#define BTN_LEFT 13 #define BTN_LEFT 13
#define BTN_CENTER 12 #define BTN_CENTER 12
#define BTN_RIGHT 14 #define BTN_RIGHT 14
#elif HWID==4 #elif HWID==4
#define DSP_MODEL 3 #define DSP_MODEL 3
#define TFT_ROTATE 0
#define VS1053_CS 27 #define VS1053_CS 27
#define I2S_DOUT 255 #define I2S_DOUT 255
//#define VS1053_RST 14 //#define VS1053_RST 14
#elif HWID==5 #elif HWID==5
#define DSP_MODEL 3 #define DSP_MODEL 3
#define TFT_RST -1 // connecting to esp reset pin #define TFT_RST -1
#define TFT_DC 13
#define I2S_DOUT 255 #define I2S_DOUT 255
#define VS1053_CS 27 #define VS1053_CS 27
#define VS1053_DCS 14 #define VS1053_DCS 14
#define VS1053_DREQ 26 #define VS1053_DREQ 26
#define VS1053_RST 12 #define VS1053_RST 12
#define ENC_BTNL 25
#define ENC_BTNB 17
#define ENC_BTNR 16
#endif #endif

View File

@@ -36,6 +36,9 @@ bool NetServer::begin() {
webserver.on(INDEX_PATH, HTTP_GET, [](AsyncWebServerRequest * request) { webserver.on(INDEX_PATH, HTTP_GET, [](AsyncWebServerRequest * request) {
request->send(SPIFFS, INDEX_PATH, "application/octet-stream"); request->send(SPIFFS, INDEX_PATH, "application/octet-stream");
}); });
webserver.on(SSIDS_PATH, HTTP_GET, [](AsyncWebServerRequest * request) {
request->send(SPIFFS, SSIDS_PATH, "application/octet-stream");
});
webserver.on("/upload", HTTP_POST, [](AsyncWebServerRequest * request) { webserver.on("/upload", HTTP_POST, [](AsyncWebServerRequest * request) {
//request->send(200); //request->send(200);
}, handleUpload); }, handleUpload);

View File

@@ -1,7 +1,7 @@
#ifndef options_h #ifndef options_h
#define options_h #define options_h
#define VERSION "0.4.255" #define VERSION "0.4.260"
/* DISPLAY MODEL /* DISPLAY MODEL
* 0 - DUMMY * 0 - DUMMY
@@ -64,7 +64,17 @@
/* /*
* Other settings. You can overwrite them in the myoptions.h file * Other settings. You can overwrite them in the myoptions.h file
*/ */
#define TFT_ROTATE 3 // display rotation. 3 - 180 degress #define TFT_ROTATE 3 // display rotation. 0 - 0, 1 - 90, 2 - 180, 3 - 270 degress
//
/*
*** ST7735 display submodel ***
INITR_BLACKTAB // 1.8' https://aliexpress.ru/item/1005002822797745.html (See this note If there is a noisy line on one side of the screen https://github.com/e2002/yoradio#hardware-setup )
INITR_144GREENTAB // 1.44' https://aliexpress.ru/item/1005002822797745.html
INITR_GREENTAB
INITR_REDTAB
*/
#define DTYPE INITR_BLACKTAB
#if __has_include("myoptions.h") #if __has_include("myoptions.h")
#include "myoptions.h" #include "myoptions.h"