Skip to content

Add additional status sensors #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emontnemery merged 3 commits into from
Oct 29, 2020
Merged

Add additional status sensors #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a75e8a
New status sensors
effelle Oct 29, 2020
08ff238
Update status_sensor.py
effelle Oct 29, 2020
a6b2623
Update const.py
emontnemery Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions hatasmota/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,12 @@
SENSOR_PROXIMITY = "Proximity"
SENSOR_AMBIENT = "Ambient"
SENSOR_SWITCH = "Switch"
SENSOR_STATUS_MQTT_COUNT = "status_MqttCount"
SENSOR_STATUS_LINK_COUNT = "status_LinkCount"
SENSOR_STATUS_SIGNAL = "status_signal"
SENSOR_STATUS_RSSI = "status_rssi"
SENSOR_STATUS_IP = "status_ip"
SENSOR_STATUS_UPTIME = "status_Uptime"

SENSOR_UNIT_PRESSURE = "PressureUnit"
SENSOR_UNIT_SPEED = "SpeedUnit"
Expand Down
2 changes: 1 addition & 1 deletion hatasmota/discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ def get_light_entities(discovery_msg):


def get_status_sensor_entities(discovery_msg):
"""Generate light configuration."""
"""Generate Status sensors."""
status_sensor_entities = []

entities = TasmotaStatusSensorConfig.from_discovery_message(
Expand Down
48 changes: 44 additions & 4 deletions hatasmota/status_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@

import attr

from .const import CONF_DEVICENAME, CONF_MAC, SENSOR_STATUS_IP, SENSOR_STATUS_SIGNAL
from .const import (
CONF_DEVICENAME,
CONF_MAC,
SENSOR_STATUS_IP,
SENSOR_STATUS_LINK_COUNT,
SENSOR_STATUS_MQTT_COUNT,
SENSOR_STATUS_RSSI,
SENSOR_STATUS_SIGNAL,
SENSOR_STATUS_UPTIME,
)
from .entity import (
TasmotaAvailability,
TasmotaAvailabilityConfig,
Expand Down Expand Up @@ -39,35 +48,66 @@
# "LoadAvg":19 stat/STATUS11:"StatusSTS":"LoadAvg"; tele/STATE:"LoadAvg"
# }

SENSORS = [SENSOR_STATUS_IP, SENSOR_STATUS_SIGNAL]
SENSORS = [
SENSOR_STATUS_IP,
SENSOR_STATUS_SIGNAL,
SENSOR_STATUS_RSSI,
SENSOR_STATUS_MQTT_COUNT,
SENSOR_STATUS_LINK_COUNT,
SENSOR_STATUS_UPTIME,
]

NAMES = {
SENSOR_STATUS_SIGNAL: "Signal",
SENSOR_STATUS_RSSI: "RSSI",
SENSOR_STATUS_MQTT_COUNT: "MQTT connect count",
SENSOR_STATUS_LINK_COUNT: "WiFi connect count",
SENSOR_STATUS_IP: "IP",
SENSOR_STATUS_UPTIME: "Uptime",
}

STATE_PATHS = {
SENSOR_STATUS_SIGNAL: ["Wifi", "Signal"],
SENSOR_STATUS_RSSI: ["Wifi", "RSSI"],
SENSOR_STATUS_MQTT_COUNT: ["MqttCount"],
SENSOR_STATUS_LINK_COUNT: ["Wifi", "LinkCount"],
SENSOR_STATUS_UPTIME: ["Uptime"],
}

STATUS_PATHS = {
SENSOR_STATUS_SIGNAL: ["StatusSTS", "Wifi", "Signal"],
SENSOR_STATUS_RSSI: ["StatusSTS", "Wifi", "RSSI"],
SENSOR_STATUS_MQTT_COUNT: ["StatusSTS", "Wifi", "MqttCount"],
SENSOR_STATUS_LINK_COUNT: ["StatusSTS", "Wifi", "LinkCount"],
SENSOR_STATUS_IP: ["StatusNET", "IPAddress"],
SENSOR_STATUS_UPTIME: ["StatusSTS", "Uptime"],
}

STATUS_TOPICS = {
SENSOR_STATUS_SIGNAL: 11,
SENSOR_STATUS_RSSI: 11,
SENSOR_STATUS_MQTT_COUNT: 11,
SENSOR_STATUS_LINK_COUNT: 11,
SENSOR_STATUS_IP: 5,
SENSOR_STATUS_UPTIME: 11,
}

QUANTITY = {
SENSOR_STATUS_SIGNAL: SENSOR_STATUS_SIGNAL,
SENSOR_STATUS_IP: None,
SENSOR_STATUS_RSSI: SENSOR_STATUS_RSSI,
SENSOR_STATUS_MQTT_COUNT: SENSOR_STATUS_MQTT_COUNT,
SENSOR_STATUS_LINK_COUNT: SENSOR_STATUS_LINK_COUNT,
SENSOR_STATUS_IP: SENSOR_STATUS_IP,
SENSOR_STATUS_UPTIME: SENSOR_STATUS_UPTIME,
}

UNITS = {
SENSOR_STATUS_SIGNAL: "dB",
SENSOR_STATUS_RSSI: "%",
SENSOR_STATUS_MQTT_COUNT: None,
SENSOR_STATUS_LINK_COUNT: None,
SENSOR_STATUS_IP: None,
SENSOR_STATUS_UPTIME: None,
}


Expand Down Expand Up @@ -110,7 +150,7 @@ def unique_id(self):


class TasmotaStatusSensor(TasmotaAvailability, TasmotaEntity):
"""Representation of a Tasmota switch."""
"""Tasmota Status sensors."""

def __init__(self, **kwds):
"""Initialize."""
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name="HATasmota",
version="0.0.24",
version="0.0.25",
license="MIT",
url="https://github.com/emontnemery/hatasmota",
author="",
Expand Down