diff --git a/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp b/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp index fac803b53..7f368c5d5 100644 --- a/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp +++ b/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp @@ -72,7 +72,7 @@ void Adafruit_SH1106::DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font) { //} } -int16_t Adafruit_SH1106::Begin(int16_t p1,int16_t p2,int16_t p3) { +void Adafruit_SH1106::Begin(int16_t p1,int16_t p2,int16_t p3) { begin(p1,p2,p3); } diff --git a/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h b/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h index b0562629b..efa14e8f1 100644 --- a/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h +++ b/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h @@ -144,7 +144,7 @@ class Adafruit_SH1106 : public Renderer { void DisplayOnff(int8_t on); void DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font); - int16_t Begin(int16_t p1,int16_t p2,int16_t p3); + void Begin(int16_t p1,int16_t p2,int16_t p3); void Updateframe(); void dim(uint8_t contrast); diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp index 81fa618a8..556f9624f 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp @@ -77,11 +77,10 @@ void Epd::DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font) { fillScreen(BLACK); } -int16_t Epd::Begin(int16_t cs,int16_t mosi,int16_t sclk) { +void Epd::Begin(int16_t cs,int16_t mosi,int16_t sclk) { cs_pin=cs; mosi_pin=mosi; sclk_pin=sclk; - return 0; } diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h index 3fc8ea190..bf0863cd0 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h @@ -91,7 +91,7 @@ public: void DisplayOnff(int8_t on); void DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font); - int16_t Begin(int16_t p1,int16_t p2,int16_t p3); + void Begin(int16_t p1,int16_t p2,int16_t p3); void Updateframe(); private: diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp index 923e72106..85da5848d 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp @@ -90,11 +90,10 @@ void Epd42::DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font) { fillScreen(BLACK); } -int16_t Epd42::Begin(int16_t cs,int16_t mosi,int16_t sclk) { +void Epd42::Begin(int16_t cs,int16_t mosi,int16_t sclk) { cs_pin=cs; mosi_pin=mosi; sclk_pin=sclk; - return 0; } void Epd42::Init(int8_t p) { diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h index 9b140c0d8..1ca993873 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h @@ -113,7 +113,7 @@ public: void DisplayOnff(int8_t on); void DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font); - int16_t Begin(int16_t p1,int16_t p2,int16_t p3); + void Begin(int16_t p1,int16_t p2,int16_t p3); void Updateframe(); private: diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp index d201c3d63..4d27e00a4 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp @@ -37,8 +37,7 @@ Renderer(width,height) { void Paint::DisplayOnff(int8_t on) { } -int16_t Paint::Begin(int16_t p1,int16_t p2,int16_t p3) { - return 0; +void Paint::Begin(int16_t p1,int16_t p2,int16_t p3) { } void Paint::Updateframe() { diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h index c70d762d1..b54634f74 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h @@ -49,7 +49,7 @@ public: void DisplayOnff(int8_t on); void DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font); - int16_t Begin(int16_t p1,int16_t p2,int16_t p3); + void Begin(int16_t p1,int16_t p2,int16_t p3); void Updateframe(); }; diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp index 722d5ffb1..01b8dc7c3 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp @@ -71,12 +71,13 @@ void Renderer::setAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) void Renderer::DisplayOnff(int8_t on) { } + void Renderer::DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font) { } -int16_t Renderer::Begin(int16_t p1,int16_t p2,int16_t p3) { - return 0; +void Renderer::Begin(int16_t p1,int16_t p2,int16_t p3) { + } void Renderer::Updateframe() { diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h index 3f87f2a89..09347ae29 100644 --- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h +++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h @@ -30,7 +30,7 @@ public: virtual void DisplayOnff(int8_t on); virtual void DisplayInit(int8_t p,int8_t size,int8_t rot,int8_t font); - virtual int16_t Begin(int16_t p1,int16_t p2,int16_t p3); + virtual void Begin(int16_t p1,int16_t p2,int16_t p3); virtual void Updateframe(); virtual void dim(uint8_t contrast); virtual void pushColors(uint16_t *data, uint8_t len, boolean first);