From 02a882ebdeb4233c640c687c667eb990b172062f Mon Sep 17 00:00:00 2001
From: Ollo <Ollo@host>
Date: Wed, 14 Jul 2021 21:21:49 +0200
Subject: [PATCH] Seperate setting itself into a local file

---
 esp32/.gitignore                 |  1 +
 esp32/host/settings.json.example | 49 +++++++++++++++++++++++++++
 esp32/host/upload-settings.sh    | 57 +++++---------------------------
 3 files changed, 58 insertions(+), 49 deletions(-)
 create mode 100644 esp32/host/settings.json.example

diff --git a/esp32/.gitignore b/esp32/.gitignore
index 56d8d09..edac7ec 100644
--- a/esp32/.gitignore
+++ b/esp32/.gitignore
@@ -7,3 +7,4 @@
 doc/
 custom_platformio.ini
 cppcheck-build-dir
+host/settings.json
diff --git a/esp32/host/settings.json.example b/esp32/host/settings.json.example
new file mode 100644
index 0000000..9ed2c8c
--- /dev/null
+++ b/esp32/host/settings.json.example
@@ -0,0 +1,49 @@
+{
+	"settings": {
+		"sleep":600,
+		"nightsleep": 1200,
+		"pumpsleep": 5,
+		"tankmax": 1000,
+		"tankmin": 100,
+		"tankwarn": 200,
+		"tankVolume": 100,
+		"lipoDSAddr": "abcdefghijklmnop",
+		"tankDSAddr": "abcdefghijklmnop",
+		"ntpServer":"pool.ntp.org",
+		"dry0":5000,
+		"hourstart0":6,
+		"hourend0":20,
+		"lowLight0": false,
+		"delay0": 10,
+		"dry1":5000,
+		"hourstart1":6,
+		"hourend1":20,
+		"lowLight1": false,
+		"delay1": 10,
+		"dry2":5000,
+		"hourstart2":6,
+		"hourend2":20,
+		"lowLight2": false,
+		"delay2": 10,		
+		"dry3":5000,
+		"hourstart3":6,
+		"hourend3":20,
+		"lowLight3": false,
+		"delay3": 10,
+		"dry4":5000,
+		"hourstart4":6,
+		"hourend4":20,
+		"lowLight4": false,
+		"delay4": 10,
+		"dry5":5000,
+		"hourstart5":6,
+		"hourend5":20,
+		"lowLight5": false,
+		"delay5": 10,
+		"dry6":5000,
+		"hourstart6":6,
+		"hourend6":20,
+		"lowLight6": false,
+		"delay6": 10
+	}
+}
diff --git a/esp32/host/upload-settings.sh b/esp32/host/upload-settings.sh
index fa823e9..8715c2b 100755
--- a/esp32/host/upload-settings.sh
+++ b/esp32/host/upload-settings.sh
@@ -12,60 +12,19 @@ mqttHost=$1
 mqttPrefix=$2
 homieId=$3
 
+settingsFile=settings.json
+if [ ! -f $settingsFile ]; then
+	echo "$settingsFile missing"
+	echo "check $settingsFile.example"
+	exit 1
+fi
+
 mosquitto_pub -h $mqttHost -t "${mqttPrefix}${homieId}/stay/alive/set" -m "1" -r
 echo "Waiting ..."
 mosquitto_sub -h $mqttHost -t "${mqttPrefix}${homieId}/#" -R -C 1
 set -e
 sleep 30
-mosquitto_pub -h $mqttHost -t "${mqttPrefix}${homieId}/\$implementation/config/set" -m "{
-	\"settings\": {
-		\"sleep\":600,
-		\"nightsleep\": 1200,
-		\"pumpsleep\": 5,
-		\"tankmax\": 1000,
-		\"tankmin\": 100,
-		\"tankwarn\": 200,
-		\"tankVolume\": 100,
-		\"lipoDSAddr\": \"abcdefghijklmnop\",
-		\"tankDSAddr\": \"abcdefghijklmnop\",
-		\"ntpServer\":\"pool.ntp.org\",
-		\"dry0\":5000,
-		\"hourstart0\":6,
-		\"hourend0\":20,
-		\"lowLight0\": false,
-		\"delay0\": 10,
-		\"dry1\":5000,
-		\"hourstart1\":6,
-		\"hourend1\":20,
-		\"lowLight1\": false,
-		\"delay1\": 10,
-		\"dry2\":5000,
-		\"hourstart2\":6,
-		\"hourend2\":20,
-		\"lowLight2\": false,
-		\"delay2\": 10,		
-		\"dry3\":5000,
-		\"hourstart3\":6,
-		\"hourend3\":20,
-		\"lowLight3\": false,
-		\"delay3\": 10,
-		\"dry4\":5000,
-		\"hourstart4\":6,
-		\"hourend4\":20,
-		\"lowLight4\": false,
-		\"delay4\": 10,
-		\"dry5\":5000,
-		\"hourstart5\":6,
-		\"hourend5\":20,
-		\"lowLight5\": false,
-		\"delay5\": 10,
-		\"dry6\":5000,
-		\"hourstart6\":6,
-		\"hourend6\":20,
-		\"lowLight6\": false,
-		\"delay6\": 10
-	}
-}"
+mosquitto_pub -h $mqttHost -t "${mqttPrefix}${homieId}/\$implementation/config/set" -f $settingsFile
 echo "Waiting for reboot"
 sleep 1
 mosquitto_sub -h $mqttHost -t "${mqttPrefix}${homieId}/#" -R -C 1