hvalev преди 3 години
родител
ревизия
2ba110e1ed
променени са 2 файла, в които са добавени 15 реда и са изтрити 13 реда
  1. 5 4
      .github/workflows/main.yml
  2. 10 9
      dht22mqtt.py

+ 5 - 4
.github/workflows/main.yml

@@ -53,14 +53,15 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUBUNAME }}
           password: ${{ secrets.DOCKERHUBTOKEN }} 
+      - 
+        name: Get Version
+        uses: battila7/get-version-action@v2.2.1
       -
         name: Run Buildx
         run: |
           docker buildx build --push \
           --tag hvalev/dht22mqtt-homeassistant:latest \
-          --tag hvalev/dht22mqtt-homeassistant:${BUILD_VERSION} \
-          --tag ghcr.io/hvalev/dht22mqtt-homeassistant-docker:latest \
-          --tag ghcr.io/hvalev/dht22mqtt-homeassistant-docker:${BUILD_VERSION} \
+          --tag hvalev/dht22mqtt-homeassistant:${{steps.get_version.outputs.version-without-v}} \
           --platform linux/arm/v7,linux/arm64 .
       - 
         name: Docker Hub Description
@@ -68,4 +69,4 @@ jobs:
         env:
            DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUBUNAME }}
            DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUBPWD }}
-           DOCKERHUB_REPOSITORY: hvalev/dht22mqtt
+           DOCKERHUB_REPOSITORY: hvalev/dht22mqtt-homeassistant

+ 10 - 9
dht22mqtt.py

@@ -208,15 +208,16 @@ if('essential' in dht22mqtt_mqtt_chatter):
     client.publish(mqtt_topic + "type", "sensor", qos=1, retain=True)
     client.publish(mqtt_topic + "device", "dht22", qos=1, retain=True)
 
-    client.publish(mqtt_topic + "env/pin", dht22mqtt_pin, qos=1, retain=True)
-    client.publish(mqtt_topic + "env/brokeraddr", mqtt_brokeraddr, qos=1, retain=True)
-    client.publish(mqtt_topic + "env/refresh", dht22mqtt_refresh, qos=1, retain=True)
-    client.publish(mqtt_topic + "env/logging", dht22mqtt_logging_mode, qos=1, retain=True)
-    client.publish(mqtt_topic + "env/mqtt_chatter", dht22mqtt_mqtt_chatter, qos=1, retain=True)
-
-    client.publish(mqtt_topic + "sys/dht22_stack_size", dht22_stack_size, qos=1, retain=True)
-    client.publish(mqtt_topic + "sys/dht22_std_deviation", dht22_std_deviation, qos=1, retain=True)
-    client.publish(mqtt_topic + "sys/dht22_error_count_stack_flush", dht22_error_count_stack_flush, qos=1, retain=True)
+    if('full' in dht22mqtt_mqtt_chatter):
+        client.publish(mqtt_topic + "env/pin", dht22mqtt_pin, qos=1, retain=True)
+        client.publish(mqtt_topic + "env/brokeraddr", mqtt_brokeraddr, qos=1, retain=True)
+        client.publish(mqtt_topic + "env/refresh", dht22mqtt_refresh, qos=1, retain=True)
+        client.publish(mqtt_topic + "env/logging", dht22mqtt_logging_mode, qos=1, retain=True)
+        client.publish(mqtt_topic + "env/mqtt_chatter", dht22mqtt_mqtt_chatter, qos=1, retain=True)
+
+        client.publish(mqtt_topic + "sys/dht22_stack_size", dht22_stack_size, qos=1, retain=True)
+        client.publish(mqtt_topic + "sys/dht22_std_deviation", dht22_std_deviation, qos=1, retain=True)
+        client.publish(mqtt_topic + "sys/dht22_error_count_stack_flush", dht22_error_count_stack_flush, qos=1, retain=True)
 
     client.publish(mqtt_topic + "updated", str(datetime.now()), qos=1, retain=True)