This commit is contained in:
e2002
2022-02-11 16:40:10 +03:00
parent 234c6b2245
commit 7e78d45cf3
10 changed files with 25 additions and 8 deletions

View File

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

View File

@@ -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

View File

@@ -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;

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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;