cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MQTT removed debug condition

Browse Source
This commit is contained in:
jokob-sk
2024-06-12 18:42:28 +10:00
parent a6f0a364d4
commit 2ca5f5d80e
1 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
front/plugins/_publisher_mqtt/mqtt.py
View File

@@ -365,52 +365,48 @@ def mqtt_start(db):
debug_index = 0 debug_index = 0
for device in devices: for device in devices:
# TODO remove
if 'Moto' in device["dev_Name"]:
# Create devices in Home Assistant - send config messages # Create devices in Home Assistant - send config messages
deviceId = 'mac_' + device["dev_MAC"].replace(" ", "").replace(":", "_").lower() deviceId = 'mac_' + device["dev_MAC"].replace(" ", "").replace(":", "_").lower()
deviceNameDisplay = re.sub('[^a-zA-Z0-9-_\s]', '', device["dev_Name"]) deviceNameDisplay = re.sub('[^a-zA-Z0-9-_\s]', '', device["dev_Name"])
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'last_ip', 'ip-network', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'last_ip', 'ip-network', device["dev_MAC"])
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'mac_address', 'folder-key-network', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'mac_address', 'folder-key-network', device["dev_MAC"])
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'is_new', 'bell-alert-outline', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'is_new', 'bell-alert-outline', device["dev_MAC"])
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'vendor', 'cog', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'vendor', 'cog', device["dev_MAC"])
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'first_connection', 'calendar-start', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'first_connection', 'calendar-start', device["dev_MAC"])
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'last_connection', 'calendar-end', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'sensor', 'last_connection', 'calendar-end', device["dev_MAC"])
# bulk update device sensors in home assistant # bulk update device sensors in home assistant
publish_mqtt(mqtt_client, state_topic, publish_mqtt(mqtt_client, state_topic,
{ {
"last_ip": device["dev_LastIP"], "last_ip": device["dev_LastIP"],
"is_new": str(device["dev_NewDevice"]), "is_new": str(device["dev_NewDevice"]),
"vendor": sanitize_string(device["dev_Vendor"]), "vendor": sanitize_string(device["dev_Vendor"]),
"mac_address": str(device["dev_MAC"]), "mac_address": str(device["dev_MAC"]),
"last_connection": str(device["dev_LastConnection"]), "last_connection": str(device["dev_LastConnection"]),
"first_connection": str(device["dev_FirstConnection"]) "first_connection": str(device["dev_FirstConnection"])
} }
) )
# create and update is_present sensor # create and update is_present sensor
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'binary_sensor', 'is_present', 'wifi', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'binary_sensor', 'is_present', 'wifi', device["dev_MAC"])
publish_mqtt(mqtt_client, state_topic, publish_mqtt(mqtt_client, state_topic,
{ {
"is_present": to_binary_sensor(str(device["dev_PresentLastScan"])) "is_present": to_binary_sensor(str(device["dev_PresentLastScan"]))
} }
) )
# handle device_tracker # handle device_tracker
state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'device_tracker', 'is_home', 'home', device["dev_MAC"]) state_topic = create_sensor(mqtt_client, deviceId, deviceNameDisplay, 'device_tracker', 'is_home', 'home', device["dev_MAC"])
# <away|home> are only valid states # <away|home> are only valid states
state = 'away' state = 'away'
if to_binary_sensor(str(device["dev_PresentLastScan"])) == "ON": if to_binary_sensor(str(device["dev_PresentLastScan"])) == "ON":
state = 'home' state = 'home'
publish_mqtt(mqtt_client, state_topic, state) publish_mqtt(mqtt_client, state_topic, state)