Reorder include order

lbussy · Feb 23, 2020 · c60db3a · c60db3a
1 parent 0e7311e
commit c60db3a
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 19 deletions.
diff --git a/src/bubserial.h b/src/bubserial.h
@@ -25,6 +25,7 @@ SOFTWARE. */
 
 #include "config.h"
 #include "tools.h"
+#include "ntphandler.h"
 #include <ArduinoLog.h>
 
 void serial();

diff --git a/src/execota.h b/src/execota.h
@@ -25,8 +25,11 @@ SOFTWARE. */
 
 #include "tools.h"
 #include "jsonconfig.h"
-#include "config.h"
+// #include "config.h"
+#include "webserver.h"
+#include <ESP8266WiFi.h>
 #include <ESP8266httpUpdate.h>
+#include <ESP8266WebServer.h>
 #include <ArduinoLog.h>
 
 void execfw();

diff --git a/src/jsonconfig.h b/src/jsonconfig.h
@@ -27,6 +27,7 @@ SOFTWARE. */
 #include <ArduinoLog.h>
 #include <FS.h>
 #include <ArduinoJson.h>
+#include <ArduinoLog.h>
 
 class JsonConfig {
     private:

diff --git a/src/main.h b/src/main.h
@@ -25,18 +25,18 @@ SOFTWARE. */
 
 #include "bubserial.h"
 #include "config.h"
+#include "execota.h"
 #include "jsonconfig.h"
-#include "ntphandler.h"
 #include "webserver.h"
 #include "wifi.h"
 #include "version.h"
-#include "targethandler.h"
+#include "urltarget.h"
 #include "bubbles.h"
 #include "mdns.h"
-#include <WiFiManager.h>
 #include <DoubleResetDetect.h>
-#include <ESP8266WiFi.h>
+#include <ArduinoLog.h>
 #include <ESP8266mDNS.h>
+#include <Arduino.h>
 
 // DRD_TIMEOUT =    Maximum number of seconds between resets that counts
 //                  as a double reset
@@ -46,7 +46,4 @@ SOFTWARE. */
 #define DRD_TIMEOUT 3.0
 #define DRD_ADDRESS 0x00
 
-static bool __attribute__((unused)) doTarget = false;  // Semaphore for Target timer
-static bool __attribute__((unused)) doBF = false;      // Semaphore for BF timer
-
 #endif // _MAIN_H
diff --git a/src/mdns.h b/src/mdns.h
@@ -27,9 +27,11 @@ SOFTWARE. */
 #ifndef _MDNS_H
 #define _MDNS_H
 
-#include "main.h"
+#include "config.h"
+#include "jsonconfig.h"
 #include <ArduinoLog.h>
 #include <ESP8266mDNS.h>
+#include <ESP8266WiFi.h>
 
 void mdnssetup();
 IPAddress mdnsquery(char hostname[65]);

diff --git a/src/ntphandler.h b/src/ntphandler.h
@@ -25,9 +25,10 @@ SOFTWARE. */
 
 #include "config.h"
 #include "tools.h"
-#include <TimeLib.h>
+// #include <TimeLib.h>
 #include <NtpClientLib.h>
 #include <ArduinoLog.h>
+#include <ArduinoLog.h>
 
 #define NTP_TIMEOUT 1500
 
@@ -39,7 +40,7 @@ class NtpHandler {
         NtpHandler() {}
         static NtpHandler *single;
         // Other Declarations
-        boolean syncEventTriggered;
+        bool syncEventTriggered;
         NTPSyncEvent_t ntpEvent;
         bool hasBeenSet;
         void setup();

diff --git a/src/tools.h b/src/tools.h
@@ -23,8 +23,13 @@ SOFTWARE. */
 #ifndef _TOOLS_H
 #define _TOOLS_H
 
-#include "wifi.h"
+// #include "wifi.h"
+#include "bubbles.h"
+#include <FS.h>
+#include <ArduinoLog.h>
+#include <ArduinoJson.h>
 #include <EEPROM.h>
+#include <Arduino.h>
 
 #define EEPROM_ADDRESS 0x00
 

diff --git a/src/webserver.h b/src/webserver.h
@@ -26,13 +26,20 @@ SOFTWARE. */
 #include "wifi.h"
 #include "execota.h"
 #include "bubbles.h"
-#include "tools.h"
+// #include "tools.h"
 #include "jsonconfig.h"
-#include "bubserial.h"
+// #include "bubserial.h"
 #include "version.h"
+#include "config.h"
+#include <ArduinoLog.h>
+#include <ArduinoJson.h>
 #include <FS.h>
+#include <ESP8266WiFi.h>
 #include <ESP8266WebServer.h>
 #include <ESP8266HTTPClient.h>
+#include <ESP8266mDNS.h>
+#include <Arduino.h>
+
 
 class WebServer {
     private:

diff --git a/src/wifi.h b/src/wifi.h
@@ -23,12 +23,15 @@ SOFTWARE. */
 #ifndef _WIFI_H
 #define _WIFI_H
 
-#include "main.h"
 #include "config.h"
-#include <ESP8266WiFi.h>        //ESP8266 Core WiFi Library
-#include <DNSServer.h>          //Local DNS Server used for redirecting all requests to the configuration portal
-#include <ESP8266WebServer.h>   //Local WebServer used to serve the configuration portal
-#include <WiFiManager.h>        //https://github.com/tzapu/WiFiManager WiFi Configuration Magic
+#include "jsonconfig.h"
+#include "tools.h"
+#include <ESP8266WiFi.h>
+#include <Ticker.h>
+// #include <DNSServer.h>
+// #include <ESP8266WebServer.h>
+#include <ArduinoLog.h>
+#include <WiFiManager.h>
 
 void wifiBlinker();
 void doWiFi();