fix missing paths and json formatting after refactor testing

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
+1 -1
View File
@@ -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"]
+1 -1
View File
@@ -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");
+1 -1
View File
@@ -14,7 +14,7 @@ pushMQTTData () {
-m "$2"
}
INVERTER_DATA=`timeout 10 /opt/voltronic-cli/bin/inverter_poller`
INVERTER_DATA=`timeout 10 /opt/inverter-cli/bin/inverter_poller -1`
#####################################################################################
+1 -1
View File
@@ -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)