From 3241c680b122e31e5f123ba22b35fd210c89c317 Mon Sep 17 00:00:00 2001 From: effelle Date: Thu, 29 Oct 2020 18:03:59 -0300 Subject: [PATCH 1/3] Tasmota : Add new Status Sensors --- homeassistant/components/tasmota/sensor.py | 14 +++++++++++++- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/tasmota/sensor.py b/homeassistant/components/tasmota/sensor.py index 076ca457a23f59..a48c12a7db7247 100644 --- a/homeassistant/components/tasmota/sensor.py +++ b/homeassistant/components/tasmota/sensor.py @@ -1,6 +1,7 @@ """Support for Tasmota sensors.""" from typing import Optional +from hatasmota import status_sensor from hatasmota.const import ( SENSOR_AMBIENT, SENSOR_APPARENT_POWERUSAGE, @@ -33,7 +34,12 @@ SENSOR_PRESSUREATSEALEVEL, SENSOR_PROXIMITY, SENSOR_REACTIVE_POWERUSAGE, + SENSOR_STATUS_IP, + SENSOR_STATUS_LINK_COUNT, + SENSOR_STATUS_MQTT_COUNT, + SENSOR_STATUS_RSSI, SENSOR_STATUS_SIGNAL, + SENSOR_STATUS_UPTIME, SENSOR_TEMPERATURE, SENSOR_TODAY, SENSOR_TOTAL, @@ -53,6 +59,7 @@ DEVICE_CLASS_PRESSURE, DEVICE_CLASS_SIGNAL_STRENGTH, DEVICE_CLASS_TEMPERATURE, + DEVICE_CLASS_TIMESTAMP, ) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect @@ -82,7 +89,10 @@ SENSOR_FREQUENCY: {ICON: "mdi:current-ac"}, SENSOR_HUMIDITY: {DEVICE_CLASS: DEVICE_CLASS_HUMIDITY}, SENSOR_ILLUMINANCE: {DEVICE_CLASS: DEVICE_CLASS_ILLUMINANCE}, + SENSOR_STATUS_IP: {ICON: "mdi:ip-network"}, + SENSOR_STATUS_LINK_COUNT: {ICON: "mdi:counter"}, SENSOR_MOISTURE: {ICON: "mdi:cup-water"}, + SENSOR_STATUS_MQTT_COUNT: {ICON: "mdi:counter"}, SENSOR_PB0_3: {ICON: "mdi:flask"}, SENSOR_PB0_5: {ICON: "mdi:flask"}, SENSOR_PB10: {ICON: "mdi:flask"}, @@ -99,11 +109,13 @@ SENSOR_PROXIMITY: {ICON: "mdi:ruler"}, SENSOR_REACTIVE_POWERUSAGE: {DEVICE_CLASS: DEVICE_CLASS_POWER}, SENSOR_STATUS_SIGNAL: {DEVICE_CLASS: DEVICE_CLASS_SIGNAL_STRENGTH}, + SENSOR_STATUS_RSSI: {DEVICE_CLASS: DEVICE_CLASS_SIGNAL_STRENGTH}, SENSOR_TEMPERATURE: {DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE}, SENSOR_TODAY: {DEVICE_CLASS: DEVICE_CLASS_POWER}, SENSOR_TOTAL: {DEVICE_CLASS: DEVICE_CLASS_POWER}, SENSOR_TOTAL_START_TIME: {ICON: "mdi:progress-clock"}, SENSOR_TVOC: {ICON: "mdi:air-filter"}, + SENSOR_STATUS_UPTIME: {DEVICE_CLASS: DEVICE_CLASS_TIMESTAMP}, SENSOR_VOLTAGE: {ICON: "mdi:alpha-v-circle-outline"}, SENSOR_WEIGHT: {ICON: "mdi:scale"}, SENSOR_YESTERDAY: {DEVICE_CLASS: DEVICE_CLASS_POWER}, @@ -162,7 +174,7 @@ def device_class(self) -> Optional[str]: def entity_registry_enabled_default(self) -> bool: """Return if the entity should be enabled when first added to the entity registry.""" # Hide status sensors to not overwhelm users - if self._tasmota_entity.quantity == SENSOR_STATUS_SIGNAL: + if self._tasmota_entity.quantity in status_sensor.SENSORS: return False return True diff --git a/requirements_all.txt b/requirements_all.txt index 3b2b699e19ca82..8d29931ccf4abf 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -738,7 +738,7 @@ hass-nabucasa==0.37.1 hass_splunk==0.1.1 # homeassistant.components.tasmota -hatasmota==0.0.24 +hatasmota==0.0.26 # homeassistant.components.jewish_calendar hdate==0.9.12 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 2e35de3182e4f4..034482ee460aab 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -373,7 +373,7 @@ hangups==0.4.11 hass-nabucasa==0.37.1 # homeassistant.components.tasmota -hatasmota==0.0.24 +hatasmota==0.0.26 # homeassistant.components.jewish_calendar hdate==0.9.12 From 452395cd61c73dcf4de9cd52b7fc526ee4c4eb65 Mon Sep 17 00:00:00 2001 From: effelle Date: Thu, 29 Oct 2020 18:29:31 -0300 Subject: [PATCH 2/3] Tasmota: add new Status Sensors --- homeassistant/components/tasmota/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/tasmota/manifest.json b/homeassistant/components/tasmota/manifest.json index 991e38e6a95bfe..7cc6413e162f57 100644 --- a/homeassistant/components/tasmota/manifest.json +++ b/homeassistant/components/tasmota/manifest.json @@ -3,7 +3,7 @@ "name": "Tasmota (beta)", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/tasmota", - "requirements": ["hatasmota==0.0.24"], + "requirements": ["hatasmota==0.0.26"], "dependencies": ["mqtt"], "mqtt": ["tasmota/discovery/#"], "codeowners": ["@emontnemery"] From fa3a626267375ccbee42536fc53ef0c824029cc3 Mon Sep 17 00:00:00 2001 From: Federico Leoni Date: Fri, 30 Oct 2020 10:00:48 -0300 Subject: [PATCH 3/3] Update RSSI sensor icon --- homeassistant/components/tasmota/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/tasmota/sensor.py b/homeassistant/components/tasmota/sensor.py index a48c12a7db7247..badf20956650fa 100644 --- a/homeassistant/components/tasmota/sensor.py +++ b/homeassistant/components/tasmota/sensor.py @@ -109,7 +109,7 @@ SENSOR_PROXIMITY: {ICON: "mdi:ruler"}, SENSOR_REACTIVE_POWERUSAGE: {DEVICE_CLASS: DEVICE_CLASS_POWER}, SENSOR_STATUS_SIGNAL: {DEVICE_CLASS: DEVICE_CLASS_SIGNAL_STRENGTH}, - SENSOR_STATUS_RSSI: {DEVICE_CLASS: DEVICE_CLASS_SIGNAL_STRENGTH}, + SENSOR_STATUS_RSSI: {ICON: "mdi:access-point"}, SENSOR_TEMPERATURE: {DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE}, SENSOR_TODAY: {DEVICE_CLASS: DEVICE_CLASS_POWER}, SENSOR_TOTAL: {DEVICE_CLASS: DEVICE_CLASS_POWER},