Update screen refresh sequence
Updating core screen refresh sequence to make it compatible with all batches of ED060SC7 screens.
This commit is contained in:
David Zovko
parent
372039b345
commit
4eb4ac213b
1295
Inkplate.cpp
1295
Inkplate.cpp
File diff suppressed because it is too large
Load Diff
326
Inkplate.h
326
Inkplate.h
|
|
@ -1,154 +1,172 @@
|
||||||
#ifndef __INKPLATE_H__
|
#ifndef __INKPLATE_H__
|
||||||
#define __INKPLATE_H__
|
#define __INKPLATE_H__
|
||||||
#if ARDUINO >= 100
|
#if ARDUINO >= 100
|
||||||
#include "Arduino.h"
|
#include "Arduino.h"
|
||||||
#else
|
#else
|
||||||
#include "WProgram.h"
|
#include "WProgram.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ARDUINO_ESP32_DEV
|
#ifndef ARDUINO_ESP32_DEV
|
||||||
#error "Wrong board selected! Select ESP32 Wrover from board menu!"
|
#error "Wrong board selected! Select ESP32 Wrover from board menu!"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Adafruit_GFX.h>
|
#include "Adafruit_GFX.h"
|
||||||
#include <Wire.h>
|
#include "Wire.h"
|
||||||
#include "Adafruit_MCP23017.h"
|
#include "SPI.h"
|
||||||
#define E_INK_WIDTH 800
|
#include "Adafruit_MCP23017.h"
|
||||||
#define E_INK_HEIGHT 600
|
#include "SdFat.h"
|
||||||
extern Adafruit_MCP23017 mcp;
|
|
||||||
|
#define INKPLATE_GAMMA 1.45
|
||||||
#define DATA 0x0E8C0030 //D0-D7 = GPIO4 GPIO5 GPIO18 GPIO19 GPIO23 GPIO25 GPIO26 GPIO27
|
#define E_INK_WIDTH 800
|
||||||
|
#define E_INK_HEIGHT 600
|
||||||
#define CL 0x01 //GPIO0
|
#define BLACK 1
|
||||||
#define CL_SET {GPIO.out_w1ts = CL;}
|
#define WHITE 0
|
||||||
#define CL_CLEAR {GPIO.out_w1tc = CL;}
|
#define GPIO0_ENABLE 8
|
||||||
|
#define INKPLATE_1BIT 0
|
||||||
#define LE 0x04 //GPIO2
|
#define INKPLATE_3BIT 1
|
||||||
#define LE_SET {GPIO.out_w1ts = LE;}
|
#define PAD1 0
|
||||||
#define LE_CLEAR {GPIO.out_w1tc = LE;}
|
#define PAD2 1
|
||||||
|
#define PAD3 2
|
||||||
#define CKV 0x01 //GPIO32
|
|
||||||
#define CKV_SET {GPIO.out1_w1ts.val = CKV;}
|
#define DATA 0x0E8C0030 //D0-D7 = GPIO4 GPIO5 GPIO18 GPIO19 GPIO23 GPIO25 GPIO26 GPIO27
|
||||||
#define CKV_CLEAR {GPIO.out1_w1tc.val = CKV;}
|
|
||||||
|
#define CL 0x01 //GPIO0
|
||||||
#define SPH 0x02 //GPIO33
|
#define CL_SET {GPIO.out_w1ts = CL;}
|
||||||
#define SPH_SET {GPIO.out1_w1ts.val = SPH;}
|
#define CL_CLEAR {GPIO.out_w1tc = CL;}
|
||||||
#define SPH_CLEAR {GPIO.out1_w1tc.val = SPH;}
|
|
||||||
|
#define LE 0x04 //GPIO2
|
||||||
//I/O Expander - A Channel
|
#define LE_SET {GPIO.out_w1ts = LE;}
|
||||||
#define GMOD 1 //GPIOA1
|
#define LE_CLEAR {GPIO.out_w1tc = LE;}
|
||||||
#define GMOD_SET {mcp.digitalWrite(GMOD, HIGH);}
|
|
||||||
#define GMOD_CLEAR {mcp.digitalWrite(GMOD, HIGH);}
|
#define CKV 0x01 //GPIO32
|
||||||
|
#define CKV_SET {GPIO.out1_w1ts.val = CKV;}
|
||||||
#define OE 0 //GPIOA0
|
#define CKV_CLEAR {GPIO.out1_w1tc.val = CKV;}
|
||||||
#define OE_SET {mcp.digitalWrite(OE, HIGH);}
|
|
||||||
#define OE_CLEAR {mcp.digitalWrite(OE, LOW);}
|
#define SPH 0x02 //GPIO33
|
||||||
|
#define SPH_SET {GPIO.out1_w1ts.val = SPH;}
|
||||||
#define SPV 2 //GPIOA5
|
#define SPH_CLEAR {GPIO.out1_w1tc.val = SPH;}
|
||||||
#define SPV_SET {mcp.digitalWrite(SPV, HIGH);}
|
|
||||||
#define SPV_CLEAR {mcp.digitalWrite(SPV, LOW);}
|
//#define SPV 15 //GPIO15
|
||||||
|
//#define SPV_SET {digitalWrite(SPV, HIGH);}
|
||||||
#define WAKEUP 3 //GPIOA3
|
//#define SPV_CLEAR {digitalWrite(SPV, LOW);}
|
||||||
#define WAKEUP_SET {mcp.digitalWrite(WAKEUP, HIGH);}
|
|
||||||
#define WAKEUP_CLEAR {mcp.digitalWrite(WAKEUP, LOW);}
|
//I/O Expander - A Channel
|
||||||
|
#define GMOD 1 //GPIOA1
|
||||||
#define PWRUP 4 //GPIOA4
|
#define GMOD_SET {mcp.digitalWrite(GMOD, HIGH);}
|
||||||
#define PWRUP_SET {mcp.digitalWrite(PWRUP, HIGH);}
|
#define GMOD_CLEAR {mcp.digitalWrite(GMOD, LOW);}
|
||||||
#define PWRUP_CLEAR {mcp.digitalWrite(PWRUP, LOW);}
|
|
||||||
|
#define OE 0 //GPIOA0
|
||||||
#define VCOM 5 //GPIOA6
|
#define OE_SET {mcp.digitalWrite(OE, HIGH);}
|
||||||
#define VCOM_SET {mcp.digitalWrite(VCOM, HIGH);}
|
#define OE_CLEAR {mcp.digitalWrite(OE, LOW);}
|
||||||
#define VCOM_CLEAR {mcp.digitalWrite(VCOM, LOW);}
|
|
||||||
|
#define SPV 2 //GPIOA5
|
||||||
#define GDISP_SCREEN_HEIGHT 600
|
#define SPV_SET {mcp.digitalWrite(SPV, HIGH);}
|
||||||
#define CKV_CLOCK ckvClock();
|
#define SPV_CLEAR {mcp.digitalWrite(SPV, LOW);}
|
||||||
#define SCLOCK { CL_SET; CL_CLEAR; }
|
|
||||||
|
#define WAKEUP 3 //GPIOA3
|
||||||
#ifndef _swap_int16_t
|
#define WAKEUP_SET {mcp.digitalWrite(WAKEUP, HIGH);}
|
||||||
#define _swap_int16_t(a, b) { int16_t t = a; a = b; b = t; }
|
#define WAKEUP_CLEAR {mcp.digitalWrite(WAKEUP, LOW);}
|
||||||
#endif
|
|
||||||
|
#define PWRUP 4 //GPIOA4
|
||||||
#define BLACK 1
|
#define PWRUP_SET {mcp.digitalWrite(PWRUP, HIGH);}
|
||||||
#define WHITE 0
|
#define PWRUP_CLEAR {mcp.digitalWrite(PWRUP, LOW);}
|
||||||
#define GPIO0_ENABLE 8
|
|
||||||
#define REF_RATE 6
|
#define VCOM 5 //GPIOA6
|
||||||
#define INKPLATE_1BIT 0
|
#define VCOM_SET {mcp.digitalWrite(VCOM, HIGH);}
|
||||||
#define INKPLATE_3BIT 1
|
#define VCOM_CLEAR {mcp.digitalWrite(VCOM, LOW);}
|
||||||
#define PAD1 0
|
|
||||||
#define PAD2 1
|
#define CKV_CLOCK ckvClock();
|
||||||
#define PAD3 2
|
|
||||||
|
#ifndef _swap_int16_t
|
||||||
static void ckvClock();
|
#define _swap_int16_t(a, b) { int16_t t = a; a = b; b = t; }
|
||||||
static void usleep1();
|
#endif
|
||||||
|
|
||||||
class Inkplate : public Adafruit_GFX {
|
extern Adafruit_MCP23017 mcp;
|
||||||
public:
|
extern SPIClass spi2;
|
||||||
Inkplate(uint8_t _mode);
|
extern SdFat sd;
|
||||||
Inkplate();
|
static void ckvClock();
|
||||||
uint8_t* D_memory_new;
|
static void usleep1();
|
||||||
//uint8_t D_memory_new[600][100];
|
|
||||||
uint8_t* _partial;
|
class Inkplate : public Adafruit_GFX {
|
||||||
uint8_t* D_memory4Bit;
|
public:
|
||||||
uint8_t * _pBuffer;
|
uint8_t* D_memory_new;
|
||||||
const uint8_t LUT2[16] = {B10101010, B10101001, B10100110, B10100101, B10011010, B10011001, B10010110, B10010101, B01101010, B01101001, B01100110, B01100101, B01011010, B01011001, B01010110, B01010101};
|
uint8_t* _partial;
|
||||||
const uint8_t LUTW[16] = {B11111111, B11111110, B11111011, B11111010, B11101111, B11101110, B11101011, B11101010, B10111111, B10111110, B10111011, B10111010, B10101111, B10101110, B10101011, B10101010};
|
uint8_t* D_memory4Bit;
|
||||||
const uint8_t LUTB[16] = {B11111111, B11111101, B11110111, B11110101, B11011111, B11011101, B11010111, B11010101, B01111111, B01111101, B01110111, B01110101, B01011111, B01011101, B01010111, B01010101};
|
uint8_t * _pBuffer;
|
||||||
const uint8_t pixelMaskLUT[8] = {B00000001, B00000010, B00000100, B00001000, B00010000, B00100000, B01000000, B10000000};
|
const uint8_t LUT2[16] = {B10101010, B10101001, B10100110, B10100101, B10011010, B10011001, B10010110, B10010101, B01101010, B01101001, B01100110, B01100101, B01011010, B01011001, B01010110, B01010101};
|
||||||
//const uint8_t pixelMaskLUT[8] = {B10000000, B01000000, B00100000, B00010000, B00001000, B00000100, B00000010, B00000001};
|
const uint8_t LUTW[16] = {B11111111, B11111110, B11111011, B11111010, B11101111, B11101110, B11101011, B11101010, B10111111, B10111110, B10111011, B10111010, B10101111, B10101110, B10101011, B10101010};
|
||||||
const uint8_t pixelMaskGLUT[2] = {B00001111, B11110000};
|
const uint8_t LUTB[16] = {B11111111, B11111101, B11110111, B11110101, B11011111, B11011101, B11010111, B11010101, B01111111, B01111101, B01110111, B01110101, B01011111, B01011101, B01010111, B01010101};
|
||||||
const uint8_t pixel_to_epd_cmd[3] = {B00000001, B00000010, B00000011};
|
const uint8_t pixelMaskLUT[8] = {B00000001, B00000010, B00000100, B00001000, B00010000, B00100000, B01000000, B10000000};
|
||||||
//BLACK->WHITE
|
const uint8_t pixelMaskGLUT[2] = {B00001111, B11110000};
|
||||||
//WORKING! -> const uint8_t waveform3Bit[8][8] = {{0, 0, 1, 1, 1, 1, 1, 0}, {1, 1, 2, 2, 1, 1, 1, 0}, {0, 1, 1, 2, 1, 2, 1, 0}, {3, 3, 2, 2, 2, 1, 1, 0}, {2, 2, 2, 2, 3, 3, 1, 0}, {3, 3, 1, 1, 1, 2, 2, 3}, {0, 1, 1, 1, 2, 2, 2, 0}, {3, 3, 3, 3, 3, 2, 2, 0}};
|
const uint8_t discharge[16] = {B11111111, B11111100, B11110011, B11110000, B11001111, B11001100, B11000011, B11000000, B00111111, B00111100, B00110011, B00110000, B00001111, B00001100, B00000011, B00000000};
|
||||||
//BETTER WF -> const uint8_t waveform3Bit[8][12] = {{0, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 0}, {2, 1, 2, 1, 1, 0, 2, 1, 2, 1, 1}, {1, 2, 2, 2, 1, 1, 1, 3, 3, 3, 0}, {1, 1, 1, 2, 0, 1, 1, 1, 2, 3, 0}, {1, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2}, {0, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 0}, {1, 2, 2, 1, 2, 1, 2, 2, 1, 2, 0}, {3, 3, 3, 3, 3, 2, 3, 0, 2, 2, 3, 0}};
|
//BLACK->WHITE
|
||||||
const uint8_t waveform3Bit[8][12] = {{3, 3, 3, 1, 1, 1, 0, 0, 1, 1, 1, 1}, {1, 1, 2, 1, 2, 1, 1, 1, 2, 1, 2, 1}, {1, 2, 2, 2, 1, 1, 1, 3, 3, 3, 3}, {1, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2}, {0, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 3}, {1, 1, 1, 1, 1, 2, 1, 2, 2, 1, 2, 2}, {1, 2, 1, 2, 2, 0, 1, 2, 1, 2, 2}, {1, 2, 2, 2, 2, 0, 1, 2, 2, 2, 2}};
|
//THIS IS OKAYISH WAVEFORM FOR GRAYSCALE. IT CAN BE MUCH BETTER.
|
||||||
//const char partialBlack[] = {1, 1, 1, 1, 1, 3, 3, 3, 3, 3}
|
const uint8_t waveform3Bit[8][7] = {{0, 0, 0, 0, 1, 1, 1}, {0, 0, 1, 1, 1, 2, 1}, {0, 1, 1, 2, 1, 2, 1}, {0, 0, 1, 1, 2, 1, 2}, {1, 1, 1, 2, 2, 1, 2}, {0, 0, 1, 1, 1, 2, 2}, {0, 1, 1, 2, 1, 2, 2}, {0, 0, 0, 0, 0, 0, 2}};
|
||||||
//const char partialWhite[] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2};
|
//const uint8_t waveform3Bit[8][12] = {{3,3,3,1,1,1,1,1,1,1,2,0}, {3,3,3,3,1,1,1,1,1,1,2,0}, {3,3,3,3,3,1,1,1,1,1,2,0}, {3,3,3,3,3,3,1,1,1,1,2,0}, {3,3,3,3,3,3,3,1,1,1,2,0}, {3,3,3,3,3,3,3,2,1,1,2,0}, {3,3,3,3,3,3,3,3,3,1,2,0}, {3,3,3,3,3,3,3,3,3,3,2,0}};
|
||||||
|
//const uint8_t waveform3Bit[16][12] = {{0,0,0,0,0,0,1,2,1,1,0,3},{0,0,1,1,1,2,2,2,1,1,0,3},{0,0,0,1,1,2,2,2,1,1,0,3}, {0,0,0,1,2,1,2,1,2,1,3}, {0,0,2,1,2,1,2,1,2,1,3}, {0,0,1,2,2,1,1,1,1,2,0,3}, {0,0,0,2,1,1,1,1,0,2,0,3}, {0,0,2,1,2,2,1,1,1,2,0,3}, {0,0,0,2,2,2,1,1,1,2,0,3}, {0,0,0,0,0,0,2,1,1,2,0,3}, {0,0,0,0,0,2,2,1,1,2,0,3}, {0,0,0,0,0,1,1,1,2,2,0,3}, {0,0,0,0,1,2,1,2,1,2,0,3}, {0,0,0,0,1,1,2,2,1,2,0,3},{0,0,0,0,1,1,1,2,2,2,0,3}, {0,0,0,0,0,0,0,0,0,2,0,3}};
|
||||||
//PVI waveform for cleaning screen, not sure if it is correct, but it cleans screen properly.
|
//PVI waveform for cleaning screen, not sure if it is correct, but it cleans screen properly.
|
||||||
const uint32_t waveform[50] = {0x00000008, 0x00000008, 0x00200408, 0x80281888, 0x60a81898, 0x60a8a8a8, 0x60a8a8a8, 0x6068a868, 0x6868a868, 0x6868a868, 0x68686868, 0x6a686868, 0x5a686868, 0x5a686868, 0x5a586a68, 0x5a5a6a68, 0x5a5a6a68, 0x55566a68, 0x55565a64, 0x55555654, 0x55555556, 0x55555556, 0x55555556, 0x55555516, 0x55555596, 0x15555595, 0x95955595, 0x95959595, 0x95949495, 0x94949495, 0x94949495, 0xa4949494, 0x9494a4a4, 0x84a49494, 0x84948484, 0x84848484, 0x84848484, 0x84848484, 0xa5a48484, 0xa9a4a4a8, 0xa9a8a8a8, 0xa5a9a9a4, 0xa5a5a5a4, 0xa1a5a5a1, 0xa9a9a9a9, 0xa9a9a9a9, 0xa9a9a9a9, 0xa9a9a9a9, 0x15151515, 0x11111111};
|
const uint32_t waveform[50] = {0x00000008, 0x00000008, 0x00200408, 0x80281888, 0x60a81898, 0x60a8a8a8, 0x60a8a8a8, 0x6068a868, 0x6868a868, 0x6868a868, 0x68686868, 0x6a686868, 0x5a686868, 0x5a686868, 0x5a586a68, 0x5a5a6a68, 0x5a5a6a68, 0x55566a68, 0x55565a64, 0x55555654, 0x55555556, 0x55555556, 0x55555556, 0x55555516, 0x55555596, 0x15555595, 0x95955595, 0x95959595, 0x95949495, 0x94949495, 0x94949495, 0xa4949494, 0x9494a4a4, 0x84a49494, 0x84948484, 0x84848484, 0x84848484, 0x84848484, 0xa5a48484, 0xa9a4a4a8, 0xa9a8a8a8, 0xa5a9a9a4, 0xa5a5a5a4, 0xa1a5a5a1, 0xa9a9a9a9, 0xa9a9a9a9, 0xa9a9a9a9, 0xa9a9a9a9, 0x15151515, 0x11111111};
|
||||||
|
|
||||||
//Settings for contrast. Basicly, each element in array describes how many times each color is written to display (starting form darkest to lightest).
|
struct bitmapHeader {
|
||||||
//This is for 3 bit mode, but you can expant to 8 bit mode if you want, by adding more wariables, changing display seqence in display4Bit() and expanding the memory buffer size to double the current size.
|
uint16_t signature;
|
||||||
const uint8_t contrast_cycles[3] = {1, 4, 3};
|
uint32_t fileSize;
|
||||||
const uint8_t sz_contrast_cycles = sizeof(contrast_cycles) / sizeof(uint8_t);
|
uint32_t startRAW;
|
||||||
|
uint32_t dibHeaderSize;
|
||||||
void drawPixel(int16_t x0, int16_t y0, uint16_t color);
|
uint32_t width;
|
||||||
void begin(void);
|
uint32_t height;
|
||||||
void clearDisplay();
|
uint16_t color;
|
||||||
void display();
|
uint32_t compression;
|
||||||
void partialUpdate();
|
};
|
||||||
void draw_mode_off();
|
|
||||||
void draw_mode_on();
|
Inkplate(uint8_t _mode);
|
||||||
void advance_line();
|
void begin(void);
|
||||||
void begin_frame();
|
void drawPixel(int16_t x0, int16_t y0, uint16_t color);
|
||||||
void end_frame();
|
void clearDisplay();
|
||||||
void begin_line();
|
void display();
|
||||||
void end_line();
|
void partialUpdate();
|
||||||
void drawBitmap3Bit(int16_t _x, int16_t _y, const unsigned char* _p, int16_t _w, int16_t _h);
|
void drawBitmap3Bit(int16_t _x, int16_t _y, const unsigned char* _p, int16_t _w, int16_t _h);
|
||||||
void fillScreen(uint8_t c);
|
void setRotation(uint8_t);
|
||||||
void cleanFast(uint8_t c);
|
void einkOff(void);
|
||||||
void clean();
|
void einkOn(void);
|
||||||
void setRotation(uint8_t);
|
void selectDisplayMode(uint8_t _mode);
|
||||||
void einkOff(void);
|
uint8_t getDisplayMode();
|
||||||
void einkOn(void);
|
int drawBitmapFromSD(SdFile* p, int x, int y);
|
||||||
void selectDisplayMode(uint8_t _mode);
|
int drawBitmapFromSD(char* fileName, int x, int y);
|
||||||
uint8_t getDisplayMode();
|
int sdCardInit();
|
||||||
void end_line_slow();
|
SdFat getSdFat();
|
||||||
void pinsZstate();
|
SPIClass getSPI();
|
||||||
void pinsAsOutputs();
|
uint8_t getPanelState();
|
||||||
uint8_t getPanelState();
|
uint8_t readTouchpad(uint8_t);
|
||||||
uint8_t readTouchpad(uint8_t);
|
int8_t readTemperature();
|
||||||
int8_t readTemperature();
|
double readBattery();
|
||||||
double readBattery();
|
void vscan_start();
|
||||||
|
void vscan_write();
|
||||||
private:
|
void hscan_start(uint32_t _d = 0);
|
||||||
int8_t _temperature;
|
void vscan_end();
|
||||||
void display1b();
|
void clean();
|
||||||
void display3b();
|
void cleanFast(uint8_t c, uint8_t rep);
|
||||||
uint8_t _panelOn=0;
|
void cleanFast2(uint8_t c, uint8_t n, uint16_t d);
|
||||||
uint8_t _rotation = 0;
|
void pinsZstate();
|
||||||
uint16_t _tempRotation;
|
void pinsAsOutputs();
|
||||||
uint8_t _displayMode = 0; //By default, 1 bit mode is used
|
|
||||||
};
|
private:
|
||||||
|
uint8_t gammaLUT[256];
|
||||||
#endif
|
int8_t _temperature;
|
||||||
|
uint8_t _panelOn = 0;
|
||||||
|
uint8_t _rotation = 0;
|
||||||
|
uint8_t _displayMode = 0; //By default, 1 bit mode is used
|
||||||
|
int sdCardOk = 0;
|
||||||
|
uint8_t _blockPartial = 1;
|
||||||
|
uint8_t _beginDone = 0;
|
||||||
|
|
||||||
|
void display1b();
|
||||||
|
void display3b();
|
||||||
|
uint32_t read32(uint8_t* c);
|
||||||
|
uint16_t read16(uint8_t* c);
|
||||||
|
void readBmpHeader(SdFile *_f, struct bitmapHeader *_h);
|
||||||
|
int drawMonochromeBitmap(SdFile *f, struct bitmapHeader bmpHeader, int x, int y);
|
||||||
|
int drawGrayscaleBitmap24(SdFile *f, struct bitmapHeader bmpHeader, int x, int y);
|
||||||
|
void precalculateGamma(uint8_t* c, float gamma);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue