An intensive include directory clean up (case / system paths) hopefully 99% there for Linux...

Arduino/AfterBurner/Afterburner.ino

@@ -100,10 +100,10 @@
 #include "src/Utility/DebugPort.h"
 #include "src/Utility/UtilClasses.h"
 #include "src/Utility/BTC_JSON.h"
-#include "src/Utility/GPIO.h"
+#include "src/Utility/RTC_GPIO.h"
 #include "src/Utility/BoardDetect.h"
 #include "src/OLED/ScreenManager.h"
-#include "src/OLED/keypad.h"
+#include "src/OLED/KeyPad.h"
 #include "src/Utility/TempSense.h"
 #include <rom/rtc.h>
 #include <esp_spiffs.h>

README.md

@@ -61,6 +61,7 @@ To be implemented
 * MQTT pub/sub 
 * "fuel gauge" - Integrate pump frequency, assuming a repeatable dose of fuel per pump cycle...
 * Regular Hot Burn cycle (DPF mode!)
+* Hour meter - run time, glow time
 * list under construction.....
 
 Suggestions

src/Afterburner/Afterburner.cpp

@@ -100,10 +100,10 @@
 #include "src/Utility/DebugPort.h"
 #include "src/Utility/UtilClasses.h"
 #include "src/Utility/BTC_JSON.h"
-#include "src/Utility/GPIO.h"
+#include "src/Utility/BTC_GPIO.h"
 #include "src/Utility/BoardDetect.h"
 #include "src/OLED/ScreenManager.h"
-#include "src/OLED/keypad.h"
+#include "src/OLED/KeyPad.h"
 #include "src/Utility/TempSense.h"
 #include <rom/rtc.h>
 #include <esp_spiffs.h>

src/Afterburner/src/Bluetooth/BluetoothAbstract.h

@@ -24,7 +24,7 @@
 
 #include <Arduino.h>
 #include "../Utility/UtilClasses.h"
-#include "../Utility/Debugport.h"
+#include "../Utility/DebugPort.h"
 #include "../Utility/helpers.h"
 
 class CProtocol;

src/Afterburner/src/Bluetooth/BluetoothESP32.cpp

@@ -23,7 +23,7 @@
 #include "../cfg/pins.h"
 #include "../cfg/BTCConfig.h"
 #include "../Protocol/Protocol.h"
-#include "../Utility/debugport.h"
+#include "../Utility/DebugPort.h"
 #include "BluetoothESP32.h"
 
 

src/Afterburner/src/Libraries/Adafruit-GFX-Library/Adafruit_GFX.h

@@ -2,10 +2,10 @@
 #define _ADAFRUIT_GFX_H
 
 #if ARDUINO >= 100
- #include "Arduino.h"
+ #include <Arduino.h>
- #include "Print.h"
+ #include <Print.h>
 #else
- #include "WProgram.h"
+ #include <WProgram.h>
 #endif
 #include "gfxfont.h"
 

