From 7e78d45cf354eaf31ffb2cadb46b659a3cb11a26 Mon Sep 17 00:00:00 2001
From: e2002 <e2002@bk.ru>
Date: Fri, 11 Feb 2022 16:40:10 +0300
Subject: [PATCH] v0.4.199

---
 README.md                               | 3 +++
 yoRadio/options.h                       | 2 +-
 yoRadio/src/displays/displayDummy.cpp   | 7 ++++++-
 yoRadio/src/displays/displayDummy.h     | 3 +--
 yoRadio/src/displays/displayN5110.cpp   | 4 ++++
 yoRadio/src/displays/displayN5110.h     | 1 -
 yoRadio/src/displays/displaySSD1306.cpp | 5 +++++
 yoRadio/src/displays/displaySSD1306.h   | 1 -
 yoRadio/src/displays/displayST7735.cpp  | 4 ++++
 yoRadio/src/displays/displayST7735.h    | 3 +--
 10 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7070b72..634f2f9 100644
--- a/README.md
+++ b/README.md
@@ -140,6 +140,9 @@ sys.date - date/time
 
 ---
 ## Version history
+#### v0.4.199
+- excluded required installation of all libraries for displays.
+
 #### v0.4.197
 - added support for Nokia 5110 SPI displays
 - some bugs fixes
diff --git a/yoRadio/options.h b/yoRadio/options.h
index e0df12d..f5be549 100644
--- a/yoRadio/options.h
+++ b/yoRadio/options.h
@@ -1,7 +1,7 @@
 #ifndef options_h
 #define options_h
 
-#define VERSION "0.4.197"
+#define VERSION "0.4.199"
 
 /* DISPLAY MODEL
  * 0 - DUMMY
diff --git a/yoRadio/src/displays/displayDummy.cpp b/yoRadio/src/displays/displayDummy.cpp
index eecb123..86449f2 100644
--- a/yoRadio/src/displays/displayDummy.cpp
+++ b/yoRadio/src/displays/displayDummy.cpp
@@ -1,3 +1,6 @@
+#include "../../options.h"
+#if DSP_MODEL==0
+
 #include "displayDummy.h"
 #include <SPI.h>
 #include "../../player.h"
@@ -127,7 +130,7 @@ void DisplayDummy::displayHeapForDebug() {
 }
 
 void DisplayDummy::printClock(const char* timestr) {
-  
+
 }
 
 void DisplayDummy::drawVolumeBar(bool withNumber) {
@@ -165,3 +168,5 @@ void DisplayDummy::printText(const char* txt) {
 void DisplayDummy::loop() {
 
 }
+
+#endif
diff --git a/yoRadio/src/displays/displayDummy.h b/yoRadio/src/displays/displayDummy.h
index 28eb46d..8503776 100644
--- a/yoRadio/src/displays/displayDummy.h
+++ b/yoRadio/src/displays/displayDummy.h
@@ -2,7 +2,6 @@
 #define displayDummy_h
 
 #include "Arduino.h"
-#include "../../options.h"
 
 #define TFT_ROTATE      3
 #define TFT_LINEHGHT    10
@@ -41,7 +40,7 @@ class DisplayDummy {
     void loop();
   private:
     uint16_t swidth, sheight;
-    
+
 };
 
 extern DisplayDummy dsp;
diff --git a/yoRadio/src/displays/displayN5110.cpp b/yoRadio/src/displays/displayN5110.cpp
index c370807..99fb7be 100644
--- a/yoRadio/src/displays/displayN5110.cpp
+++ b/yoRadio/src/displays/displayN5110.cpp
@@ -1,3 +1,6 @@
+#include "../../options.h"
+#if DSP_MODEL==3
+
 #include "displayN5110.h"
 #include <Wire.h>
 #include "../../player.h"
@@ -304,3 +307,4 @@ boolean DisplayN5110::checkdelay(int m, unsigned long &tstamp) {
   }
 }
 
+#endif
diff --git a/yoRadio/src/displays/displayN5110.h b/yoRadio/src/displays/displayN5110.h
index 095f147..3668ec7 100644
--- a/yoRadio/src/displays/displayN5110.h
+++ b/yoRadio/src/displays/displayN5110.h
@@ -7,7 +7,6 @@
 #include "fonts/TinyFont5.h"
 #include "fonts/TinyFont6.h"
 #include "fonts/DS_DIGI15pt7b.h"
-#include "../../options.h"
 
 #define TFT_ROTATE      0
 #define TFT_LINEHGHT    8
diff --git a/yoRadio/src/displays/displaySSD1306.cpp b/yoRadio/src/displays/displaySSD1306.cpp
index 0333c92..25af264 100644
--- a/yoRadio/src/displays/displaySSD1306.cpp
+++ b/yoRadio/src/displays/displaySSD1306.cpp
@@ -1,3 +1,6 @@
+#include "../../options.h"
+#if DSP_MODEL==2
+
 #include "displaySSD1306.h"
 #include <Wire.h>
 #include "../../player.h"
@@ -294,3 +297,5 @@ boolean DisplaySSD1306::checkdelay(int m, unsigned long &tstamp) {
     return false;
   }
 }
+
+#endif
diff --git a/yoRadio/src/displays/displaySSD1306.h b/yoRadio/src/displays/displaySSD1306.h
index 2409fb0..774a7c0 100644
--- a/yoRadio/src/displays/displaySSD1306.h
+++ b/yoRadio/src/displays/displaySSD1306.h
@@ -4,7 +4,6 @@
 #include "Arduino.h"
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
-#include "../../options.h"
 
 #define TFT_ROTATE      0
 #define TFT_LINEHGHT    8
diff --git a/yoRadio/src/displays/displayST7735.cpp b/yoRadio/src/displays/displayST7735.cpp
index 9ce3dbf..0fad445 100644
--- a/yoRadio/src/displays/displayST7735.cpp
+++ b/yoRadio/src/displays/displayST7735.cpp
@@ -1,3 +1,6 @@
+#include "../../options.h"
+#if DSP_MODEL==1
+
 #include "displayST7735.h"
 #include <SPI.h>
 #include "fonts/bootlogo.h"
@@ -324,3 +327,4 @@ void DisplayST7735::loop() {
 
 }
 
+#endif
diff --git a/yoRadio/src/displays/displayST7735.h b/yoRadio/src/displays/displayST7735.h
index 9ee00c9..73592c4 100644
--- a/yoRadio/src/displays/displayST7735.h
+++ b/yoRadio/src/displays/displayST7735.h
@@ -4,7 +4,6 @@
 #include "Arduino.h"
 #include <Adafruit_GFX.h>
 #include <Adafruit_ST7735.h>
-#include "../../options.h"
 #include "fonts/DS_DIGI28pt7b.h"
 
 #define TFT_ROTATE      3
@@ -44,7 +43,7 @@ class DisplayST7735: public Adafruit_ST7735 {
     void loop();
   private:
     uint16_t swidth, sheight;
-    
+
 };
 
 extern DisplayST7735 dsp;