diff --git a/myFox2Mqtt/business/__init__.py b/myFox2Mqtt/business/__init__.py index a325153..6cd1673 100644 --- a/myFox2Mqtt/business/__init__.py +++ b/myFox2Mqtt/business/__init__.py @@ -313,14 +313,9 @@ def ha_devices_config( mqtt_publish( mqtt_client=mqtt_client, topic=pir_config.get("topic"), - payload=pir_config.get("config"), + payload={}, retain=True, ) - mqtt_publish( - mqtt_client=mqtt_client, - topic=pir_config.get("config").get("state_topic"), - payload={"motion_sensor": "False"}, - ) def update_sites_status( diff --git a/myFox2Mqtt/docker-compose.yml b/myFox2Mqtt/docker-compose.yml index f4f6fa4..932a6ed 100644 --- a/myFox2Mqtt/docker-compose.yml +++ b/myFox2Mqtt/docker-compose.yml @@ -2,6 +2,6 @@ version: "3" services: myfox2mqtt: build: . - image: myfox2mqtt:v2023.10.0 + image: myfox2mqtt:v2023.10.1 volumes: - ./config:/config diff --git a/myFox2Mqtt/homeassistant/ha_discovery.py b/myFox2Mqtt/homeassistant/ha_discovery.py index a10bb75..294bba2 100644 --- a/myFox2Mqtt/homeassistant/ha_discovery.py +++ b/myFox2Mqtt/homeassistant/ha_discovery.py @@ -694,8 +694,8 @@ def ha_discovery_history(site: Site, mqtt_config: dict): site_config["topic"] = f"{mqtt_config.get('ha_discover_prefix', 'homeassistant')}/text/{site.siteId}/history/config" site_config["config"] = { - "name": site.label, - "unique_id": f"{site.siteId}_{site.label}", + "name": f"{site.label}_history", + "unique_id": f"{site.siteId}_{site.label}_history", "state_topic": f"{mqtt_config.get('topic_prefix', 'myFox2mqtt')}/{site.siteId}/history", "device": site_info, "mode": "text", @@ -722,7 +722,7 @@ def ha_discovery_alarm_actions(site: Site, mqtt_config: dict): site_config["topic"] = f"{mqtt_config.get('ha_discover_prefix', 'homeassistant')}/switch/{site.siteId}/siren/config" site_config["config"] = { "name": "Siren", - "unique_id": f"{site.siteId}_{site.label}", + "unique_id": f"{site.siteId}_{site.label}_siren", "command_topic": command_topic, "device": site_info, "pl_on": "panic", diff --git a/myFox2Mqtt/main.py b/myFox2Mqtt/main.py index eb615c7..8f688fd 100755 --- a/myFox2Mqtt/main.py +++ b/myFox2Mqtt/main.py @@ -15,7 +15,7 @@ from myfox.api import MyFoxApi from myfox.websocket import MyFoxWebsocket -VERSION = "2023.10.0" +VERSION = "2023.10.1" def myfox_loop(config, mqtt_client, api):