From 383a5d511924adcb5968818a5b5303d61deebd38 Mon Sep 17 00:00:00 2001 From: e2002 Date: Mon, 4 Aug 2025 21:15:20 +0300 Subject: [PATCH] v0.9.574 --- README.md | 4 ++++ yoRadio/src/core/display.h | 2 ++ yoRadio/src/core/options.h | 2 +- yoRadio/src/displays/conf/displaySH1106conf.h | 3 ++- yoRadio/src/displays/conf/displaySSD1305conf.h | 3 ++- yoRadio/src/displays/conf/displaySSD1306conf.h | 3 ++- yoRadio/src/displays/conf/displaySSD1306x32conf.h | 1 + yoRadio/src/displays/conf/displaySSD1322conf.h | 3 ++- yoRadio/src/displays/conf/displayST7789_76conf.h | 3 ++- yoRadio/src/displays/conf/displayST7920conf.h | 3 ++- 10 files changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 43b33fb..5c35f8d 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,10 @@ Work is in progress... --- ## Version history +#### v0.9.574 +- fixed compilation error for certain displays when `#define DSP_INVERT_TITLE false` is set +- fixed compilation error for `DSP_DUMMY` + #### v0.9.570 - added support for ST7789 284x76 2.25' SPI displays https://aliexpress.ru/item/1005009016973081.html \ note: the brightness pin of this display should be pulled up to GND diff --git a/yoRadio/src/core/display.h b/yoRadio/src/core/display.h index 4df0bf8..4f056d7 100644 --- a/yoRadio/src/core/display.h +++ b/yoRadio/src/core/display.h @@ -97,6 +97,8 @@ class Display { bool deepsleep(){return true;} void wakeup(){} void printPLitem(uint8_t pos, const char* item){} + void lock() {} + void unlock() {} private: void _createDspTask(); }; diff --git a/yoRadio/src/core/options.h b/yoRadio/src/core/options.h index 8343c88..8a11e75 100644 --- a/yoRadio/src/core/options.h +++ b/yoRadio/src/core/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define YOVERSION "0.9.570" +#define YOVERSION "0.9.574" /******************************************************* DO NOT EDIT THIS FILE. diff --git a/yoRadio/src/displays/conf/displaySH1106conf.h b/yoRadio/src/displays/conf/displaySH1106conf.h index 760682e..c2be6bf 100644 --- a/yoRadio/src/displays/conf/displaySH1106conf.h +++ b/yoRadio/src/displays/conf/displaySH1106conf.h @@ -28,7 +28,8 @@ const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 64-7, 1, WA_LEFT }, const ScrollConfig weatherConf PROGMEM = {{ TFT_FRAMEWDT, 64-9, 1, WA_LEFT }, 140, true, MAX_WIDTH-6*4, 0, 2, 25 }; // ПОГОДА!! /* BACKGROUNGC9106DS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ -const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 17, false }; +const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 17, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 17, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig volbarConf PROGMEM = {{ 0, 64-1, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig playlBGConf PROGMEM = {{ 0, 26, 0, WA_LEFT }, DSP_WIDTH, 12, false }; const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false }; diff --git a/yoRadio/src/displays/conf/displaySSD1305conf.h b/yoRadio/src/displays/conf/displaySSD1305conf.h index 16d625d..f02a8a1 100644 --- a/yoRadio/src/displays/conf/displaySSD1305conf.h +++ b/yoRadio/src/displays/conf/displaySSD1305conf.h @@ -28,7 +28,8 @@ const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 64-7, 1, WA_LEFT }, const ScrollConfig weatherConf PROGMEM = {{ 0, 64-11, 1, WA_LEFT }, 140, true, DSP_WIDTH-6*4, 0, 2, 25 }; // ПОГОДА!! /* BACKGROUNGC9106DS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ -const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 11, false }; +const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 11, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 11, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig volbarConf PROGMEM = {{ 0, 64-1-1-1, 0, WA_LEFT }, DSP_WIDTH, 3, true }; const FillConfig playlBGConf PROGMEM = {{ 0, 26, 0, WA_LEFT }, DSP_WIDTH, 12, false }; const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false }; diff --git a/yoRadio/src/displays/conf/displaySSD1306conf.h b/yoRadio/src/displays/conf/displaySSD1306conf.h index 8a2220a..e5142dd 100644 --- a/yoRadio/src/displays/conf/displaySSD1306conf.h +++ b/yoRadio/src/displays/conf/displaySSD1306conf.h @@ -28,7 +28,8 @@ const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 64-7, 1, WA_LEFT }, const ScrollConfig weatherConf PROGMEM = {{ 0, 64-11, 1, WA_LEFT }, 140, true, DSP_WIDTH-6*4, 0, 2, 25 }; // ПОГОДА!! /* BACKGROUNGC9106DS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ -const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 16, false }; +const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 16, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 16, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig volbarConf PROGMEM = {{ 0, 64-1-1-1, 0, WA_LEFT }, DSP_WIDTH, 3, true }; const FillConfig playlBGConf PROGMEM = {{ 0, 23, 0, WA_LEFT }, DSP_WIDTH, 19, false }; const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false }; diff --git a/yoRadio/src/displays/conf/displaySSD1306x32conf.h b/yoRadio/src/displays/conf/displaySSD1306x32conf.h index c2ae379..87beec0 100644 --- a/yoRadio/src/displays/conf/displaySSD1306x32conf.h +++ b/yoRadio/src/displays/conf/displaySSD1306x32conf.h @@ -30,6 +30,7 @@ const ScrollConfig weatherConf PROGMEM = {{ 0, 20, 1, WA_LEFT }, 140, true, D /* BACKGROUNGC9106DS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH/*-6*5-3*/, 9, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 9, 0, WA_LEFT }, DSP_WIDTH/*-6*5-3*/, 1, false }; const FillConfig volbarConf PROGMEM = {{ 0, 32-1-1-1, 0, WA_LEFT }, DSP_WIDTH, 3, true }; const FillConfig playlBGConf PROGMEM = {{ 0, 13, 0, WA_LEFT }, DSP_WIDTH, 9, false }; //const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false }; diff --git a/yoRadio/src/displays/conf/displaySSD1322conf.h b/yoRadio/src/displays/conf/displaySSD1322conf.h index aa734e2..67a4701 100644 --- a/yoRadio/src/displays/conf/displaySSD1322conf.h +++ b/yoRadio/src/displays/conf/displaySSD1322conf.h @@ -29,7 +29,8 @@ const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 64-7, 1, WA_LEFT }, const ScrollConfig weatherConf PROGMEM = {{ 0, 64-12, 1, WA_LEFT }, 140, true, DSP_WIDTH/2+6, 0, 2, 25 }; // ПОГОДА!! /* BACKGROUNGC9106DS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ -const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 18, false }; +const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 18, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 18, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig volbarConf PROGMEM = {{ 0, 64-1-1-1, 0, WA_LEFT }, DSP_WIDTH, 3, true }; const FillConfig playlBGConf PROGMEM = {{ 0, 26, 0, WA_LEFT }, DSP_WIDTH, 12, false }; const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false }; diff --git a/yoRadio/src/displays/conf/displayST7789_76conf.h b/yoRadio/src/displays/conf/displayST7789_76conf.h index 37b79ed..c0a0236 100644 --- a/yoRadio/src/displays/conf/displayST7789_76conf.h +++ b/yoRadio/src/displays/conf/displayST7789_76conf.h @@ -30,7 +30,8 @@ const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 64-7, 1, WA_LEFT }, const ScrollConfig weatherConf PROGMEM = {{ TFT_FRAMEWDT, 64-12, 1, WA_LEFT }, 140, true, DSP_WIDTH/2+18, 0, 2, 25 }; // ПОГОДА!! /* BACKGROUNDS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ -const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 19, false }; +const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 19, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 19, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig volbarConf PROGMEM = {{ TFT_FRAMEWDT, DSP_HEIGHT-4, 0, WA_LEFT }, DSP_WIDTH-TFT_FRAMEWDT*2, 3, true }; const FillConfig playlBGConf PROGMEM = {{ 0, 26, 0, WA_LEFT }, DSP_WIDTH, 12, false }; const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false }; diff --git a/yoRadio/src/displays/conf/displayST7920conf.h b/yoRadio/src/displays/conf/displayST7920conf.h index 6bf45a8..9bf2657 100644 --- a/yoRadio/src/displays/conf/displayST7920conf.h +++ b/yoRadio/src/displays/conf/displayST7920conf.h @@ -28,7 +28,8 @@ const ScrollConfig apSettConf PROGMEM = {{ TFT_FRAMEWDT, 64-7, 1, WA_LEFT }, const ScrollConfig weatherConf PROGMEM = {{ 0, 64-11, 1, WA_LEFT }, 140, true, DSP_WIDTH-6*4, 0, 6, 250 }; // ПОГОДА!! /* BACKGROUNGC9106DS */ /* {{ left, top, fontsize, align }, width, height, outlined } */ -const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 11, false }; +const FillConfig metaBGConf PROGMEM = {{ 0, 0, 0, WA_LEFT }, DSP_WIDTH, 11, false }; +const FillConfig metaBGConfInv PROGMEM = {{ 0, 11, 0, WA_LEFT }, DSP_WIDTH, 1, false }; const FillConfig volbarConf PROGMEM = {{ 0, 64-1-1-1, 0, WA_LEFT }, DSP_WIDTH, 3, true }; const FillConfig playlBGConf PROGMEM = {{ 0, 26, 0, WA_LEFT }, DSP_WIDTH, 12, false }; const FillConfig heapbarConf PROGMEM = {{ 0, 63, 0, WA_LEFT }, DSP_WIDTH, 1, false };