Merge branch 'inkplate-library-restructure' of https://github.com/SolderedElectronics/Inkplate-Arduino-library into inkplate-library-restructure

Author: JosipKuci

src/Inkplate.cpp

@@ -22,7 +22,7 @@
 //--------------------------USER FUNCTIONS--------------------------------------------
 Inkplate::Inkplate(uint8_t mode) : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_WIDTH, E_INK_HEIGHT)
 {
-    _mode=mode;
+    _mode = mode;
 }
 
 void Inkplate::begin()
@@ -39,15 +39,14 @@ void Inkplate::begin()
     // Init low level driver for EPD.
     initDriver(this);
 
-    //Forward the display mode to the EPD driver
+    // Forward the display mode to the EPD driver
     selectDisplayMode(_mode);
 
     // Clean frame buffers.
     clearDisplay();
 
     // Block multiple inits.
     _beginDone = 1;
-
 }
 void Inkplate::writePixel(int16_t x, int16_t y, uint16_t color)
 {
@@ -92,6 +91,8 @@ void Inkplate::writePixel(int16_t x, int16_t y, uint16_t color)
 
 void Inkplate::drawPixel(int16_t x, int16_t y, uint16_t color)
 {
-    writePixel(x,y,color);
+    writePixel(x, y, color);
 }
-void Inkplate::setRotation(uint8_t r){}
+void Inkplate::setRotation(uint8_t r)
+{
+}

src/Inkplate.h

@@ -21,23 +21,22 @@
 #define __INKPLATE_H__
 
 #include "Arduino.h"
-#include "Wire.h"
 #include "SPI.h"
+#include "Wire.h"
 #include "graphics/Graphics.h"
 #include "system/NetworkController/NetworkController.h"
 #include "system/defines.h"
 #include "system/InkplateBoards.h"
 #include "boardSelect.h"
 
-
 class Inkplate : public Graphics, public InkplateBoardClass, public NetworkController
 {
   public:
     Inkplate(uint8_t mode);
     void begin();
     void drawPixel(int16_t x, int16_t y, uint16_t color);
     void setRotation(uint8_t r);
-    
+
 
   protected:
   private:

src/boards/Inkplate10/Inkplate10Driver.cpp

@@ -58,7 +58,7 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
         pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
                     (((i & B11100000) >> 5) << 25);
 
-    for(int i = 0; i < 15; i++)
+    for (int i = 0; i < 15; i++)
     {
         externalIO.pinMode( i, OUTPUT);
         externalIO.digitalWrite( i, LOW);
@@ -536,7 +536,7 @@ int EPDDriver::einkOn()
     OE_CLEAR;
     PWRUP_SET;
     setPanelState(1);
-    
+
     unsigned long timer = millis();
     do
     {
@@ -615,7 +615,7 @@ uint8_t EPDDriver::getPanelState()
 }
 void EPDDriver::setPanelState(uint8_t state)
 {
-    _panelState=state;
+    _panelState = state;
 }
 
 /**

src/boards/Inkplate10/Inkplate10Driver.h

@@ -35,14 +35,14 @@ class Inkplate;
 
 class EPDDriver:public RTC
 {
-    public: 
-        int initDriver(Inkplate *_inkplatePtr);
-        void display(bool _leaveOn = 0);
-        void selectDisplayMode(uint8_t displayMode);
-        void clearDisplay();
-        uint32_t partialUpdate(bool _forced = false, bool leaveOn = false);
-        void setFullUpdateThreshold(uint16_t _numberOfPartialUpdates);
-        uint8_t getDisplayMode();
+  public:
+    int initDriver(Inkplate *_inkplatePtr);
+    void display(bool _leaveOn = 0);
+    void selectDisplayMode(uint8_t displayMode);
+    void clearDisplay();
+    uint32_t partialUpdate(bool _forced = false, bool leaveOn = false);
+    void setFullUpdateThreshold(uint16_t _numberOfPartialUpdates);
+    uint8_t getDisplayMode();
 
 
         void setSdCardOk(int16_t s);
@@ -60,8 +60,8 @@ class EPDDriver:public RTC
         IOExpander internalIO;
         IOExpander externalIO;
 
-        uint8_t _beginDone = 0;
-        uint8_t _displayMode;
+    uint8_t _beginDone = 0;
+    uint8_t _displayMode;
 
 
         uint32_t pinLUT[256];
@@ -78,23 +78,22 @@ class EPDDriver:public RTC
         int16_t _sdCardOk = 0;
 
 
-
-    private:
-        void calculateLUTs();
-        uint8_t readPowerGood();
-        void pinsAsOutputs();
-        int einkOn();
-        void einkOff();
-        void display1b(bool _leaveOn);
-        void display3b(bool _leaveOn);
-        void pinsZstate();
-        uint8_t getPanelState();
-        void setPanelState(uint8_t state);
-        void clean(uint8_t c, uint8_t rep);
-        void vscan_start();
-        void hscan_start(uint32_t _d);
-        void vscan_end();
-        uint8_t _panelState = 0;
+  private:
+    void calculateLUTs();
+    uint8_t readPowerGood();
+    void pinsAsOutputs();
+    int einkOn();
+    void einkOff();
+    void display1b(bool _leaveOn);
+    void display3b(bool _leaveOn);
+    void pinsZstate();
+    uint8_t getPanelState();
+    void setPanelState(uint8_t state);
+    void clean(uint8_t c, uint8_t rep);
+    void vscan_start();
+    void hscan_start(uint32_t _d);
+    void vscan_end();
+    uint8_t _panelState = 0;
 };
 
 #endif