An intensive include directory clean up (case / system paths) hopefully 99% there for Linux...
This commit is contained in:
parent
e6b8365f09
commit
471a423a19
40 changed files with 47 additions and 46 deletions
|
@ -100,10 +100,10 @@
|
||||||
#include "src/Utility/DebugPort.h"
|
#include "src/Utility/DebugPort.h"
|
||||||
#include "src/Utility/UtilClasses.h"
|
#include "src/Utility/UtilClasses.h"
|
||||||
#include "src/Utility/BTC_JSON.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/Utility/BoardDetect.h"
|
||||||
#include "src/OLED/ScreenManager.h"
|
#include "src/OLED/ScreenManager.h"
|
||||||
#include "src/OLED/keypad.h"
|
#include "src/OLED/KeyPad.h"
|
||||||
#include "src/Utility/TempSense.h"
|
#include "src/Utility/TempSense.h"
|
||||||
#include <rom/rtc.h>
|
#include <rom/rtc.h>
|
||||||
#include <esp_spiffs.h>
|
#include <esp_spiffs.h>
|
||||||
|
|
|
@ -61,6 +61,7 @@ To be implemented
|
||||||
* MQTT pub/sub
|
* MQTT pub/sub
|
||||||
* "fuel gauge" - Integrate pump frequency, assuming a repeatable dose of fuel per pump cycle...
|
* "fuel gauge" - Integrate pump frequency, assuming a repeatable dose of fuel per pump cycle...
|
||||||
* Regular Hot Burn cycle (DPF mode!)
|
* Regular Hot Burn cycle (DPF mode!)
|
||||||
|
* Hour meter - run time, glow time
|
||||||
* list under construction.....
|
* list under construction.....
|
||||||
|
|
||||||
Suggestions
|
Suggestions
|
||||||
|
|
|
@ -100,10 +100,10 @@
|
||||||
#include "src/Utility/DebugPort.h"
|
#include "src/Utility/DebugPort.h"
|
||||||
#include "src/Utility/UtilClasses.h"
|
#include "src/Utility/UtilClasses.h"
|
||||||
#include "src/Utility/BTC_JSON.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/Utility/BoardDetect.h"
|
||||||
#include "src/OLED/ScreenManager.h"
|
#include "src/OLED/ScreenManager.h"
|
||||||
#include "src/OLED/keypad.h"
|
#include "src/OLED/KeyPad.h"
|
||||||
#include "src/Utility/TempSense.h"
|
#include "src/Utility/TempSense.h"
|
||||||
#include <rom/rtc.h>
|
#include <rom/rtc.h>
|
||||||
#include <esp_spiffs.h>
|
#include <esp_spiffs.h>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include "../Utility/UtilClasses.h"
|
#include "../Utility/UtilClasses.h"
|
||||||
#include "../Utility/Debugport.h"
|
#include "../Utility/DebugPort.h"
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
|
|
||||||
class CProtocol;
|
class CProtocol;
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include "../cfg/pins.h"
|
#include "../cfg/pins.h"
|
||||||
#include "../cfg/BTCConfig.h"
|
#include "../cfg/BTCConfig.h"
|
||||||
#include "../Protocol/Protocol.h"
|
#include "../Protocol/Protocol.h"
|
||||||
#include "../Utility/debugport.h"
|
#include "../Utility/DebugPort.h"
|
||||||
#include "BluetoothESP32.h"
|
#include "BluetoothESP32.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
#define _ADAFRUIT_GFX_H
|
#define _ADAFRUIT_GFX_H
|
||||||
|
|
||||||
#if ARDUINO >= 100
|
#if ARDUINO >= 100
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
#include "Print.h"
|
#include <Print.h>
|
||||||
#else
|
#else
|
||||||
#include "WProgram.h"
|
#include <WProgram.h>
|
||||||
#endif
|
#endif
|
||||||
#include "gfxfont.h"
|
#include "gfxfont.h"
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "PubSubClient.h"
|
#include "PubSubClient.h"
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
|
|
||||||
PubSubClient::PubSubClient() {
|
PubSubClient::PubSubClient() {
|
||||||
this->_state = MQTT_DISCONNECTED;
|
this->_state = MQTT_DISCONNECTED;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "Buffer.h"
|
#include "Buffer.h"
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
|
|
||||||
Buffer::Buffer() {
|
Buffer::Buffer() {
|
||||||
this->pos = 0;
|
this->pos = 0;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef buffer_h
|
#ifndef buffer_h
|
||||||
#define buffer_h
|
#define buffer_h
|
||||||
|
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
|
|
||||||
class Buffer {
|
class Buffer {
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef shimclient_h
|
#ifndef shimclient_h
|
||||||
#define shimclient_h
|
#define shimclient_h
|
||||||
|
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
#include "Client.h"
|
#include "Client.h"
|
||||||
#include "IPAddress.h"
|
#include "IPAddress.h"
|
||||||
#include "Buffer.h"
|
#include "Buffer.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef Stream_h
|
#ifndef Stream_h
|
||||||
#define Stream_h
|
#define Stream_h
|
||||||
|
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
#include "Buffer.h"
|
#include "Buffer.h"
|
||||||
|
|
||||||
class Stream {
|
class Stream {
|
||||||
|
|
|
@ -38,8 +38,8 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <math.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 "driver/gpio.h"
|
||||||
#include "esp_system.h"
|
#include "esp_system.h"
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
|
|
|
@ -33,8 +33,8 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.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 "esp_log.h"
|
||||||
#include "sdkconfig.h"
|
#include "sdkconfig.h"
|
||||||
#include "driver/gpio.h"
|
#include "driver/gpio.h"
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
#ifndef OWB_RMT_H
|
#ifndef OWB_RMT_H
|
||||||
#define 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"
|
#include "driver/rmt.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -17,10 +17,10 @@ All text above, and the splash screen must be included in any redistribution
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
|
|
||||||
#if ARDUINO >= 100
|
#if ARDUINO >= 100
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
#define WIRE_WRITE Wire.write
|
#define WIRE_WRITE Wire.write
|
||||||
#else
|
#else
|
||||||
#include "WProgram.h"
|
#include <WProgram.h>
|
||||||
#define WIRE_WRITE Wire.send
|
#define WIRE_WRITE Wire.send
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "esp32fota.h"
|
#include "esp32fota.h"
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <HTTPClient.h>
|
#include <HTTPClient.h>
|
||||||
#include <Update.h>
|
#include <Update.h>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#ifndef esp32fota_h
|
#ifndef esp32fota_h
|
||||||
#define esp32fota_h
|
#define esp32fota_h
|
||||||
|
|
||||||
#include "Arduino.h"
|
#include <Arduino.h>
|
||||||
|
|
||||||
class esp32FOTA
|
class esp32FOTA
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "128x64OLED.h"
|
#include "128x64OLED.h"
|
||||||
#include "fonts/tahoma16.h"
|
#include "fonts/Tahoma16.h"
|
||||||
#include "fonts/tahoma24.h"
|
#include "fonts/Tahoma24.h"
|
||||||
#include "fonts/Icons.h"
|
#include "fonts/Icons.h"
|
||||||
#include "BasicScreen.h"
|
#include "BasicScreen.h"
|
||||||
#include "KeyPad.h"
|
#include "KeyPad.h"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "KeyPad.h"
|
#include "KeyPad.h"
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
#include "../WiFi/BTCWifi.h"
|
#include "../WiFi/BTCWifi.h"
|
||||||
#include "../Utility/debugPort.h"
|
#include "../Utility/DebugPort.h"
|
||||||
#include "../Utility/macros.h"
|
#include "../Utility/macros.h"
|
||||||
#include "../Protocol/Protocol.h"
|
#include "../Protocol/Protocol.h"
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
#include "../Utility/UtilClasses.h"
|
#include "../Utility/UtilClasses.h"
|
||||||
#include "../Utility/NVStorage.h"
|
#include "../Utility/NVStorage.h"
|
||||||
#include "../Utility/GPIO.h"
|
#include "../Utility/BTC_GPIO.h"
|
||||||
#include "fonts/Icons.h"
|
#include "fonts/Icons.h"
|
||||||
|
|
||||||
extern CGPIOout GPIOout;
|
extern CGPIOout GPIOout;
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "PasswordScreen.h"
|
#include "PasswordScreen.h"
|
||||||
#include "../Utility/GPIO.h"
|
#include "../Utility/BTC_GPIO.h"
|
||||||
|
|
||||||
class C128x64_OLED;
|
class C128x64_OLED;
|
||||||
class CScreenManager;
|
class CScreenManager;
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
#include "../Utility/UtilClasses.h"
|
#include "../Utility/UtilClasses.h"
|
||||||
#include "../Utility/NVStorage.h"
|
#include "../Utility/NVStorage.h"
|
||||||
#include "../Utility/GPIO.h"
|
#include "../Utility/BTC_GPIO.h"
|
||||||
#include "fonts/Icons.h"
|
#include "fonts/Icons.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
#include "../Utility/UtilClasses.h"
|
#include "../Utility/UtilClasses.h"
|
||||||
#include "../Utility/NVStorage.h"
|
#include "../Utility/NVStorage.h"
|
||||||
#include "../Utility/GPIO.h"
|
#include "../Utility/BTC_GPIO.h"
|
||||||
#include "fonts/Icons.h"
|
#include "fonts/Icons.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
#include "../cfg/pins.h"
|
#include "../cfg/pins.h"
|
||||||
#include "../cfg/BTCConfig.h"
|
#include "../cfg/BTCConfig.h"
|
||||||
#include "keypad.h"
|
#include "KeyPad.h"
|
||||||
#include "fonts/Icons.h"
|
#include "fonts/Icons.h"
|
||||||
#include "fonts/MiniFont.h"
|
#include "fonts/MiniFont.h"
|
||||||
#include "fonts/MidiFont.h"
|
#include "fonts/MidiFont.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
#include "../Utility/UtilClasses.h"
|
#include "../Utility/UtilClasses.h"
|
||||||
#include "../Utility/NVStorage.h"
|
#include "../Utility/NVStorage.h"
|
||||||
#include "../Utility/GPIO.h"
|
#include "../Utility/BTC_GPIO.h"
|
||||||
#include "../WiFi/BTCWifi.h"
|
#include "../WiFi/BTCWifi.h"
|
||||||
#include "../Utility/BoardDetect.h"
|
#include "../Utility/BoardDetect.h"
|
||||||
#include "fonts/Icons.h"
|
#include "fonts/Icons.h"
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
#include "tahoma16.h"
|
#include "Tahoma16.h"
|
||||||
|
|
||||||
// Character bitmaps for Tahoma 16pt
|
// Character bitmaps for Tahoma 16pt
|
||||||
const uint8_t tahoma_16ptBitmaps[] PROGMEM =
|
const uint8_t tahoma_16ptBitmaps[] PROGMEM =
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
#include "tahoma24.h"
|
#include "Tahoma24.h"
|
||||||
|
|
||||||
// Character bitmaps for Tahoma 24pt
|
// Character bitmaps for Tahoma 24pt
|
||||||
const uint8_t tahoma_24ptBitmaps [] PROGMEM =
|
const uint8_t tahoma_24ptBitmaps [] PROGMEM =
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "GPIO.h"
|
#include "BTC_GPIO.h"
|
||||||
#include "../Utility/helpers.h"
|
#include "helpers.h"
|
||||||
#include <driver/adc.h>
|
#include <driver/adc.h>
|
||||||
#include "DebugPort.h"
|
#include "DebugPort.h"
|
||||||
#include "../Protocol/Protocol.h"
|
#include "../Protocol/Protocol.h"
|
|
@ -26,7 +26,7 @@
|
||||||
#include "../Libraries/ArduinoJson/ArduinoJson.h"
|
#include "../Libraries/ArduinoJson/ArduinoJson.h"
|
||||||
#include "../RTC/Timers.h"
|
#include "../RTC/Timers.h"
|
||||||
#include "DebugPort.h"
|
#include "DebugPort.h"
|
||||||
#include "GPIO.h"
|
#include "BTC_GPIO.h"
|
||||||
|
|
||||||
|
|
||||||
class CTimerModerator {
|
class CTimerModerator {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#ifndef __BTC_NV_STORAGE_H__
|
#ifndef __BTC_NV_STORAGE_H__
|
||||||
#define __BTC_NV_STORAGE_H__
|
#define __BTC_NV_STORAGE_H__
|
||||||
|
|
||||||
#include "GPIO.h"
|
#include "BTC_GPIO.h"
|
||||||
#include "NVCore.h"
|
#include "NVCore.h"
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
|
|
||||||
|
|
|
@ -4,16 +4,16 @@
|
||||||
#define _ABMQTT_h
|
#define _ABMQTT_h
|
||||||
|
|
||||||
#if defined(ARDUINO) && ARDUINO >= 100
|
#if defined(ARDUINO) && ARDUINO >= 100
|
||||||
#include "arduino.h"
|
#include <Arduino.h>
|
||||||
#else
|
#else
|
||||||
#include "WProgram.h"
|
#include <WProgram.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include <PubSubClient.h>
|
#include "../Libraries/PubSubClient/src/PubSubClient.h"
|
||||||
#include "BTCWifi.h""
|
#include "BTCWifi.h""
|
||||||
#include "BTCWebServer.h"
|
#include "BTCWebServer.h"
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "../Utility/helpers.h"
|
#include "../Utility/helpers.h"
|
||||||
#include "../cfg/pins.h"
|
#include "../cfg/pins.h"
|
||||||
#include "../cfg/BTCConfig.h"
|
#include "../cfg/BTCConfig.h"
|
||||||
#include "Index.h"
|
//#include "Index.h"
|
||||||
#include "../Utility/BTC_JSON.h"
|
#include "../Utility/BTC_JSON.h"
|
||||||
#include "../Utility/Moderator.h"
|
#include "../Utility/Moderator.h"
|
||||||
#include "../Libraries/WiFiManager-dev/WiFiManager.h"
|
#include "../Libraries/WiFiManager-dev/WiFiManager.h"
|
||||||
|
|
|
@ -26,9 +26,9 @@
|
||||||
#define _BTCWEBSERVER_h
|
#define _BTCWEBSERVER_h
|
||||||
|
|
||||||
#if defined(ARDUINO) && ARDUINO >= 100
|
#if defined(ARDUINO) && ARDUINO >= 100
|
||||||
#include "arduino.h"
|
#include <Arduino.h>
|
||||||
#else
|
#else
|
||||||
#include "WProgram.h"
|
#include <WProgram.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "BTCWifi.h"
|
#include "BTCWifi.h"
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue