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

include support for MQTT username/password

Browse Source
This commit is contained in:
David
2019-08-12 15:17:54 +10:00
parent b1399bab57
commit ebd3bbe2bc
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/inverter-mqtt/mqtt-init.sh
+7 -2
View File
@@ -6,11 +6,15 @@ MQTT_SERVER=`cat /etc/inverter/mqtt.json | jq '.server' -r`
MQTT_PORT=`cat /etc/inverter/mqtt.json | jq '.port' -r`
MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
registerTopic () {
mosquitto_pub \
-h $MQTT_SERVER \
-p $MQTT_PORT \
-u "$MQTT_USERNAME" \
-P "$MQTT_PASSWORD" \
-t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1/config" \
-m "{
\"name\": \""$MQTT_DEVICENAME"_$1\",
@@ -24,11 +28,12 @@ registerInverterRawCMD () {
mosquitto_pub \
-h $MQTT_SERVER \
-p $MQTT_PORT \
-u "$MQTT_USERNAME" \
-P "$MQTT_PASSWORD" \
-t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME/config" \
-m "{
\"name\": \""$MQTT_DEVICENAME"\",
\"state_topic\": \"$MQTT_TOPIC/sensor/$MQTT_DEVICENAME\",
\"retain\": true
\"state_topic\": \"$MQTT_TOPIC/sensor/$MQTT_DEVICENAME\"
}"
}
sources/inverter-mqtt/mqtt-push.sh
+4
View File
@@ -6,10 +6,14 @@ pushMQTTData () {
MQTT_PORT=`cat /etc/inverter/mqtt.json | jq '.port' -r`
MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
mosquitto_pub \
-h $MQTT_SERVER \
-p $MQTT_PORT \
-u "$MQTT_USERNAME" \
-P "$MQTT_PASSWORD" \
-t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1" \
-m "$2"
}
sources/inverter-mqtt/mqtt-subscriber.sh
+3 -1
View File
@@ -4,6 +4,8 @@ MQTT_SERVER=`cat /etc/inverter/mqtt.json | jq '.server' -r`
MQTT_PORT=`cat /etc/inverter/mqtt.json | jq '.port' -r`
MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
while read rawcmd;
do
@@ -11,4 +13,4 @@ do
echo "Incoming request send: [$rawcmd] to inverter."
/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 -u "$MQTT_USERNAME" -P "$MQTT_PASSWORD" -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1)