Change header inclusion order

Author: JosipKuci

src/boards/Inkplate10/Inkplate10Driver.cpp

@@ -1,8 +1,7 @@
-#include "Inkplate10Driver.h"
-#include "Inkplate.h"
-
 // Header guard for the Arduino include
 #ifdef ARDUINO_INKPLATE10V2
+#include "Inkplate10Driver.h"
+#include "Inkplate.h"
 
 SPIClass spi2(2);
 SdFat sd(&spi2);

src/boards/Inkplate5V2/Inkplate5V2Driver.cpp

@@ -1,8 +1,7 @@
-#include "Inkplate5V2Driver.h"
-#include "Inkplate.h"
-
 // Header guard for the Arduino include
 #ifdef ARDUINO_INKPLATE5V2
+#include "Inkplate5V2Driver.h"
+#include "Inkplate.h"
 
 SPIClass spi2(2);
 SdFat sd(&spi2);

src/boards/Inkplate5V2/Inkplate5V2Driver.h

@@ -1,9 +1,9 @@
-#ifndef __INKPLATE5V2DRIVER_H__
-#define __INKPLATE5V2DRIVER_H__
-
 // Header guard for the Arduino include
 #ifdef ARDUINO_INKPLATE5V2
 
+#ifndef __INKPLATE5V2DRIVER_H__
+#define __INKPLATE5V2DRIVER_H__
+
 // Inkplate Board name.
 #define INKPLATE_BOARD_NAME "Inkplate 5V2"
 

src/boards/Inkplate5V2/pins.h

@@ -1,9 +1,9 @@
+// Header guard for the Arduino include
+#ifdef ARDUINO_INKPLATE5V2
 #ifndef __INKPLATE5V2_PINS_H__
 #define __INKPLATE5V2_PINS_H__
 #include "soc/gpio_reg.h"
 #include "soc/gpio_struct.h"
-// Header guard for the Arduino include
-#ifdef ARDUINO_INKPLATE5V2
 #define IO_INT_ADDR 0x20
 
 // Pin on the internal io expander which controls MOSFET for turning on and off the SD card

src/boards/Inkplate5V2/waveforms.h

@@ -1,8 +1,7 @@
+#ifdef ARDUINO_INKPLATE5V2
 #ifndef __WAVEFROMS_INKPLATE_5V2_H__
 #define __WAVEFROMS_INKPLATE_5V2_H__
 
-#ifdef ARDUINO_INKPLATE5V2
-
 #define WAVEFORM3BIT                                                                                                   \
     {{0, 0, 1, 1, 2, 1, 1, 1, 0}, {1, 1, 2, 2, 1, 2, 1, 1, 0}, {0, 1, 2, 2, 1, 1, 2, 1, 0},                            \
      {0, 0, 1, 1, 1, 1, 1, 2, 0}, {1, 2, 1, 2, 1, 1, 1, 2, 0}, {0, 1, 1, 1, 2, 0, 1, 2, 0},                            \

src/boards/Inkplate6/Inkplate6Driver.cpp

@@ -1,7 +1,7 @@
-#include "Inkplate6Driver.h"
-#include "Inkplate.h"
 
 #ifdef ARDUINO_INKPLATE6V2
+#include "Inkplate6Driver.h"
+#include "Inkplate.h"
 
 SPIClass spi2(2);
 SdFat sd(&spi2);

src/boards/Inkplate6COLOR/Inkplate6COLORDriver.cpp

@@ -1,8 +1,7 @@
-#include "Inkplate6COLORDriver.h"
-#include "Inkplate.h"
-
 // Header guard for the Arduino include
 #ifdef ARDUINO_INKPLATECOLOR
+#include "Inkplate6COLORDriver.h"
+#include "Inkplate.h"
 
 SPIClass spi2(2);
 SdFat sd(&spi2);

src/boards/Inkplate6FLICK/Inkplate6FLICKDriver.cpp

@@ -1,8 +1,7 @@
+#ifdef ARDUINO_INKPLATE6FLICK
 #include "Inkplate6FLICKDriver.h"
 #include "Inkplate.h"
 
-#ifdef ARDUINO_INKPLATE6FLICK
-
 SPIClass spi2(2);
 SdFat sd(&spi2);