Commit c9490f91 authored by Bodmer's avatar Bodmer

Merge branch 'master' of https://github.com/Bodmer/TFT_eSPI

parents e49e546d 7eb365fc
...@@ -42,42 +42,30 @@ ...@@ -42,42 +42,30 @@
#if defined (EPD1IN54_H) || defined (EPD1IN54B_H) #if defined (EPD1IN54_H) || defined (EPD1IN54B_H)
#define EPD_WIDTH 200 // Frame buffer is 5000 bytes #define EPD_WIDTH 200 // Frame buffer is 5000 bytes
#define EPD_HEIGHT 200 #define EPD_HEIGHT 200
#define INIT_LUT lut_full_update
#elif defined (EPD1IN54C_H) #elif defined (EPD1IN54C_H)
#define EPD_WIDTH 152 // 2 frame buffers of 2888 bytes each #define EPD_WIDTH 152 // 2 frame buffers of 2888 bytes each
#define EPD_HEIGHT 152 #define EPD_HEIGHT 152
#define INIT_LUT
#elif defined (EPD2IN7_H) || defined (EPD2IN7B_H) #elif defined (EPD2IN7_H) || defined (EPD2IN7B_H)
#define EPD_WIDTH 176 // Frame buffer is 5808 bytes #define EPD_WIDTH 176 // Frame buffer is 5808 bytes
#define EPD_HEIGHT 264 #define EPD_HEIGHT 264
#define INIT_LUT
#elif defined (EPD2IN9_H) #elif defined (EPD2IN9_H) || defined (EPD2IN9B_H)
#define EPD_WIDTH 128 // Frame buffer is 4736 bytes #define EPD_WIDTH 128 // Frame buffer is 4736 bytes
#define EPD_HEIGHT 296 #define EPD_HEIGHT 296
#define INIT_LUT lut_full_update
#elif defined (EPD2IN9B_H)
#define EPD_WIDTH 128 // Frame buffer is 4736 bytes
#define EPD_HEIGHT 296
#define INIT_LUT
#elif defined (EPD2IN13_H) #elif defined (EPD2IN13_H)
#define EPD_WIDTH 122 // Frame buffer is 4000 bytes #define EPD_WIDTH 122 // Frame buffer is 4000 bytes
#define EPD_HEIGHT 250 #define EPD_HEIGHT 250
#define INIT_LUT lut_full_update
#elif defined (EPD2IN13B_H) #elif defined (EPD2IN13B_H)
#define EPD_WIDTH 104 // 2 frame buffers of 2756 bytes each #define EPD_WIDTH 104 // 2 frame buffers of 2756 bytes each
#define EPD_HEIGHT 212 #define EPD_HEIGHT 212
#define INIT_LUT
#elif defined (EPD4IN2_H) || defined (EPD4IN2B_H) #elif defined (EPD4IN2_H)
#define EPD_WIDTH 400 // Frame buffer is 15000 bytes #define EPD_WIDTH 400 // Frame buffer is 15000 bytes
#define EPD_HEIGHT 300 #define EPD_HEIGHT 300
#define INIT_LUT
// ESP8266 has just enough RAM for a 2 color 7.5" display full screen buffer // ESP8266 has just enough RAM for a 2 color 7.5" display full screen buffer
// ESP32 has just enough RAM for 2 or 3 color 7.5" display // ESP32 has just enough RAM for 2 or 3 color 7.5" display
...@@ -85,7 +73,6 @@ ...@@ -85,7 +73,6 @@
#elif defined (EPD7IN5_H) || defined (EPD7IN5B_H) #elif defined (EPD7IN5_H) || defined (EPD7IN5B_H)
#define EPD_WIDTH 640 // 2 colour frame buffer is 30720 bytes #define EPD_WIDTH 640 // 2 colour frame buffer is 30720 bytes
#define EPD_HEIGHT 384 // 2 colour frame buffer is 61440 bytes #define EPD_HEIGHT 384 // 2 colour frame buffer is 61440 bytes
#define INIT_LUT
#else #else
# error "Selected ePaper library is not supported" # error "Selected ePaper library is not supported"
...@@ -109,9 +96,9 @@ ...@@ -109,9 +96,9 @@
#elif defined (EPD1IN54_H) || defined(EPD2IN13_H) || defined(EPD2IN9_H) #elif defined (EPD1IN54_H) || defined(EPD2IN13_H) || defined(EPD2IN9_H)
ePaper.SetFrameMemory(blackFrame); ePaper.SetFrameMemory(blackFrame);
ePaper.DisplayFrame(); // Update 2 color display
#else #else
# error "Selected ePaper library is not supported" # error "Selected ePaper library is not supported"
#endif #endif
#endif #endif
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment