Alessio/docker-voltronic-homeassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing paths and json formatting after refactor testing

Browse Source
This commit is contained in:
David
2019-07-27 23:03:08 +10:00
parent ccb999b8dc
commit 84cfa20aee
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -12,7 +12,7 @@ ADD sources/ /opt/
ADD config/ /etc/inverter/ ADD config/ /etc/inverter/
RUN cd /opt/inverter-cli && \ RUN cd /opt/inverter-cli && \
mkdir bin && cmake . && make mkdir bin && cmake . && make && mv inverter_poller bin/
WORKDIR /opt WORKDIR /opt
ENTRYPOINT ["/bin/bash", "/opt/inverter-mqtt/entrypoint.sh"] ENTRYPOINT ["/bin/bash", "/opt/inverter-mqtt/entrypoint.sh"]
sources/inverter-cli/main.cpp
+1 -1
View File
@@ -264,7 +264,7 @@ int main(int argc, char* argv[]) {
printf(" \"Max_charge_current\":%d,\n", max_charge_current); printf(" \"Max_charge_current\":%d,\n", max_charge_current);
printf(" \"Out_source_priority\":%d,\n", out_source_priority); printf(" \"Out_source_priority\":%d,\n", out_source_priority);
printf(" \"Charger_source_priority\":%d,\n", charger_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(" \"Warnings\":\"%s\"\n", warnings->c_str());
printf("}\n"); printf("}\n");
sources/inverter-mqtt/mqtt-push.sh
+2 -2
View File
@@ -14,14 +14,14 @@ pushMQTTData () {
-m "$2" -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` 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 # 1 = Power_On, 2 = Standby, 3 = Line, 4 = Battery, 5 = Fault, 6 = Power_Saving, 7 = Unknown
[ ! -z "$Inverter_mode" ] && pushMQTTData "Inverter_mode" "$Inverter_mode" [ ! -z "$Inverter_mode" ] && pushMQTTData "Inverter_mode" "$Inverter_mode"
AC_grid_voltage=`echo $INVERTER_DATA | jq '.AC_grid_voltage' -r` AC_grid_voltage=`echo $INVERTER_DATA | jq '.AC_grid_voltage' -r`
sources/inverter-mqtt/mqtt-subscriber.sh
+1 -1
View File
@@ -9,6 +9,6 @@ while read rawcmd;
do do
echo "Incoming request send: [$rawcmd] to inverter." 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) done < <(mosquitto_sub -h $MQTT_SERVER -p $MQTT_PORT -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1)