WantClue/NerdNos-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #201 from giovantenne/master

Browse Source 
fix regression introduced in 25db0a4; fix for displayDriver.h case sensitive filename
This commit is contained in:
BitMaker 2023-10-24 10:20:10 +02:00 committed by GitHub
commit fca68423d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/displays/amoledDisplayDriver.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef AMOLED_DISPLAY #ifdef AMOLED_DISPLAY
@ -243,4 +243,4 @@ DisplayDriver amoledDisplayDriver = {
0, 0,
WIDTH, WIDTH,
HEIGHT}; HEIGHT};
#endif #endif

2
src/drivers/displays/display.h
View File

@ -1,7 +1,7 @@
#ifndef DISPLAY_H #ifndef DISPLAY_H
#define DISPLAY_H #define DISPLAY_H
#include "DisplayDriver.h" #include "displayDriver.h"
extern DisplayDriver *currentDisplayDriver; extern DisplayDriver *currentDisplayDriver;

4
src/drivers/displays/dongleDisplayDriver.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef DONGLE_DISPLAY #ifdef DONGLE_DISPLAY
@ -216,4 +216,4 @@ DisplayDriver dongleDisplayDriver = {
WIDTH, WIDTH,
HEIGHT}; HEIGHT};
#endif #endif

4
src/drivers/displays/esp23_2432s028r.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef ESP32_2432S028R #ifdef ESP32_2432S028R
@ -458,4 +458,4 @@ DisplayDriver esp32_2432S028RDriver = {
0, 0,
WIDTH, WIDTH,
HEIGHT}; HEIGHT};
#endif #endif

4
src/drivers/displays/noDisplayDriver.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef NO_DISPLAY #ifdef NO_DISPLAY
@ -101,4 +101,4 @@ DisplayDriver noDisplayDriver = {
0, 0,
0, 0,
}; };
#endif #endif

4
src/drivers/displays/tDisplayDriver.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef T_DISPLAY #ifdef T_DISPLAY
@ -231,4 +231,4 @@ DisplayDriver tDisplayDriver = {
0, 0,
WIDTH, WIDTH,
HEIGHT}; HEIGHT};
#endif #endif

7
src/drivers/displays/tDisplayV1Driver.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef V1_DISPLAY #ifdef V1_DISPLAY
@ -96,7 +96,6 @@ void tDisplay_MinerScreen(unsigned long mElapsed)
// Push prepared background to screen // Push prepared background to screen
background.pushSprite(0, 0); background.pushSprite(0, 0);
background.deleteSprite();
} }
void tDisplay_ClockScreen(unsigned long mElapsed) void tDisplay_ClockScreen(unsigned long mElapsed)
@ -135,7 +134,6 @@ void tDisplay_ClockScreen(unsigned long mElapsed)
// Push prepared background to screen // Push prepared background to screen
background.pushSprite(0, 0); background.pushSprite(0, 0);
background.deleteSprite();
} }
void tDisplay_GlobalHashScreen(unsigned long mElapsed) void tDisplay_GlobalHashScreen(unsigned long mElapsed)
@ -195,7 +193,6 @@ void tDisplay_GlobalHashScreen(unsigned long mElapsed)
// Push prepared background to screen // Push prepared background to screen
background.pushSprite(0, 0); background.pushSprite(0, 0);
background.deleteSprite();
} }
void tDisplay_LoadingScreen(void) void tDisplay_LoadingScreen(void)
@ -234,4 +231,4 @@ DisplayDriver tDisplayV1Driver = {
0, 0,
WIDTH, WIDTH,
HEIGHT}; HEIGHT};
#endif #endif

4
src/drivers/displays/t_qtDisplayDriver.cpp
View File

@ -1,4 +1,4 @@
#include "DisplayDriver.h" #include "displayDriver.h"
#ifdef T_QT_DISPLAY #ifdef T_QT_DISPLAY
@ -177,4 +177,4 @@ DisplayDriver t_qtDisplayDriver = {
0, 0,
WIDTH, WIDTH,
HEIGHT}; HEIGHT};
#endif #endif