src/Afterburner/src/Libraries/PubSubClient/src/PubSubClient.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "PubSubClient.h"
-#include "Arduino.h"
+#include <Arduino.h>
 
 PubSubClient::PubSubClient() {
     this->_state = MQTT_DISCONNECTED;

src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.cpp_

@@ -1,5 +1,5 @@
 #include "Buffer.h"
-#include "Arduino.h"
+#include <Arduino.h>
 
 Buffer::Buffer() {
     this->pos = 0;

src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.h

@@ -1,7 +1,7 @@
 #ifndef buffer_h
 #define buffer_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 class Buffer {
 private:

src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/ShimClient.h

@@ -1,7 +1,7 @@
 #ifndef shimclient_h
 #define shimclient_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include "Client.h"
 #include "IPAddress.h"
 #include "Buffer.h"

src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Stream.h

@@ -1,7 +1,7 @@
 #ifndef Stream_h
 #define Stream_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include "Buffer.h"
 
 class Stream {

src/Afterburner/src/Libraries/esp32-ds18b20/ds18b20.c

@@ -38,8 +38,8 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "freertos/FreeRTOS.h"
+#include "FreeRTOS/FreeRTOS.h"
-#include "freertos/task.h"
+#include "FreeRTOS/task.h"
 #include "driver/gpio.h"
 #include "esp_system.h"
 #include "esp_log.h"

src/Afterburner/src/Libraries/esp32-owb/owb.c

@@ -33,8 +33,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "freertos/FreeRTOS.h"
+#include "FreeRTOS/FreeRTOS.h"
-#include "freertos/task.h"
+#include "FreeRTOS/task.h"
 #include "esp_log.h"
 #include "sdkconfig.h"
 #include "driver/gpio.h"

src/Afterburner/src/Libraries/esp32-owb/owb_rmt.h

@@ -27,9 +27,9 @@
 #ifndef OWB_RMT_H
 #define OWB_RMT_H
 
-#include "freertos/FreeRTOS.h"
+#include "FreeRTOS/FreeRTOS.h"
-#include "freertos/queue.h"
+#include "FreeRTOS/queue.h"
-#include "freertos/ringbuf.h"
+#include "FreeRTOS/ringbuf.h"
 #include "driver/rmt.h"
 
 #ifdef __cplusplus

src/Afterburner/src/Libraries/esp32-sh1106-oled/Adafruit_SH1106.h

@@ -17,10 +17,10 @@ All text above, and the splash screen must be included in any redistribution
 *********************************************************************/
 
 #if ARDUINO >= 100
- #include "Arduino.h"
+ #include <Arduino.h>
  #define WIRE_WRITE Wire.write
 #else
- #include "WProgram.h"
+ #include <WProgram.h>
   #define WIRE_WRITE Wire.send
 #endif
 

src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.cpp

@@ -6,7 +6,7 @@
 */
 
 #include "esp32fota.h"
-#include "Arduino.h"
+#include <Arduino.h>
 #include <WiFi.h>
 #include <HTTPClient.h>
 #include <Update.h>

src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.h

@@ -8,7 +8,7 @@
 #ifndef esp32fota_h
 #define esp32fota_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 class esp32FOTA
 {

src/Afterburner/src/OLED/BasicScreen.cpp

@@ -20,8 +20,8 @@
  */
 
 #include "128x64OLED.h"
-#include "fonts/tahoma16.h"
+#include "fonts/Tahoma16.h"
-#include "fonts/tahoma24.h"
+#include "fonts/Tahoma24.h"
 #include "fonts/Icons.h"
 #include "BasicScreen.h"
 #include "KeyPad.h"

src/Afterburner/src/OLED/FuelMixtureScreen.cpp

@@ -32,7 +32,7 @@
 #include "KeyPad.h"
 #include "../Utility/helpers.h"
 #include "../WiFi/BTCWifi.h"
-#include "../Utility/debugPort.h"
+#include "../Utility/DebugPort.h"
 #include "../Utility/macros.h"
 #include "../Protocol/Protocol.h"
 

src/Afterburner/src/OLED/GPIOScreen.cpp

@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "fonts/Icons.h"
 
 extern CGPIOout GPIOout;

src/Afterburner/src/OLED/GPIOScreen.h

@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include "PasswordScreen.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 
 class C128x64_OLED;
 class CScreenManager;

src/Afterburner/src/OLED/HomeMenuSelScreen.cpp

@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "fonts/Icons.h"
 
 

src/Afterburner/src/OLED/OtherOptionsScreen.cpp

@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "fonts/Icons.h"
 
 

src/Afterburner/src/OLED/ScreenManager.cpp

@@ -42,7 +42,7 @@
 #include <Wire.h>
 #include "../cfg/pins.h"
 #include "../cfg/BTCConfig.h"
-#include "keypad.h"
+#include "KeyPad.h"
 #include "fonts/Icons.h"
 #include "fonts/MiniFont.h"
 #include "fonts/MidiFont.h"

src/Afterburner/src/OLED/VersionInfoScreen.cpp

@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "../WiFi/BTCWifi.h"
 #include "../Utility/BoardDetect.h"
 #include "fonts/Icons.h"

src/Afterburner/src/OLED/fonts/Tahoma16.c

@@ -29,7 +29,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#include "tahoma16.h"
+#include "Tahoma16.h"
 
 // Character bitmaps for Tahoma 16pt
 const uint8_t tahoma_16ptBitmaps[] PROGMEM =

src/Afterburner/src/OLED/fonts/Tahoma24.c

@@ -29,7 +29,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#include "tahoma24.h"
+#include "Tahoma24.h"
 
 // Character bitmaps for Tahoma 24pt
 const uint8_t tahoma_24ptBitmaps [] PROGMEM = 

src/Afterburner/src/Utility/BTC_GPIO.cpp

@@ -19,8 +19,8 @@
  * 
  */
 
-#include "GPIO.h"
+#include "BTC_GPIO.h"
-#include "../Utility/helpers.h"
+#include "helpers.h"
 #include <driver/adc.h>
 #include "DebugPort.h"
 #include "../Protocol/Protocol.h"

src/Afterburner/src/Utility/Moderator.h

@@ -26,7 +26,7 @@
 #include "../Libraries/ArduinoJson/ArduinoJson.h"
 #include "../RTC/Timers.h"
 #include "DebugPort.h"
-#include "GPIO.h"
+#include "BTC_GPIO.h"
 
 
 class CTimerModerator {

src/Afterburner/src/Utility/NVStorage.h

@@ -22,7 +22,7 @@
 #ifndef __BTC_NV_STORAGE_H__
 #define __BTC_NV_STORAGE_H__
 
-#include "GPIO.h"
+#include "BTC_GPIO.h"
 #include "NVCore.h"
 #include "../Utility/helpers.h"
 

src/Afterburner/src/WiFi/ABmqtt.h

@@ -4,16 +4,16 @@
 #define _ABMQTT_h
 
 #if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
+	#include <Arduino.h>
 #else
-	#include "WProgram.h"
+	#include <WProgram.h>
 #endif
 
 
 #endif
 
 
-#include <PubSubClient.h>
+#include "../Libraries/PubSubClient/src/PubSubClient.h"
 #include "BTCWifi.h""
 #include "BTCWebServer.h"
 

src/Afterburner/src/WiFi/BTCWebServer.cpp

@@ -28,7 +28,7 @@
 #include "../Utility/helpers.h"
 #include "../cfg/pins.h"
 #include "../cfg/BTCConfig.h"
-#include "Index.h"
+//#include "Index.h"
 #include "../Utility/BTC_JSON.h"
 #include "../Utility/Moderator.h"
 #include "../Libraries/WiFiManager-dev/WiFiManager.h"

src/Afterburner/src/WiFi/BTCWebServer.h

@@ -26,9 +26,9 @@
 #define _BTCWEBSERVER_h
 
 #if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
+	#include <Arduino.h>
 #else
-	#include "WProgram.h"
+	#include <WProgram.h>
 #endif
 
 #include "BTCWifi.h"