This commit is contained in:
e2002
2022-02-14 14:45:10 +03:00
parent 4924d97b61
commit 3c12fb419f
7 changed files with 43 additions and 11 deletions

View File

@@ -183,6 +183,11 @@ _\*this step can be skipped if you add WiFiSSID WiFiPassword pairs to the [yoRad
--- ---
## Version history ## Version history
#### v0.4.249
- fix VS10003/1053 reseting
- fix css in Firefox
- fix font in NOKIA5110 display
#### v0.4.248 #### v0.4.248
- added support for VS1053 module _in testing mode_ - added support for VS1053 module _in testing mode_

View File

@@ -8,6 +8,7 @@
* 2: ST7735 with encoder * 2: ST7735 with encoder
* 3: Nokia 5110 dev board * 3: Nokia 5110 dev board
* 4: VS1053 dev * 4: VS1053 dev
* 5: VS1053 UNO3 Shield
*/ */
#define HWID 2 #define HWID 2
@@ -40,7 +41,16 @@
#define DSP_MODEL 3 #define DSP_MODEL 3
#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
#define DSP_MODEL 3
#define TFT_RST -1 // connecting to esp reset pin
#define I2S_DOUT 255
#define VS1053_CS 27
#define VS1053_DCS 14
#define VS1053_DREQ 26
#define VS1053_RST 12
#endif #endif

View File

@@ -167,6 +167,10 @@ a:hover { text-decoration: underline }
height: 8px; height: 8px;
background-color: #000; background-color: #000;
} }
#settings, #pleditorcontent {
scrollbar-color: #e3d25f #000;
scrollbar-width: thin;
}
#settings::-webkit-scrollbar-thumb, #pleditorcontent::-webkit-scrollbar-thumb { #settings::-webkit-scrollbar-thumb, #pleditorcontent::-webkit-scrollbar-thumb {
background: #e3d25f; background: #e3d25f;
} }
@@ -401,13 +405,20 @@ a:hover { text-decoration: underline }
outline: none; outline: none;
transition: background 450ms ease-in; transition: background 450ms ease-in;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none;
box-sizing: border-box; box-sizing: border-box;
} }
#volrange::-webkit-slider-thumb, .slider::-webkit-slider-thumb { #volrange::-webkit-slider-thumb, .slider::-webkit-slider-thumb, #volrange::-moz-range-thumb, .slider::-moz-range-thumb {
width: 10px; width: 10px;
-webkit-appearance: none;Раменское -webkit-appearance: none;
-moz-appearance: none;
height: 10px; height: 10px;
cursor: ew-resize; cursor: ew-resize;
background-color: transparent;
border: 0;
}
input[type=range]::-moz-range-track {
background-color: transparent;
} }
.slider { .slider {
width: 400px; width: 400px;
@@ -425,8 +436,11 @@ a:hover { text-decoration: underline }
overflow-y: auto; overflow-y: auto;
height: 0px; height: 0px;
box-sizing: border-box; box-sizing: border-box;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAABOAQMAAAAw4lVwAAAABlBMVEUnJycAAADxyujSAAAADklEQVQI12OgLjhATQgAdZgdQbNqrBUAAAAASUVORK5CYII=');
scrollbar-color: #e3d25f #000;
scrollbar-width: thin;
} }
#playlist::-webkit-scrollbar { #playlist::-webkit-scrollbarr {
width: 5px; width: 5px;
height: 8px; height: 8px;
background-color: #000; background-color: #000;
@@ -441,6 +455,7 @@ a:hover { text-decoration: underline }
color: #bfa73e; color: #bfa73e;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
background: #000;
} }
#playlist li span { #playlist li span {
position: absolute; position: absolute;

View File

