Skip to content

Commit

Permalink
#78 Thanks @gooddisplayepaper class is renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinberlin
martinberlin committed Jan 12, 2023
1 parent b44ed17 commit a3d7feb
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion components/CalEPD/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(srcs
"models/heltec0151.cpp"

# SMALL epapers
"models/small/gdew0102I4FC.cpp"
"models/small/gdew0102I3F.cpp"

# 3 colors Goodisplay
"models/color/gdeh0154z90.cpp"
Expand Down
16 changes: 8 additions & 8 deletions ...nents/CalEPD/include/small/gdew0102I4FC.h → ...onents/CalEPD/include/small/gdew0102I3F.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
#include <gdew_4grays.h>
#include <esp_timer.h>

#define GDEW0102I4FC_WIDTH 80
#define GDEW0102I4FC_HEIGHT 128
#define GDEW0102I4FC_BUFFER_SIZE (uint32_t(GDEW0102I4FC_WIDTH) * uint32_t(GDEW0102I4FC_HEIGHT) / 8)
#define GDEW0102I3F_WIDTH 80
#define GDEW0102I3F_HEIGHT 128
#define GDEW0102I3F_BUFFER_SIZE (uint32_t(GDEW0102I3F_WIDTH) * uint32_t(GDEW0102I3F_HEIGHT) / 8)

#define GDEW0102I4FC_8PIX_BLACK 0x00
#define GDEW0102I4FC_8PIX_WHITE 0xFF
#define GDEW0102I3F_8PIX_BLACK 0x00
#define GDEW0102I3F_8PIX_WHITE 0xFF

class Gdew0102I4FC : public Epd
class Gdew0102I3F : public Epd
{
public:
// & Copy contructor: Copying the injected IO into our class so we can access IO methods
Gdew0102I4FC(EpdSpi& IO);
Gdew0102I3F(EpdSpi& IO);
uint8_t colors_supported = 1;

// EPD tests
Expand All @@ -41,7 +41,7 @@ class Gdew0102I4FC : public Epd
private:
EpdSpi& IO;

uint8_t _black_buffer[GDEW0102I4FC_BUFFER_SIZE];
uint8_t _black_buffer[GDEW0102I3F_BUFFER_SIZE];

bool _initial = true;

Expand Down
86 changes: 43 additions & 43 deletions ...ents/CalEPD/models/small/gdew0102I4FC.cpp → ...nents/CalEPD/models/small/gdew0102I3F.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "small/gdew0102I4FC.h"
#include "small/gdew0102I3F.h"
#include <stdio.h>
#include <stdlib.h>
#include "esp_log.h"
Expand All @@ -8,19 +8,19 @@
#include <inttypes.h>

// Constructor
Gdew0102I4FC::Gdew0102I4FC(EpdSpi& dio):
Adafruit_GFX(GDEW0102I4FC_WIDTH, GDEW0102I4FC_HEIGHT),
Epd(GDEW0102I4FC_WIDTH, GDEW0102I4FC_HEIGHT), IO(dio)
Gdew0102I3F::Gdew0102I3F(EpdSpi& dio):
Adafruit_GFX(GDEW0102I3F_WIDTH, GDEW0102I3F_HEIGHT),
Epd(GDEW0102I3F_WIDTH, GDEW0102I3F_HEIGHT), IO(dio)
{
printf("Gdew0102I4FC() constructor injects IO and extends Adafruit_GFX(%d,%d)\n",
GDEW0102I4FC_WIDTH, GDEW0102I4FC_HEIGHT);
printf("Gdew0102I3F() constructor injects IO and extends Adafruit_GFX(%d,%d)\n",
GDEW0102I3F_WIDTH, GDEW0102I3F_HEIGHT);
}

//Initialize the display
void Gdew0102I4FC::init(bool debug)
void Gdew0102I3F::init(bool debug)
{
debug_enabled = debug;
if (debug_enabled) printf("Gdew0102I4FC::init(%d) and reset EPD\n", debug);
if (debug_enabled) printf("Gdew0102I3F::init(%d) and reset EPD\n", debug);
//Initialize the Epaper and reset it
IO.init(4, debug); // 4MHz frequency, debug

Expand All @@ -31,7 +31,7 @@ void Gdew0102I4FC::init(bool debug)
}


void Gdew0102I4FC::_wakeUp(){
void Gdew0102I3F::_wakeUp(){

IO.reset(10);

Expand All @@ -49,7 +49,7 @@ void Gdew0102I4FC::_wakeUp(){
IO.data(0x97);
}

void Gdew0102I4FC::_wakeUpPart(){
void Gdew0102I3F::_wakeUpPart(){
_using_partial_mode = true;
IO.reset(10);

Expand All @@ -72,7 +72,7 @@ void Gdew0102I4FC::_wakeUpPart(){
_waitBusy("epd_wakeup");; //waiting for the electronic paper IC to release the idle signal
}

void Gdew0102I4FC::_waitBusy(const char* message){
void Gdew0102I3F::_waitBusy(const char* message){
if (debug_enabled) {
ESP_LOGI(TAG, "_waitBusy for %s", message);
}
Expand All @@ -89,7 +89,7 @@ void Gdew0102I4FC::_waitBusy(const char* message){
}
}

void Gdew0102I4FC::_sleep(){
void Gdew0102I3F::_sleep(){
IO.cmd(0X50); //VCOM AND DATA INTERVAL SETTING
IO.data(0xf7);

Expand All @@ -99,28 +99,28 @@ void Gdew0102I4FC::_sleep(){
IO.data(0xA5);
}

void Gdew0102I4FC::_rotate(uint16_t& x, uint16_t& y, uint16_t& w, uint16_t& h)
void Gdew0102I3F::_rotate(uint16_t& x, uint16_t& y, uint16_t& w, uint16_t& h)
{
switch (getRotation())
{
case 1:
swap(x, y);
swap(w, h);
x = GDEW0102I4FC_WIDTH - x - w - 1;
x = GDEW0102I3F_WIDTH - x - w - 1;
break;
case 2:
x = GDEW0102I4FC_WIDTH - x - w - 1;
y = GDEW0102I4FC_HEIGHT - y - h - 1;
x = GDEW0102I3F_WIDTH - x - w - 1;
y = GDEW0102I3F_HEIGHT - y - h - 1;
break;
case 3:
swap(x, y);
swap(w, h);
y = GDEW0102I4FC_HEIGHT - y - h - 1;
y = GDEW0102I3F_HEIGHT - y - h - 1;
break;
}
}

void Gdew0102I4FC::update()
void Gdew0102I3F::update()
{
uint64_t startTime = esp_timer_get_time();
_using_partial_mode = false;
Expand All @@ -130,22 +130,22 @@ void Gdew0102I4FC::update()
// BLACK: Write RAM for black(0)/white (1)
// v2 SPI optimizing. Check: https://github.com/martinberlin/cale-idf/wiki/About-SPI-optimization
uint16_t i = 0;
uint8_t xLineBytes = GDEW0102I4FC_WIDTH/8;
uint8_t xLineBytes = GDEW0102I3F_WIDTH/8;
uint8_t x1buf[xLineBytes];

// Note that in IC specs is 0x10 old data (?) and 0x13 new
IO.cmd(0x10);
uint8_t full_buff[GDEW0102I4FC_BUFFER_SIZE];
for(uint16_t y = 0; y < GDEW0102I4FC_BUFFER_SIZE; y++) {
uint8_t full_buff[GDEW0102I3F_BUFFER_SIZE];
for(uint16_t y = 0; y < GDEW0102I3F_BUFFER_SIZE; y++) {
full_buff[y] = 0xFF;
}
IO.data(full_buff, GDEW0102I4FC_BUFFER_SIZE);
IO.data(full_buff, GDEW0102I3F_BUFFER_SIZE);

// BLACK new data: Write RAM
IO.cmd(0x13);
for(uint16_t y = 1; y <= GDEW0102I4FC_HEIGHT; y++) {
for(uint16_t y = 1; y <= GDEW0102I3F_HEIGHT; y++) {
for(uint16_t x = 1; x <= xLineBytes; x++) {
uint8_t data = i < sizeof(_black_buffer) ? _black_buffer[i] : GDEW0102I4FC_8PIX_WHITE;
uint8_t data = i < sizeof(_black_buffer) ? _black_buffer[i] : GDEW0102I3F_8PIX_WHITE;
x1buf[x-1] = data;
if (x==xLineBytes) { // Flush the X line buffer to SPI
IO.data(x1buf,sizeof(x1buf));
Expand All @@ -166,24 +166,24 @@ void Gdew0102I4FC::update()
_sleep();
}

void Gdew0102I4FC::drawPixel(int16_t x, int16_t y, uint16_t color) {
void Gdew0102I3F::drawPixel(int16_t x, int16_t y, uint16_t color) {
if ((x < 0) || (x >= width()) || (y < 0) || (y >= height())) return;
switch (getRotation())
{
case 1:
swap(x, y);
x = GDEW0102I4FC_WIDTH - x - 1;
x = GDEW0102I3F_WIDTH - x - 1;
break;
case 2:
x = GDEW0102I4FC_WIDTH - x - 1;
y = GDEW0102I4FC_HEIGHT - y - 1;
x = GDEW0102I3F_WIDTH - x - 1;
y = GDEW0102I3F_HEIGHT - y - 1;
break;
case 3:
swap(x, y);
y = GDEW0102I4FC_HEIGHT - y - 1;
y = GDEW0102I3F_HEIGHT - y - 1;
break;
}
uint16_t i = x / 8 + y * GDEW0102I4FC_WIDTH / 8;
uint16_t i = x / 8 + y * GDEW0102I3F_WIDTH / 8;

if (!color) {
_black_buffer[i] = (_black_buffer[i] & (0xFF ^ (1 << (7 - x % 8))));
Expand All @@ -193,13 +193,13 @@ void Gdew0102I4FC::drawPixel(int16_t x, int16_t y, uint16_t color) {
}


void Gdew0102I4FC::fillScreen(uint16_t color)
void Gdew0102I3F::fillScreen(uint16_t color)
{
// Fill screen will be inverted with the way is done NOW
uint8_t fill = GDEW0102I4FC_8PIX_WHITE;
uint8_t fill = GDEW0102I3F_8PIX_WHITE;

if (color == EPD_BLACK) {
fill = GDEW0102I4FC_8PIX_BLACK;
fill = GDEW0102I3F_8PIX_BLACK;
}

for (uint16_t x = 0; x < sizeof(_black_buffer); x++)
Expand All @@ -210,7 +210,7 @@ void Gdew0102I4FC::fillScreen(uint16_t color)
if (debug_enabled) printf("fillScreen(%x) black len:%d\n", fill, sizeof(_black_buffer));
}

void Gdew0102I4FC::_setPartialRamArea(uint16_t x, uint16_t y, uint16_t xe, uint16_t ye)
void Gdew0102I3F::_setPartialRamArea(uint16_t x, uint16_t y, uint16_t xe, uint16_t ye)
{
uint16_t w = (x + xe - 1) | 0x0007; // byte boundary inclusive (last byte)
uint16_t h = y + ye - 1;
Expand All @@ -223,23 +223,23 @@ void Gdew0102I4FC::_setPartialRamArea(uint16_t x, uint16_t y, uint16_t xe, uint1
IO.data(0x00);
}

void Gdew0102I4FC::updateWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h, bool using_rotation) {
void Gdew0102I3F::updateWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h, bool using_rotation) {
//printf("updateWindow is still not implemented\n");

if (using_rotation) _rotate(x, y, w, h);
if (x >= GDEW0102I4FC_WIDTH) {
if (x >= GDEW0102I3F_WIDTH) {
ESP_LOGE(TAG, "Given width exceeds display");
return;
}
if (y >= GDEW0102I4FC_HEIGHT) {
if (y >= GDEW0102I3F_HEIGHT) {
ESP_LOGE(TAG, "Given height exceeds display");
return;
}
if (!_using_partial_mode) {
_wakeUpPart();
}
uint16_t xe = gx_uint16_min(GDEW0102I4FC_WIDTH, x + w) - 1;
uint16_t ye = gx_uint16_min(GDEW0102I4FC_HEIGHT, y + h) - 1;
uint16_t xe = gx_uint16_min(GDEW0102I3F_WIDTH, x + w) - 1;
uint16_t ye = gx_uint16_min(GDEW0102I3F_HEIGHT, y + h) - 1;
uint16_t xs_bx = x / 8;
uint16_t xe_bx = (xe + 7) / 8;
uint8_t w1 = w;
Expand All @@ -254,18 +254,18 @@ void Gdew0102I4FC::updateWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h,

// NO need to fill 0x10 buffer or send it for partial
/* IO.cmd(0x10);
uint8_t full_buff[GDEW0102I4FC_BUFFER_SIZE];
for(uint16_t y = 0; y < GDEW0102I4FC_BUFFER_SIZE; y++) {
uint8_t full_buff[GDEW0102I3F_BUFFER_SIZE];
for(uint16_t y = 0; y < GDEW0102I3F_BUFFER_SIZE; y++) {
full_buff[y] = 0xFF;
}
IO.data(full_buff, GDEW0102I4FC_BUFFER_SIZE); */
IO.data(full_buff, GDEW0102I3F_BUFFER_SIZE); */
// New data
IO.cmd(0x13);
for (int16_t y1 = y; y1 <= ye+1; y1++)
{
for (int16_t x1 = xs_bx; x1 < xe_bx; x1++)
{
uint16_t idx = y1 * (GDEW0102I4FC_WIDTH/ 8) + x1;
uint16_t idx = y1 * (GDEW0102I3F_WIDTH/ 8) + x1;
IO.data(_black_buffer[idx]); // white is 0xFF on device
}
}
Expand Down
4 changes: 2 additions & 2 deletions main/demos/small/small-display.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
// Should match with your epaper module, size

// New small GOODISPLAY models
#include "small/gdew0102I4FC.h"
#include "small/gdew0102I3F.h"


// Single SPI EPD
EpdSpi io;
Gdew0102I4FC display(io);
Gdew0102I3F display(io);


// FONT used for title / message body - Only after display library
Expand Down

0 comments on commit a3d7feb

Please sign in to comment.