Skip to content

Commit

Permalink
Version 3.1.0
Browse files Browse the repository at this point in the history
- added support for GDEH0154D67 1.54" b/w, replacement for GDEP015OC1
- added example GxEPD_MinimumExample, e.g. for memory footprint
  • Loading branch information
ZinggJM committed May 8, 2020
1 parent 07e41a8 commit 39621c2
Show file tree
Hide file tree
Showing 15 changed files with 3,987 additions and 14 deletions.
7 changes: 4 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
### issues:
- please post only issues that are real issues with this library!
- please add all information according to the issue template
- issues are disabled because above rules were not obeyed

### pull requests:
- in general, I will not merge pull request
- pull requests are useful to inform users and me about interesting additions in forked repositories
- I will close or remove pull request at will
- I will not merge pull request. There may be exceptions to this. I may add (modified) fixes.
- pull requests are useful to inform users and me about interesting additions in forked repositories.
- I will close or remove pull request at will.

## Thank you for all the inspiration I get for this library.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ A simple E-Paper display library with common base class and separate IO class fo
- Good Dispay ePaper for Arduino : https://forum.arduino.cc/index.php?topic=436411.0

### Supported SPI e-paper panels from Good Display:
- GDEP015OC1 1.54" b/w
- GDEP015OC1 1.54" b/w 200x200
- GDEH0154D67 1.54" b/w 200x200 replacement for GDEP015OC1
- GDEW0154Z04 1.54" b/w/r 200x200
- GDEW0154Z17 1.54" b/w/r 152x152
- GDE0213B1 2.13" b/w
Expand Down Expand Up @@ -65,7 +66,10 @@ A simple E-Paper display library with common base class and separate IO class fo

### for pin mapping suggestions see ConnectingHardware.md

### Version 3.0.9
### Version 3.1.0
- added support for GDEH0154D67 1.54" b/w, replacement for GDEP015OC1
- added example GxEPD_MinimumExample, e.g. for memory footprint
#### Version 3.0.9
- fixed BMP handling, e.g. for BMPs created by ImageMagick
- see also Arduino Forum Topic https://forum.arduino.cc/index.php?topic=642343.0
- added support for GDEW075T7 7.5" b/w 800x480
Expand Down
18 changes: 17 additions & 1 deletion examples/GxEPD_Example/GxEPD_Example.ino
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

// select the display class to use, only one
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
//#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
//#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
Expand Down Expand Up @@ -199,6 +200,21 @@ void showBitmapExample()
}
#endif

#if defined(_GxGDEH0154D67_H_)
void showBitmapExample()
{
display.drawExampleBitmap(BitmapExample1, sizeof(BitmapExample1));
delay(2000);
display.drawExampleBitmap(BitmapExample2, sizeof(BitmapExample2));
delay(5000);
display.fillScreen(GxEPD_WHITE);
display.drawExampleBitmap(BitmapExample1, 0, 0, GxEPD_WIDTH, GxEPD_HEIGHT, GxEPD_BLACK);
display.update();
delay(5000);
showBoat();
}
#endif

#if defined(_GxGDEW0154Z04_H_)
#define HAS_RED_COLOR
void showBitmapExample()
Expand Down Expand Up @@ -657,7 +673,7 @@ void drawCornerTest()
display.setRotation(rotation); // restore
}

