fix: Fix unresolved conflicts from the last merge.

Author: StarSphere-1024

Extensions/EPaper.h

@@ -17,6 +17,3 @@ class EPaper : public TFT_eSprite
     bool _sleep;
 };
 
-
-
-#include "EPaper.cpp"

examples/Round Display/Arduino_Life/Arduino_Life.ino

@@ -6,7 +6,6 @@
 
 // Adapted by Bodmer
 
-#define SEEED_XIAO_ROUND_DISPLAY
 #include <TFT_eSPI.h> // Hardware-specific library
 #include <SPI.h>
 

examples/Round Display/GifPlayer/GifPlayer.ino

@@ -1,5 +1,4 @@
 #include <vector>
-#define SEEED_XIAO_ROUND_DISPLAY
 #include <TFT_eSPI.h>
 #include <SPI.h>
 #include <SD.h>

examples/Round Display/Pong_v3/Pong_v3.ino

@@ -8,7 +8,6 @@
 #define WHITE 0xFFFF
 #define GREY  0x5AEB
 
-#define SEEED_XIAO_ROUND_DISPLAY
 #include <TFT_eSPI.h> // Graphics and font library for ST7735 driver chip
 #include <SPI.h>
 

examples/Round Display/TFT_flash_jpg/TFT_flash_jpg.ino

@@ -12,7 +12,6 @@
 //----------------------------------------------------------------------------------------------------
 
 #include <SPI.h>
-#define SEEED_XIAO_ROUND_DISPLAY
 #include <TFT_eSPI.h>
 
 TFT_eSPI tft = TFT_eSPI();

examples/Round Display/Touch_Pannel/Touch_Pannel.ino

@@ -1,5 +1,4 @@
 #include <Arduino.h>
-#define SEEED_XIAO_ROUND_DISPLAY
 #include <TFT_eSPI.h> 
 #include <SPI.h>
 

examples/ePaper/Basic/Bitmap/Bitmap.ino

@@ -1,12 +1,12 @@
-#define SEEED_XIAO_EPAPER_7INCH5
 #include "TFT_eSPI.h"
 #include "image.h"
 
 #ifdef EPAPER_ENABLE  // Only compile this code if the EPAPER_ENABLE is defined in User_Setup.h
-
 EPaper epaper;
+#endif
 void setup()
 {
+#ifdef EPAPER_ENABLE
   Serial.begin(115200);
   delay(2000);
   Serial.println("Start");
@@ -18,22 +18,11 @@ void setup()
   // epaper.pushImage(0, 0, 800, 480, (uint16_t *)gImage_1);
   // epaper.update();
   Serial.println("update");
-  epaper.update(0, 0, TFT_WIDTH, TFT_HEIGHT, (uint16_t *)epd_bitmap_);
-  
+  epaper.update(0, 0, TFT_WIDTH, TFT_HEIGHT, (uint16_t *)gImage_2);
+#endif
 }
 
 void loop()
 {
   // put your main code here, to run repeatedly:
 }
-#else
-void setup()
-{
-
-}
-
-void loop()
-{
-  
-}
-#endif

examples/ePaper/Basic/Clock/Clock.ino

@@ -18,7 +18,6 @@
  */
 
 #include <SPI.h>
-#define SEEED_XIAO_EPAPER_7INCH5
 #include <TFT_eSPI.h> // Hardware-specific library
 
 #ifdef EPAPER_ENABLE // Only compile this code if the EPAPER_ENABLE is defined in User_Setup.h
@@ -36,8 +35,11 @@ uint8_t hh = conv2d(__TIME__), mm = conv2d(__TIME__ + 3), ss = conv2d(__TIME__ +
 
 bool initial = 1;
 
+#endif
+
 void setup(void)
 {
+#ifdef EPAPER_ENABLE
   epaper.begin();
   epaper.setRotation(0);
 
@@ -89,10 +91,12 @@ void setup(void)
   epaper.update();
 
   targetTime = millis() + 1000;
+#endif
 }
 
 void loop()
 {
+#ifdef EPAPER_ENABLE
   if (targetTime < millis())
   {
     targetTime += 1000;
@@ -147,23 +151,15 @@ void loop()
     epaper.fillCircle(120, 121, 3, TFT_BLACK);
     epaper.update();
   }
+#endif
 }
 
+#ifdef EPAPER_ENABLE
 static uint8_t conv2d(const char *p)
 {
   uint8_t v = 0;
   if ('0' <= *p && *p <= '9')
     v = *p - '0';
   return 10 * v + *++p - '0';
 }
-#else
-void setup()
-{
-
-}
-
-void loop()
-{
-  
-}
-#endif
+#endif

examples/ePaper/Basic/Clock_Digital/Clock_Digital.ino

@@ -50,17 +50,22 @@ static uint8_t conv2d(const char* p) {
 
 uint8_t hh=conv2d(__TIME__), mm=conv2d(__TIME__+3), ss=conv2d(__TIME__+6);  // Get H, M, S from compile time
 
+#endif
+
 void setup(void) {
+#ifdef EPAPER_ENABLE
   epaper.begin();
   epaper.setRotation(1);
   epaper.fillScreen(TFT_BLACK);
 
   epaper.setTextColor(TFT_YELLOW, TFT_BLACK); // Note: the new fonts do not draw the background colour
   epaper.update(); // update the display
   targetTime = millis() + 1000; 
+#endif
 }
 
 void loop() {
+#ifdef EPAPER_ENABLE
   if (targetTime < millis()) {
     targetTime = millis()+1000;
     ss++;              // Advance second
@@ -125,16 +130,5 @@ void loop() {
     }
     epaper.update(); // update the display
   }
-}
-#else
-void setup()
-{
-
-}
-
-void loop()
-{
-  
-}
-
 #endif
+}

examples/ePaper/Basic/Shape/Shape.ino

@@ -1,12 +1,12 @@
-#define SEEED_XIAO_EPAPER_7INCH5
 #include "TFT_eSPI.h"
 
 #ifdef EPAPER_ENABLE  // Only compile this code if the EPAPER_ENABLE is defined in User_Setup.h
-
 EPaper epaper;
+#endif
+
 void setup()
 {
-
+#ifdef EPAPER_ENABLE  
   epaper.begin();
   epaper.fillScreen(TFT_WHITE);
   epaper.update(); // update the display
@@ -40,22 +40,10 @@ void setup()
     epaper.fillRect(10 + 80 * i, 10, 40, 40, TFT_BLACK);
     epaper.update();
   }
-
+#endif
 }
 
 void loop()
 {
   // put your main code here, to run repeatedly:
 }
-#else
-void setup()
-{
-
-}
-
-void loop()
-{
-  
-}
-
-#endif