Merge pull request #201 from giovantenne/master

fix regression introduced in 25db0a4; fix for displayDriver.h case sensitive filename
BitMaker-hub · Oct 24, 2023 · fca6842 · fca6842
2 parents 68c088f + 29ffe62
commit fca6842
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/src/drivers/displays/amoledDisplayDriver.cpp b/src/drivers/displays/amoledDisplayDriver.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef AMOLED_DISPLAY
 
@@ -243,4 +243,4 @@ DisplayDriver amoledDisplayDriver = {
     0,
     WIDTH,
     HEIGHT};
-#endif
+#endif
diff --git a/src/drivers/displays/display.h b/src/drivers/displays/display.h
@@ -1,7 +1,7 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 extern DisplayDriver *currentDisplayDriver;
 

diff --git a/src/drivers/displays/dongleDisplayDriver.cpp b/src/drivers/displays/dongleDisplayDriver.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef DONGLE_DISPLAY
 
@@ -216,4 +216,4 @@ DisplayDriver dongleDisplayDriver = {
     WIDTH,
     HEIGHT};
 
-#endif
+#endif
diff --git a/src/drivers/displays/esp23_2432s028r.cpp b/src/drivers/displays/esp23_2432s028r.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef ESP32_2432S028R
 
@@ -458,4 +458,4 @@ DisplayDriver esp32_2432S028RDriver = {
     0,
     WIDTH,
     HEIGHT};
-#endif
+#endif
diff --git a/src/drivers/displays/noDisplayDriver.cpp b/src/drivers/displays/noDisplayDriver.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef NO_DISPLAY
 
@@ -101,4 +101,4 @@ DisplayDriver noDisplayDriver = {
     0,
     0,
 };
-#endif
+#endif
diff --git a/src/drivers/displays/tDisplayDriver.cpp b/src/drivers/displays/tDisplayDriver.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef T_DISPLAY
 
@@ -231,4 +231,4 @@ DisplayDriver tDisplayDriver = {
     0,
     WIDTH,
     HEIGHT};
-#endif
+#endif
diff --git a/src/drivers/displays/tDisplayV1Driver.cpp b/src/drivers/displays/tDisplayV1Driver.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef V1_DISPLAY
 
@@ -96,7 +96,6 @@ void tDisplay_MinerScreen(unsigned long mElapsed)
 
   // Push prepared background to screen
   background.pushSprite(0, 0);
-  background.deleteSprite();
 }
 
 void tDisplay_ClockScreen(unsigned long mElapsed)
@@ -135,7 +134,6 @@ void tDisplay_ClockScreen(unsigned long mElapsed)
 
   // Push prepared background to screen
   background.pushSprite(0, 0);
-  background.deleteSprite();
 }
 
 void tDisplay_GlobalHashScreen(unsigned long mElapsed)
@@ -195,7 +193,6 @@ void tDisplay_GlobalHashScreen(unsigned long mElapsed)
 
   // Push prepared background to screen
   background.pushSprite(0, 0);
-  background.deleteSprite();
 }
 
 void tDisplay_LoadingScreen(void)
@@ -234,4 +231,4 @@ DisplayDriver tDisplayV1Driver = {
     0,
     WIDTH,
     HEIGHT};
-#endif
+#endif
diff --git a/src/drivers/displays/t_qtDisplayDriver.cpp b/src/drivers/displays/t_qtDisplayDriver.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriver.h"
+#include "displayDriver.h"
 
 #ifdef T_QT_DISPLAY
 
@@ -177,4 +177,4 @@ DisplayDriver t_qtDisplayDriver = {
     0,
     WIDTH,
     HEIGHT};
-#endif
+#endif