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

Merge pull request #45 from RSd108/master

Browse Source 
Include a clientid in mqtt commands
This commit is contained in:
ned-kelly
2021-10-06 22:36:21 +10:00
committed by GitHub
parent 24460639ac 037ce5f37b
commit 0ddffda79d
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/mqtt.json
+1
View File
@@ -5,6 +5,7 @@
"devicename": "voltronic", "devicename": "voltronic",
"username": "", "username": "",
"password": "", "password": "",
"clientid": "voltronic_bd8041d0cdf131a6ba4e5b3360b8bc5a",
"influx": { "influx": {
"enabled": "false", "enabled": "false",
"host": "http://[INFLUX_IP_OR_URL]:8086", "host": "http://[INFLUX_IP_OR_URL]:8086",
sources/inverter-mqtt/mqtt-init.sh
+3
View File
@@ -8,6 +8,7 @@ MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r` MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r` MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r` MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
MQTT_CLIENTID=`cat /etc/inverter/mqtt.json | jq '.clientid' -r`
registerTopic () { registerTopic () {
mosquitto_pub \ mosquitto_pub \
@@ -15,6 +16,7 @@ registerTopic () {
-p $MQTT_PORT \ -p $MQTT_PORT \
-u "$MQTT_USERNAME" \ -u "$MQTT_USERNAME" \
-P "$MQTT_PASSWORD" \ -P "$MQTT_PASSWORD" \
-i $MQTT_CLIENTID \
-t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1/config" \ -t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1/config" \
-m "{ -m "{
\"name\": \""$MQTT_DEVICENAME"_$1\", \"name\": \""$MQTT_DEVICENAME"_$1\",
@@ -30,6 +32,7 @@ registerInverterRawCMD () {
-p $MQTT_PORT \ -p $MQTT_PORT \
-u "$MQTT_USERNAME" \ -u "$MQTT_USERNAME" \
-P "$MQTT_PASSWORD" \ -P "$MQTT_PASSWORD" \
-i $MQTT_CLIENTID \
-t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME/config" \ -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME/config" \
-m "{ -m "{
\"name\": \""$MQTT_DEVICENAME"\", \"name\": \""$MQTT_DEVICENAME"\",
sources/inverter-mqtt/mqtt-push.sh
+2
View File
@@ -8,12 +8,14 @@ pushMQTTData () {
MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r` MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r` MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r` MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
MQTT_CLIENTID=`cat /etc/inverter/mqtt.json | jq '.clientid' -r`
mosquitto_pub \ mosquitto_pub \
-h $MQTT_SERVER \ -h $MQTT_SERVER \
-p $MQTT_PORT \ -p $MQTT_PORT \
-u "$MQTT_USERNAME" \ -u "$MQTT_USERNAME" \
-P "$MQTT_PASSWORD" \ -P "$MQTT_PASSWORD" \
-i $MQTT_CLIENTID \
-t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1" \ -t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1" \
-m "$2" -m "$2"
sources/inverter-mqtt/mqtt-subscriber.sh
+2 -1
View File
@@ -6,6 +6,7 @@ MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r` MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r` MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r` MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
MQTT_CLIENTID=`cat /etc/inverter/mqtt.json | jq '.clientid' -r`
while read rawcmd; while read rawcmd;
do do
@@ -13,4 +14,4 @@ do
echo "Incoming request send: [$rawcmd] to inverter." echo "Incoming request send: [$rawcmd] to inverter."
/opt/inverter-cli/bin/inverter_poller -r $rawcmd; /opt/inverter-cli/bin/inverter_poller -r $rawcmd;
done < <(mosquitto_sub -h $MQTT_SERVER -p $MQTT_PORT -u "$MQTT_USERNAME" -P "$MQTT_PASSWORD" -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1) done < <(mosquitto_sub -h $MQTT_SERVER -p $MQTT_PORT -u "$MQTT_USERNAME" -P "$MQTT_PASSWORD" -i $MQTT_CLIENTID -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1)