pull in new epaper lib (which required importing configuration.h everywhere

for dumb reasons)

platformio.ini

@@ -357,11 +357,11 @@ board = t-echo
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
 # -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
-build_flags = ${nrf52_base.build_flags} -Ivariants/t-echo
+build_flags = ${nrf52_base.build_flags} -Ivariants/t-echo 
 src_filter = ${nrf52_base.src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/geeksville/EPD_Libraries.git
+  https://github.com/geeksville/GxEPD2.git
 ;upload_protocol = fs
 
 ; First prototype eink/nrf52840/sx1262 device (removed from build because didn't ship in quantity)

src/BluetoothCommon.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "BluetoothCommon.h"
 
 // NRF52 wants these constants as byte arrays

src/FSCommon.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "FSCommon.h"
 
 void fsInit()

src/OSTimer.cpp

@@ -1,5 +1,5 @@
-#include "OSTimer.h"
 #include "configuration.h"
+#include "OSTimer.h"
 
 /**
  * Schedule a callback to run.  The callback must _not_ block, though it is called from regular thread level (not ISR)

src/Observer.cpp

@@ -1,2 +1,3 @@
+#include "configuration.h"
 #include "Observer.h"
 

src/Power.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "power.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"

src/PowerFSM.cpp

@@ -1,9 +1,8 @@
-
+#include "configuration.h"
 #include "PowerFSM.h"
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "configuration.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "sleep.h"

src/RedirectablePrint.cpp

@@ -1,7 +1,7 @@
+#include "configuration.h"
 #include "RedirectablePrint.h"
 #include "RTC.h"
 #include "concurrency/OSThread.h"
-#include "configuration.h"
 #include <assert.h>
 #include <sys/time.h>
 #include <time.h>

src/SPILock.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "SPILock.h"
 #include <Arduino.h>
 #include <assert.h>

src/SerialConsole.cpp

@@ -1,8 +1,7 @@
+#include "configuration.h"
 #include "SerialConsole.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
-#include "configuration.h"
-#include <Arduino.h>
 
 #define Port Serial
 

src/airtime.cpp

@@ -1,5 +1,5 @@
+#include "configuration.h"
 #include "airtime.h"
-#include <Arduino.h>
 
 #define periodsToLog 48
 

src/concurrency/BinarySemaphoreFreeRTOS.cpp

@@ -1,5 +1,5 @@
-#include "concurrency/BinarySemaphoreFreeRTOS.h"
 #include "configuration.h"
+#include "concurrency/BinarySemaphoreFreeRTOS.h"
 #include <assert.h>
 
 #ifdef HAS_FREE_RTOS

src/concurrency/BinarySemaphorePosix.cpp

@@ -1,5 +1,5 @@
-#include "concurrency/BinarySemaphorePosix.h"
 #include "configuration.h"
+#include "concurrency/BinarySemaphorePosix.h"
 
 #ifndef HAS_FREE_RTOS
 

src/concurrency/InterruptableDelay.cpp

@@ -1,5 +1,5 @@
-#include "concurrency/InterruptableDelay.h"
 #include "configuration.h"
+#include "concurrency/InterruptableDelay.h"
 
 namespace concurrency
 {

src/concurrency/Lock.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "Lock.h"
 #include <cassert>
 

src/concurrency/LockGuard.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "LockGuard.h"
 
 namespace concurrency {

src/concurrency/NotifiedWorkerThread.cpp

@@ -1,5 +1,5 @@
-#include "NotifiedWorkerThread.h"
 #include "configuration.h"
+#include "NotifiedWorkerThread.h"
 #include "main.h"
 #include <assert.h>
 

src/concurrency/OSThread.cpp

@@ -1,5 +1,5 @@
-#include "OSThread.h"
 #include "configuration.h"
+#include "OSThread.h"
 #include <assert.h>
 
 namespace concurrency

src/gps/Air530GPS.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "Air530GPS.h"
 #include <assert.h>
 

src/gps/GPS.cpp

@@ -1,8 +1,7 @@
-
+#include "configuration.h"
 #include "GPS.h"
 #include "NodeDB.h"
 #include "RTC.h"
-#include "configuration.h"
 #include "sleep.h"
 #include <assert.h>
 

src/gps/NMEAGPS.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "NMEAGPS.h"
 #include "RTC.h"
-#include "configuration.h"
 
 static int32_t toDegInt(RawDegrees d)
 {

src/gps/UBloxGPS.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "UBloxGPS.h"
 #include "RTC.h"
 #include "error.h"

src/graphics/EInkDisplay2.cpp

@@ -0,0 +1,110 @@
+#include "configuration.h"
+
+#ifdef HAS_EINK2
+#include "EInkDisplay.h"
+#include "SPILock.h"
+#include <SPI.h>
+
+#define COLORED 0
+#define UNCOLORED 1
+
+#define INK COLORED     // Black ink
+#define PAPER UNCOLORED // 'paper' background colour
+
+#define EPD_WIDTH 200 // FIXME
+#define EPD_HEIGHT 200
+
+EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
+{
+    setGeometry(GEOMETRY_RAWMODE, EPD_WIDTH, EPD_HEIGHT);
+    // setGeometry(GEOMETRY_RAWMODE, 128, 64); // old resolution
+    // setGeometry(GEOMETRY_128_64); // We originally used this because I wasn't sure if rawmode worked - it does
+}
+
+// FIXME quick hack to limit drawing to a very slow rate
+uint32_t lastDrawMsec;
+
+/**
+ * Force a display update if we haven't drawn within the specified msecLimit
+ */
+bool EInkDisplay::forceDisplay(uint32_t msecLimit)
+{
+    // No need to grab this lock because we are on our own SPI bus
+    // concurrency::LockGuard g(spiLock);
+
+    uint32_t now = millis();
+    uint32_t sinceLast = now - lastDrawMsec;
+
+    if (sinceLast > msecLimit || lastDrawMsec == 0) {
+        lastDrawMsec = now;
+
+        // FIXME - only draw bits have changed (use backbuf similar to the other displays)
+        // tft.drawBitmap(0, 0, buffer, 128, 64, TFT_YELLOW, TFT_BLACK);
+        for (uint8_t y = 0; y < displayHeight; y++) {
+            for (uint8_t x = 0; x < displayWidth; x++) {
+
+                // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficent
+                auto b = buffer[x + (y / 8) * displayWidth];
+                auto isset = b & (1 << (y & 7));
+                // frame.drawPixel(x, y, isset ? INK : PAPER);
+            }
+        }
+
+        DEBUG_MSG("Updating eink... ");
+        // ePaper.Reset(); // wake the screen from sleep
+        // updateDisplay(); // Send image to display and refresh
+        // Put screen to sleep to save power
+        // ePaper.Sleep();
+        DEBUG_MSG("done\n");
+
+        return true;
+    } else {
+        // DEBUG_MSG("Skipping eink display\n");
+        return false;
+    }
+}
+
+// Write the buffer to the display memory
+void EInkDisplay::display(void)
+{
+    // We don't allow regular 'dumb' display() calls to draw on eink until we've shown
+    // at least one forceDisplay() keyframe.  This prevents flashing when we should the critical
+    // bootscreen (that we want to look nice)
+    if (lastDrawMsec)
+        forceDisplay(slowUpdateMsec); // Show the first screen a few seconds after boot, then slower
+}
+
+// Send a command to the display (low level function)
+void EInkDisplay::sendCommand(uint8_t com)
+{
+    (void)com;
+    // Drop all commands to device (we just update the buffer)
+}
+
+// Connect to the display
+bool EInkDisplay::connect()
+{
+    DEBUG_MSG("Doing EInk init\n");
+
+#ifdef PIN_EINK_PWR_ON
+    digitalWrite(PIN_EINK_PWR_ON, HIGH); // If we need to assert a pin to power external peripherals
+    pinMode(PIN_EINK_PWR_ON, OUTPUT);
+#endif
+
+#ifdef PIN_EINK_EN
+    // backlight power, HIGH is backlight on, LOW is off
+    digitalWrite(PIN_EINK_EN, LOW);
+    pinMode(PIN_EINK_EN, OUTPUT);
+#endif
+
+    // Initialise the ePaper library
+    // FIXME - figure out how to use lut_partial_update
+    if (false) {
+        DEBUG_MSG("ePaper init failed\n");
+        return false;
+    } else {
+        return true;
+    }
+}
+
+#endif

src/graphics/EInkDisplay2.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <OLEDDisplay.h>
+
+/**
+ * An adapter class that allows using the TFT_eSPI library as if it was an OLEDDisplay implementation.
+ *
+ * Remaining TODO:
+ * optimize display() to only draw changed pixels (see other OLED subclasses for examples)
+ * implement displayOn/displayOff to turn off the TFT device (and backlight)
+ * Use the fast NRF52 SPI API rather than the slow standard arduino version
+ *
+ * turn radio back on - currently with both on spi bus is fucked? or are we leaving chip select asserted?
+ */
+class EInkDisplay : public OLEDDisplay
+{
+    /// How often should we update the display
+    /// thereafter we do once per 5 minutes
+    uint32_t slowUpdateMsec = 5 * 60 * 1000;
+    
+  public:
+    /* constructor
+    FIXME - the parameters are not used, just a temporary hack to keep working like the old displays
+    */
+    EInkDisplay(uint8_t address, int sda, int scl);
+
+    // Write the buffer to the display memory (for eink we only do this occasionally)
+    virtual void display(void);
+
+    /**
+     * Force a display update if we haven't drawn within the specified msecLimit
+     * 
+     * @return true if we did draw the screen
+     */
+    bool forceDisplay(uint32_t msecLimit = 1000);
+
+  protected:
+    // the header size of the buffer used, e.g. for the SPI command header
+    virtual int getBufferOffset(void) { return 0; }
+
+    // Send a command to the display (low level function)
+    virtual void sendCommand(uint8_t com);
+
+    // Connect to the display
+    virtual bool connect();
+};
+
+

src/graphics/Screen.cpp

@@ -19,14 +19,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-
+#include "configuration.h"
 #include <OLEDDisplay.h>
 
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Screen.h"
-#include "configuration.h"
 #include "fonts.h"
 #include "gps/RTC.h"
 #include "graphics/images.h"

src/main.cpp

@@ -1,4 +1,4 @@
-
+#include "configuration.h"
 #include "GPS.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
@@ -6,7 +6,6 @@
 #include "PowerFSM.h"
 #include "airtime.h"
 #include "buzz.h"
-#include "configuration.h"
 #include "error.h"
 #include "power.h"
 // #include "rom/rtc.h"

src/mesh/Channels.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "NodeDB.h"

src/mesh/CryptoEngine.cpp

@@ -1,5 +1,5 @@
-#include "CryptoEngine.h"
 #include "configuration.h"
+#include "CryptoEngine.h"
 
 void CryptoEngine::setKey(const CryptoKey &k)
 {

src/mesh/DSRRouter.cpp

@@ -1,5 +1,5 @@
-#include "DSRRouter.h"
 #include "configuration.h"
+#include "DSRRouter.h"
 
 /* when we receive any packet
 

src/mesh/FloodingRouter.cpp

@@ -1,5 +1,5 @@
-#include "FloodingRouter.h"
 #include "configuration.h"
+#include "FloodingRouter.h"
 #include "mesh-pb-constants.h"
 
 FloodingRouter::FloodingRouter() {}

src/mesh/MeshPacketQueue.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "MeshPacketQueue.h"
 
 #include <algorithm>

src/mesh/MeshPlugin.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "MeshPlugin.h"
 #include "Channels.h"
 #include "MeshService.h"

src/mesh/MeshService.cpp

@@ -1,5 +1,4 @@
-
-#include <Arduino.h>
+#include "configuration.h"
 #include <assert.h>
 #include <string>
 

src/mesh/NodeDB.cpp

@@ -1,5 +1,4 @@
-
-#include <Arduino.h>
+#include "configuration.h"
 #include <assert.h>
 
 #include "FS.h"
@@ -14,7 +13,6 @@
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "error.h"
 #include "main.h"
 #include "mesh-pb-constants.h"

src/mesh/PacketHistory.cpp

@@ -1,5 +1,5 @@
-#include "PacketHistory.h"
 #include "configuration.h"
+#include "PacketHistory.h"
 #include "mesh-pb-constants.h"
 
 PacketHistory::PacketHistory()

src/mesh/PhoneAPI.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "PhoneAPI.h"
 #include "Channels.h"
 #include "GPS.h"

src/mesh/ProtobufPlugin.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "ProtobufPlugin.h"
 
 

src/mesh/RF95Interface.cpp

@@ -1,8 +1,8 @@
+#include "configuration.h"
 #include "RF95Interface.h"
 #include "MeshRadio.h" // kinda yucky, but we need to know which region we are in
 #include "RadioLibRF95.h"
 #include "error.h"
-#include <configuration.h>
 
 #define MAX_POWER 20
 // if we use 20 we are limited to 1% duty cycle or hw might overheat.  For continuous operation set a limit of 17

src/mesh/RadioInterface.cpp

@@ -1,4 +1,4 @@
-
+#include "configuration.h"
 #include "RadioInterface.h"
 #include "Channels.h"
 #include "MeshRadio.h"
@@ -6,7 +6,6 @@
 #include "NodeDB.h"
 #include "Router.h"
 #include "assert.h"
-#include "configuration.h"
 #include "sleep.h"
 #include <assert.h>
 #include <pb_decode.h>

src/mesh/RadioLibInterface.cpp

@@ -1,10 +1,10 @@
+#include "configuration.h"
 #include "RadioLibInterface.h"
 #include "MeshTypes.h"
 #include "NodeDB.h"
 #include "SPILock.h"
 #include "error.h"
 #include "mesh-pb-constants.h"
-#include <configuration.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
 

src/mesh/RadioLibRF95.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "RadioLibRF95.h"
 
 #define RF95_CHIP_VERSION 0x12

src/mesh/ReliableRouter.cpp

@@ -1,7 +1,7 @@
+#include "configuration.h"
 #include "ReliableRouter.h"
 #include "MeshPlugin.h"
 #include "MeshTypes.h"
-#include "configuration.h"
 #include "mesh-pb-constants.h"
 
 // ReliableRouter::ReliableRouter() {}

src/mesh/Router.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "Router.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "NodeDB.h"
 #include "RTC.h"
-#include "configuration.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "plugins/RoutingPlugin.h"

src/mesh/SX1262Interface.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "SX1262Interface.h"
 #include "error.h"
-#include <configuration.h>
 
 // Particular boards might define a different max power based on what their hardware can do
 #ifndef SX1262_MAX_POWER

src/nrf52/BQ25713.cpp

@@ -1,100 +0,0 @@
-#include "BQ25713.h"
-#include "configuration.h"
-
-#include <Wire.h>
-
-#ifdef BQ25703A_ADDR
-
-const uint8_t BQ25713::devAddr = BQ25703A_ADDR;
-
-bool BQ25713::setup()
-{
-    DEBUG_MSG("Init BQ25713\n");
-
-    //	if(!writeReg(0x34,0x9034)) return false;
-    //
-    //	if(!writeReg(0x34,0x8034)) return false;
-
-    if (!writeReg(0x00, 0x0F0A))
-        return false; // Config Charge Option 0
-
-    if (!writeReg(0x02, 0x0224)) // 512mA, FIXME, this seems to be setting a number of bits marked as reserved, why?
-        return false; // Config Charge Current
-
-    if (!writeReg(0x04, 0x1070)) // about 4.29V
-        return false; // Config Charge Voltage
-
-    if (!writeReg(0x06, 0x099C))
-        return false; // Config OTG Voltage
-
-    if (!writeReg(0x08, 0x5000))
-        return false; // Config OTG Current
-
-    //	if(!writeReg(0x0A,0x0100)) return false;//Config Input Voltage
-
-    if (!writeReg(0x0C, 0x1800)) // 4.2Vish FIXME, we could lower this?
-        return false; // Config Minimum System Voltage
-
-    if (!writeReg(0x0E, 0x4900))
-        return false; // Config Input Current
-
-    if (!writeReg(0x30, 0xE210))
-        return false; // Config Charge Option 1
-
-    if (!writeReg(0x32, 0x32BF))
-        return false; // Config Charge Option 2
-
-    if (!writeReg(0x34, 0x0834))
-        return false; // Config Charge Option 3
-
-    if (!writeReg(0x36, 0x4A65))
-        return false; // Config Prochot Option 0
-
-    if (!writeReg(0x38, 0x81FF))
-        return false; // Config Prochot Option 1
-
-    if (!writeReg(0x3A, 0xA0FF))
-        return false; // Config ADC Option
-
-    return true;
-}
-
-uint16_t BQ25713::readReg(uint8_t reg)
-{
-    Wire.beginTransmission(devAddr);
-    Wire.write(reg);
-    byte err = Wire.endTransmission();
-    if (!err) {
-        int readLen = 2;
-        Wire.requestFrom(devAddr, (int)(readLen + 1));
-        if (Wire.available() >= readLen) {
-            uint8_t lsb = Wire.read(), msb = Wire.read();
-
-            return (((uint16_t)msb) << 8) + lsb;
-        } else
-            return 0;
-    } else {
-        return 0;
-    }
-}
-
-bool BQ25713::writeReg(uint8_t reg, uint16_t v)
-{
-    Wire.beginTransmission(devAddr);
-    Wire.write(reg);
-    Wire.write(v & 0xff);
-    Wire.write((v >> 8) & 0xff);
-    byte err = Wire.endTransmission(); // 0 for success
-
-    if (!err) {
-        // Do a test readback for early debugging
-        uint16_t found = readReg(reg);
-        if (found != v) {
-            DEBUG_MSG("Readback reg=0x%0x test failed, expected 0x%0x, found 0x%0x!\n", reg, v, found);
-            return true; // claim success - FIXME
-        }
-    }
-    return !err;
-}
-
-#endif

src/nrf52/BQ25713.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-
-/**
- * Driver class to control/monitor BQ25713 charge controller
- */
-class BQ25713 {
-    static const uint8_t devAddr;
-
-public:
-
-    /// Return true for success
-    bool setup();
-
-private:
-    uint16_t readReg(uint8_t reg);
-
-    /// Return true for success
-    bool writeReg(uint8_t reg, uint16_t v);
-};
-

src/nrf52/NRF52Bluetooth.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "NRF52Bluetooth.h"
 #include "BluetoothCommon.h"
-#include "configuration.h"
 #include "main.h"
 #include "mesh/PhoneAPI.h"
 #include "mesh/mesh-pb-constants.h"

src/nrf52/NRF52CryptoEngine.cpp

@@ -1,6 +1,5 @@
-
-#include "CryptoEngine.h"
 #include "configuration.h"
+#include "CryptoEngine.h"
 #include "ocrypto_aes_ctr.h"
 
 class NRF52CryptoEngine : public CryptoEngine

src/nrf52/alloc.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "rtos.h"
 #include <assert.h>
 #include <stdlib.h>

src/nrf52/main-nrf52.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include <SPI.h>
 #include <Wire.h>
 #include <assert.h>
@@ -6,7 +7,6 @@
 #include <stdio.h>
 
 #include "NRF52Bluetooth.h"
-#include "configuration.h"
 #include "error.h"
 
 #ifdef BQ25703A_ADDR

src/plugins/AdminPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "AdminPlugin.h"
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 #ifdef PORTDUINO

src/plugins/ExternalNotificationPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "ExternalNotificationPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include <Arduino.h>
 
 //#include <assert.h>

src/plugins/NodeInfoPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "NodeInfoPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 NodeInfoPlugin *nodeInfoPlugin;

src/plugins/Plugins.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "plugins/ExternalNotificationPlugin.h"
 #include "plugins/NodeInfoPlugin.h"
 #include "plugins/PositionPlugin.h"

src/plugins/PositionPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "PositionPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 
 PositionPlugin *positionPlugin;
 

src/plugins/RemoteHardwarePlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "RemoteHardwarePlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 #define NUM_GPIOS 64

src/plugins/ReplyPlugin.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "ReplyPlugin.h"
 #include "MeshService.h"
-#include "configuration.h"
 #include "main.h"
 
 #include <assert.h>

src/plugins/RoutingPlugin.cpp

@@ -1,8 +1,8 @@
+#include "configuration.h"
 #include "RoutingPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 RoutingPlugin *routingPlugin;

src/plugins/SerialPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "SerialPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include <Arduino.h>
 
 #include <assert.h>

src/sleep.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "sleep.h"
 #include "GPS.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "configuration.h"
 #include "error.h"
 #include "main.h"
 #include "target_specific.h"