From 3c12fb419f03540283f29593796a93ab6a75cd30 Mon Sep 17 00:00:00 2001 From: e2002 Date: Mon, 14 Feb 2022 14:45:10 +0300 Subject: [PATCH] 0.4.249 --- README.md | 5 +++++ exsamples/myoptions.h | 12 +++++++++++- yoRadio/data/www/style.css | 21 ++++++++++++++++++--- yoRadio/network.cpp | 1 + yoRadio/options.h | 2 +- yoRadio/player.cpp | 3 ++- yoRadio/src/displays/fonts/DS_DIGI15pt7b.h | 10 +++++----- 7 files changed, 43 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c7113e4..6d50947 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,11 @@ _\*this step can be skipped if you add WiFiSSID WiFiPassword pairs to the [yoRad --- ## Version history +#### v0.4.249 +- fix VS10003/1053 reseting +- fix css in Firefox +- fix font in NOKIA5110 display + #### v0.4.248 - added support for VS1053 module _in testing mode_ diff --git a/exsamples/myoptions.h b/exsamples/myoptions.h index 85ad2dc..f3e268b 100644 --- a/exsamples/myoptions.h +++ b/exsamples/myoptions.h @@ -8,6 +8,7 @@ * 2: ST7735 with encoder * 3: Nokia 5110 dev board * 4: VS1053 dev + * 5: VS1053 UNO3 Shield */ #define HWID 2 @@ -40,7 +41,16 @@ #define DSP_MODEL 3 #define VS1053_CS 27 #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 diff --git a/yoRadio/data/www/style.css b/yoRadio/data/www/style.css index 07e40b0..20ed30e 100644 --- a/yoRadio/data/www/style.css +++ b/yoRadio/data/www/style.css @@ -167,6 +167,10 @@ a:hover { text-decoration: underline } height: 8px; background-color: #000; } +#settings, #pleditorcontent { + scrollbar-color: #e3d25f #000; + scrollbar-width: thin; +} #settings::-webkit-scrollbar-thumb, #pleditorcontent::-webkit-scrollbar-thumb { background: #e3d25f; } @@ -401,13 +405,20 @@ a:hover { text-decoration: underline } outline: none; transition: background 450ms ease-in; -webkit-appearance: none; + -moz-appearance: none; 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; - -webkit-appearance: none;Раменское + -webkit-appearance: none; + -moz-appearance: none; height: 10px; cursor: ew-resize; + background-color: transparent; + border: 0; +} +input[type=range]::-moz-range-track { + background-color: transparent; } .slider { width: 400px; @@ -425,8 +436,11 @@ a:hover { text-decoration: underline } overflow-y: auto; height: 0px; 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; height: 8px; background-color: #000; @@ -441,6 +455,7 @@ a:hover { text-decoration: underline } color: #bfa73e; cursor: pointer; position: relative; + background: #000; } #playlist li span { position: absolute; diff --git a/yoRadio/network.cpp b/yoRadio/network.cpp index 1f23b7a..c91cf63 100644 --- a/yoRadio/network.cpp +++ b/yoRadio/network.cpp @@ -73,5 +73,6 @@ void Network::requestTimeSync(bool withTelnetOutput) { void Network::raiseSoftAP() { WiFi.mode(WIFI_AP); 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; } diff --git a/yoRadio/options.h b/yoRadio/options.h index 5d05237..753b12d 100644 --- a/yoRadio/options.h +++ b/yoRadio/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define VERSION "0.4.248" +#define VERSION "0.4.249" /* DISPLAY MODEL * 0 - DUMMY diff --git a/yoRadio/player.cpp b/yoRadio/player.cpp index a8f6576..3af6ac6 100644 --- a/yoRadio/player.cpp +++ b/yoRadio/player.cpp @@ -15,8 +15,9 @@ Player::Player(): Audio(VS1053_CS, VS1053_DCS, VS1053_DREQ) { } void ResetChip(){ + pinMode(VS1053_RST, OUTPUT); digitalWrite(VS1053_RST, LOW); - delay(10); + delay(30); digitalWrite(VS1053_RST, HIGH); delay(100); } diff --git a/yoRadio/src/displays/fonts/DS_DIGI15pt7b.h b/yoRadio/src/displays/fonts/DS_DIGI15pt7b.h index 8f36c2a..2bfba50 100644 --- a/yoRadio/src/displays/fonts/DS_DIGI15pt7b.h +++ b/yoRadio/src/displays/fonts/DS_DIGI15pt7b.h @@ -16,11 +16,11 @@ const uint8_t DS_DIGI15pt7bBitmaps[] PROGMEM = { 0xF8, 0x3F, 0x07, 0xDF, 0x77, 0xF5, 0xFF, 0x00, 0x7F, 0xC7, 0xF4, 0x7D, 0x80, 0x70, 0x0E, 0x01, 0xC0, 0x38, 0x03, 0x00, 0x20, 0x00, 0x00, 0x80, 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, 0xFF, 0x00, 0x7F, 0xD7, 0xF7, 0x7D, 0xF0, 0x7E, 0x0F, 0xC1, 0xF8, 0x3E, 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 = { @@ -50,11 +50,11 @@ const GFXglyph DS_DIGI15pt7bGlyphs[] PROGMEM = { { 176, 11, 19, 14, 2, -18 }, // 0x37 '7' { 203, 11, 19, 14, 2, -18 }, // 0x38 '8' { 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 = { - (uint8_t *)DS_DIGI15pt7bBitmaps, - (GFXglyph *)DS_DIGI15pt7bGlyphs, 0x20, 0x3A, 29 }; + (uint8_t *)DS_DIGI15pt7bBitmaps, + (GFXglyph *)DS_DIGI15pt7bGlyphs, 0x20, 0x3A, 29 }; // Approx. 664 bytes