From 84cfa20aeed800bf9c6c7b51370771931c3ba26c Mon Sep 17 00:00:00 2001
From: David <david@nedved.com.au>
Date: Sat, 27 Jul 2019 23:03:08 +1000
Subject: [PATCH] fix missing paths and json formatting after refactor testing

---
 Dockerfile                               | 2 +-
 sources/inverter-cli/main.cpp            | 2 +-
 sources/inverter-mqtt/mqtt-push.sh       | 4 ++--
 sources/inverter-mqtt/mqtt-subscriber.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ef7593..9f81a23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ADD sources/ /opt/
 ADD config/ /etc/inverter/
 
 RUN cd /opt/inverter-cli && \
-    mkdir bin && cmake . && make
+    mkdir bin && cmake . && make && mv inverter_poller bin/
 
 WORKDIR /opt
 ENTRYPOINT ["/bin/bash", "/opt/inverter-mqtt/entrypoint.sh"]
\ No newline at end of file
diff --git a/sources/inverter-cli/main.cpp b/sources/inverter-cli/main.cpp
index 12606ae..8802e87 100644
--- a/sources/inverter-cli/main.cpp
+++ b/sources/inverter-cli/main.cpp
@@ -264,7 +264,7 @@ int main(int argc, char* argv[]) {
                 printf("  \"Max_charge_current\":%d,\n", max_charge_current);
                 printf("  \"Out_source_priority\":%d,\n", out_source_priority);
                 printf("  \"Charger_source_priority\":%d,\n", charger_source_priority);
-                printf("  \"Battery_redischarge_voltage\":%.1f\n", batt_redischarge_voltage);
+                printf("  \"Battery_redischarge_voltage\":%.1f,\n", batt_redischarge_voltage);
                 printf("  \"Warnings\":\"%s\"\n", warnings->c_str());
                 printf("}\n");
 
diff --git a/sources/inverter-mqtt/mqtt-push.sh b/sources/inverter-mqtt/mqtt-push.sh
index 312722a..2df9816 100755
--- a/sources/inverter-mqtt/mqtt-push.sh
+++ b/sources/inverter-mqtt/mqtt-push.sh
@@ -14,14 +14,14 @@ pushMQTTData () {
         -m "$2"
 }
 
-INVERTER_DATA=`timeout 10 /opt/voltronic-cli/bin/inverter_poller`
+INVERTER_DATA=`timeout 10 /opt/inverter-cli/bin/inverter_poller -1`
 
 #####################################################################################
 
 Inverter_mode=`echo $INVERTER_DATA | jq '.Inverter_mode' -r`
 
  # 1 = Power_On, 2 = Standby, 3 = Line, 4 = Battery, 5 = Fault, 6 = Power_Saving, 7 = Unknown
- 
+
 [ ! -z "$Inverter_mode" ] && pushMQTTData "Inverter_mode" "$Inverter_mode"
 
 AC_grid_voltage=`echo $INVERTER_DATA | jq '.AC_grid_voltage' -r`
diff --git a/sources/inverter-mqtt/mqtt-subscriber.sh b/sources/inverter-mqtt/mqtt-subscriber.sh
index 7c61289..f152e73 100755
--- a/sources/inverter-mqtt/mqtt-subscriber.sh
+++ b/sources/inverter-mqtt/mqtt-subscriber.sh
@@ -9,6 +9,6 @@ while read rawcmd;
 do
 
     echo "Incoming request send: [$rawcmd] to inverter."
-    /opt/voltronic-cli/bin/inverter_poller -r $rawcmd;
+    /opt/inverter-cli/bin/inverter_poller -r $rawcmd;
 
 done < <(mosquitto_sub -h $MQTT_SERVER -p $MQTT_PORT -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1)