From 52c012f5a8901a20eb25e2c30449513b99eaf753 Mon Sep 17 00:00:00 2001
From: fvanroie <fvanroie@users.noreply.github.com>
Date: Wed, 29 Jan 2020 22:47:50 +0100
Subject: [PATCH] Add config override option

---
 .gitignore                       |  1 +
 platformio.ini                   | 12 ++++++++++--
 platformio_override-template.ini |  5 +++++
 src/hasp_debug.cpp               |  2 ++
 src/hasp_mqtt.cpp                |  2 ++
 src/hasp_wifi.cpp                |  3 +++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 platformio_override-template.ini

diff --git a/.gitignore b/.gitignore
index bec9bbd9..a4938ce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .pio
 data/*
 src/user_config_override.h
+platformio_override.ini
 
 ## Visual Studio Code specific ######
 .vscode
diff --git a/platformio.ini b/platformio.ini
index 6b2bae9d..01bc54a2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,6 +26,13 @@ include_dir =
     ;lvgl
     ;png_decoder
 
+extra_configs = platformio_override.ini
+
+; -- By default there are no ${override.build_flags} set
+; -- to use it, copy platformio_override.ini from the template
+[override]
+build_flags =
+
 [lcd]
 TFT_WIDTH = 240
 TFT_HEIGHT = 320
@@ -47,9 +54,9 @@ upload_speed = 921600
 ; -- Shared library dependencies in all environments
 lib_deps =
     ;lvgl@^7.0.0         ; Not in library yet 
-    TFT_eSPI@^1.5.0
+    TFT_eSPI@^2.0.0
     PubSubClient@^2.7.0  ; MQTT client
-    ArduinoJson@^6.14.1  ; needs at least 6.14.1
+    ArduinoJson@^6.14.1,>6.14.0  ; needs at least 6.14.1
     Syslog@^2.0.0
 
 ; -- littlevgl config options ----------------------
@@ -61,6 +68,7 @@ build_flags =
     -D ARDUINOJSON_DECODE_UNICODE=1 ; for utf-8 symbols
     -D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments
     -I include   ; include lv_conf.h and hasp_conf.h
+    ${override.build_flags}
 
 ;***************************************************
 ;          ESP32 build
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
new file mode 100644
index 00000000..215c9c4c
--- /dev/null
+++ b/platformio_override-template.ini
@@ -0,0 +1,5 @@
+[override]
+; -- Hasp config options ----------------------
+build_flags =
+; -- Use settings from file user_config_override.h
+    -DUSE_CONFIG_OVERRIDE
\ No newline at end of file
diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp
index 83ef28c8..351f505a 100644
--- a/src/hasp_debug.cpp
+++ b/src/hasp_debug.cpp
@@ -13,7 +13,9 @@
 #include "hasp_debug.h"
 #include "hasp_config.h"
 
+#ifdef USE_CONFIG_OVERRIDE
 #include "user_config_override.h"
+#endif
 
 #ifndef SYSLOG_SERVER
 #define SYSLOG_SERVER ""
diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index 15338f50..f8ad0f89 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -18,7 +18,9 @@
 #include "hasp_wifi.h"
 #include "hasp.h"
 
+#ifdef USE_CONFIG_OVERRIDE
 #include "user_config_override.h"
+#endif
 
 // Size of buffer for incoming MQTT message
 #define mqttMaxPacketSize 2u * 1024u
diff --git a/src/hasp_wifi.cpp b/src/hasp_wifi.cpp
index d7fab967..974cd3f8 100644
--- a/src/hasp_wifi.cpp
+++ b/src/hasp_wifi.cpp
@@ -21,7 +21,10 @@ static WiFiEventHandler wifiEventHandler[3];
 
 #endif
 #include "DNSserver.h"
+
+#ifdef USE_CONFIG_OVERRIDE
 #include "user_config_override.h"
+#endif
 
 #ifdef WIFI_SSID
 std::string wifiSsid = WIFI_SSID;