#if defined(_GxGDEP015OC1_H_) || defined(_GxGDE0213B1_H_) || defined(_GxGDEH0213B72_H_) || defined(_GxGDEH0213B73_H_)|| defined(_GxGDEH029A1_H_)
#if defined(_GxGDEP015OC1_H_) || defined(_GxGDEH0154D67_H_) || defined(_GxGDE0213B1_H_) || defined(_GxGDEH0213B72_H_) || defined(_GxGDEH0213B73_H_)|| defined(_GxGDEH029A1_H_)
#include "IMG_0001.h"
void showBoat()
{
Expand Down
29 changes: 29 additions & 0 deletions examples/GxEPD_MinimumExample/GxEPD_MinimumExample.ino
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// GxEPD_MinimumExample by Jean-Marc Zingg

#include <GxEPD.h>

// select the display class to use, only one, copy from GxEPD_Example
#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w

#include <GxIO/GxIO_SPI/GxIO_SPI.h>
#include <GxIO/GxIO.h>

// constructor for AVR Arduino, copy from GxEPD_Example else
GxIO_Class io(SPI, /*CS=*/ SS, /*DC=*/ 8, /*RST=*/ 9); // arbitrary selection of 8, 9 selected for default of GxEPD_Class
GxEPD_Class display(io, /*RST=*/ 9, /*BUSY=*/ 7); // default selection of (9), 7

void setup()
{
display.init();
display.eraseDisplay();
// comment out next line to have no or minimal Adafruit_GFX code
display.drawPaged(drawHelloWorld); // version for AVR using paged drawing, works also on other processors
}

void drawHelloWorld()
{
display.setTextColor(GxEPD_BLACK);
display.print("Hello World!");
}

void loop() {};
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

// select the display classes to use
#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
#include <GxGDE0213B1/GxGDE0213B1.h> // 2.13" b/w
Expand Down Expand Up @@ -387,6 +388,3 @@ void showFont(GxEPD& display, const char name[], const GFXfont* f)
display.update();
delay(5000);
}



1 change: 1 addition & 0 deletions examples/GxEPD_SD_Example/GxEPD_SD_Example.ino
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ SdFat SD;

// select the display class to use, only one
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
//#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
//#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
Expand Down
1 change: 1 addition & 0 deletions examples/GxEPD_WiFi_Example/GxEPD_WiFi_Example.ino
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

// select the display class to use, only one
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
//#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
//#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
Expand Down
1 change: 1 addition & 0 deletions examples/GxFont_GFX_Example/GxFont_GFX_Example.ino
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@

// select the display class to use, only one
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
//#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
//#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

// select the display class to use, only one
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
//#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
//#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
Expand Down
1 change: 1 addition & 0 deletions examples/PartialUpdateExample/PartialUpdateExample.ino
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

// select the display class to use, only one
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
//#include <GxGDE0213B1/GxGDE0213B1.h> // 2.13" b/w
//#include <GxGDEH0213B72/GxGDEH0213B72.h> // 2.13" b/w new panel
Expand Down
7 changes: 3 additions & 4 deletions examples/PartialUpdateTest/PartialUpdateTest.ino
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
#include <GxEPD.h>

// select the display class to use, only one
#include <GxGDEP015OC1/GxGDEP015OC1.h>
//#include <GxGDEP015OC1/GxGDEP015OC1.h>
#include <GxGDEH0154D67/GxGDEH0154D67.h>
//#include <GxGDE0213B1/GxGDE0213B1.h>
//#include <GxGDEH029A1/GxGDEH029A1.h>
//#include <GxGDEW042T2/GxGDEW042T2.h>
Expand Down Expand Up @@ -99,7 +100,7 @@ GxEPD_Class display(io /*RST=9*/ /*BUSY=7*/); // default selection of (9), 7

#endif

#if defined(_GxGDEP015OC1_H_)
#if defined(_GxGDEP015OC1_H_) || defined(_GxGDEH0154D67_H_)
const uint32_t partial_update_period_s = 1;
const uint32_t full_update_period_s = 6 * 60 * 60;
#elif defined(_GxGDE0213B1_H_) || defined(_GxGDEH029A1_H_) || defined(_GxGDEW042T2_H_)
Expand Down Expand Up @@ -227,5 +228,3 @@ void showPartialUpdate_AVR()
}

#endif


2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=GxEPD
version=3.0.9
version=3.1.0
author=Jean-Marc Zingg
maintainer=Jean-Marc Zingg
sentence=Display Library for SPI e-paper panels from Dalian Good Display and boards from Waveshare.
Expand Down
Loading

0 comments on commit 39621c2

Please sign in to comment.