@@ -73,5 +73,6 @@ void Network::requestTimeSync(bool withTelnetOutput) {
void Network::raiseSoftAP() { void Network::raiseSoftAP() {
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
WiFi.softAP(apSsid, apPassword); WiFi.softAP(apSsid, apPassword);
Serial.printf("\n\nRunning in AP mode.\nConnect to AP %s with password %s for settings.\n\n", apSsid, apPassword);
status = SOFT_AP; status = SOFT_AP;
} }

View File

@@ -1,7 +1,7 @@
#ifndef options_h #ifndef options_h
#define options_h #define options_h
#define VERSION "0.4.248" #define VERSION "0.4.249"
/* DISPLAY MODEL /* DISPLAY MODEL
* 0 - DUMMY * 0 - DUMMY

View File

@@ -15,8 +15,9 @@ Player::Player(): Audio(VS1053_CS, VS1053_DCS, VS1053_DREQ) {
} }
void ResetChip(){ void ResetChip(){
pinMode(VS1053_RST, OUTPUT);
digitalWrite(VS1053_RST, LOW); digitalWrite(VS1053_RST, LOW);
delay(10); delay(30);
digitalWrite(VS1053_RST, HIGH); digitalWrite(VS1053_RST, HIGH);
delay(100); delay(100);
} }

View File

@@ -16,11 +16,11 @@ const uint8_t DS_DIGI15pt7bBitmaps[] PROGMEM = {
0xF8, 0x3F, 0x07, 0xDF, 0x77, 0xF5, 0xFF, 0x00, 0x7F, 0xC7, 0xF4, 0x7D, 0xF8, 0x3F, 0x07, 0xDF, 0x77, 0xF5, 0xFF, 0x00, 0x7F, 0xC7, 0xF4, 0x7D,
0x80, 0x70, 0x0E, 0x01, 0xC0, 0x38, 0x03, 0x00, 0x20, 0x00, 0x00, 0x80, 0x80, 0x70, 0x0E, 0x01, 0xC0, 0x38, 0x03, 0x00, 0x20, 0x00, 0x00, 0x80,
0x30, 0x0E, 0x01, 0xC0, 0x38, 0x07, 0x00, 0x60, 0x04, 0x00, 0x00, 0x7F, 0x30, 0x0E, 0x01, 0xC0, 0x38, 0x07, 0x00, 0x60, 0x04, 0x00, 0x00, 0x7F,
0xD7, 0xF7, 0x7D, 0xF0, 0x7E, 0x0F, 0xC1, 0xF8, 0x3E, 0x03, 0xBF, 0xAF, 0xD7, 0xF7, 0x7D, 0xF0, 0xFE, 0x0F, 0xC1, 0xF8, 0x3E, 0x03, 0xBF, 0xAF,
0xFA, 0xFE, 0xE0, 0x3E, 0x0F, 0xC1, 0xF8, 0x3F, 0x07, 0xCE, 0x77, 0xF5, 0xFA, 0xFE, 0xE0, 0x3E, 0x0F, 0xC1, 0xF8, 0x3F, 0x07, 0xCE, 0x77, 0xF5,
0xFF, 0x00, 0x7F, 0xD7, 0xF7, 0x7D, 0xF0, 0x7E, 0x0F, 0xC1, 0xF8, 0x3E, 0xFF, 0x00, 0x7F, 0xD7, 0xF7, 0x7D, 0xF0, 0x7E, 0x0F, 0xC1, 0xF8, 0x3E,
0x03, 0xBF, 0xAF, 0xF8, 0xFE, 0x80, 0x30, 0x0E, 0x01, 0xC0, 0x38, 0x07, 0x03, 0xBF, 0xAF, 0xF8, 0xFE, 0x80, 0x30, 0x0E, 0x01, 0xC0, 0x38, 0x07,
0x1F, 0x67, 0xF5, 0xFF, 0x00, 0xFF, 0x80, 0x00, 0x1F, 0xF0, 0x00 0x1F, 0x67, 0xF5, 0xFF, 0x00, 0xFF, 0x80, 0x00, 0x1F, 0xF0, 0x00, 0x00
}; };
const GFXglyph DS_DIGI15pt7bGlyphs[] PROGMEM = { const GFXglyph DS_DIGI15pt7bGlyphs[] PROGMEM = {
@@ -50,11 +50,11 @@ const GFXglyph DS_DIGI15pt7bGlyphs[] PROGMEM = {
{ 176, 11, 19, 14, 2, -18 }, // 0x37 '7' { 176, 11, 19, 14, 2, -18 }, // 0x37 '7'
{ 203, 11, 19, 14, 2, -18 }, // 0x38 '8' { 203, 11, 19, 14, 2, -18 }, // 0x38 '8'
{ 230, 11, 19, 14, 2, -18 }, // 0x39 '9' { 230, 11, 19, 14, 2, -18 }, // 0x39 '9'
{ 257, 3, 16, 6, 2, -15 } // 0x3A ':' { 257, 3, 15, 6, 2, -14 } // 0x3A ':'
}; };
const GFXfont DS_DIGI15pt7b PROGMEM = { const GFXfont DS_DIGI15pt7b PROGMEM = {
(uint8_t *)DS_DIGI15pt7bBitmaps, (uint8_t *)DS_DIGI15pt7bBitmaps,
(GFXglyph *)DS_DIGI15pt7bGlyphs, 0x20, 0x3A, 29 }; (GFXglyph *)DS_DIGI15pt7bGlyphs, 0x20, 0x3A, 29 };
// Approx. 664 bytes // Approx. 664 bytes