Merge branch 'dev' of https://github.com/e-radionicacom/Inkplate-Arduino-library into dev

gogi640 · gogi640 · commit beb9494c1d79 · 2022-02-08T09:44:55.000+01:00
diff --git a/src/Inkplate.cpp b/src/Inkplate.cpp
@@ -26,7 +26,9 @@ Inkplate::Inkplate() : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_W
 Inkplate::Inkplate(uint8_t _mode) : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_WIDTH, E_INK_HEIGHT)
 #endif
 {
+#ifndef ARDUINO_INKPLATECOLOR
     setDisplayMode(_mode);
+#endif
 }
 
 /**
diff --git a/src/boards/InkplateColor.h b/src/boards/InkplateColor.h
@@ -23,7 +23,7 @@
 // Connections between ESP32 and color Epaper
 #define EPAPER_RST_PIN  19
 #define EPAPER_DC_PIN   33
-#define EPAPER_CS_PIN   15
+#define EPAPER_CS_PIN   27
 #define EPAPER_BUSY_PIN 32
 #define EPAPER_CLK      18
 #define EPAPER_DIN      23

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ Inkplate::Inkplate() : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_W`
`26`	`26`	`Inkplate::Inkplate(uint8_t _mode) : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_WIDTH, E_INK_HEIGHT)`
`27`	`27`	`#endif`
`28`	`28`	`{`
	`29`	`+#ifndef ARDUINO_INKPLATECOLOR`
`29`	`30`	`setDisplayMode(_mode);`
	`31`	`+#endif`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`/**`