From 0939a0839f7705783c271608881eeae1ba33da20 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 27 Jun 2024 11:34:18 +0200 Subject: [PATCH] Sort some sensor related stuff --- hatasmota/const.py | 4 ++-- hatasmota/sensor.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hatasmota/const.py b/hatasmota/const.py index efb9ecd..f8e998a 100644 --- a/hatasmota/const.py +++ b/hatasmota/const.py @@ -121,8 +121,8 @@ SENSOR_DEWPOINT: Final = "DewPoint" SENSOR_DISTANCE: Final = "Distance" SENSOR_ECO2: Final = "eCO2" -SENSOR_ENERGY: Final = "Energy" SENSOR_ENERGY_OTHER: Final = "Energy_other" +SENSOR_ENERGY: Final = "Energy" SENSOR_FREQUENCY: Final = "Frequency" SENSOR_HUMIDITY: Final = "Humidity" SENSOR_ILLUMINANCE: Final = "Illuminance" @@ -159,12 +159,12 @@ SENSOR_TEMPERATURE: Final = "Temperature" SENSOR_TODAY: Final = "Today" SENSOR_TOTAL_START_TIME: Final = "TotalStartTime" +SENSOR_TOTAL_TARIFF: Final = "TotalTariff" SENSOR_TOTAL: Final = "Total" SENSOR_TVOC: Final = "TVOC" SENSOR_VOLTAGE: Final = "Voltage" SENSOR_WEIGHT: Final = "Weight" SENSOR_YESTERDAY: Final = "Yesterday" -SENSOR_TOTAL_TARIFF: Final = "TotalTariff" SENSOR_STATUS_BATTERY_PERCENTAGE: Final = "status_battery_percentage" diff --git a/hatasmota/sensor.py b/hatasmota/sensor.py index 259bccc..3e5879a 100644 --- a/hatasmota/sensor.py +++ b/hatasmota/sensor.py @@ -194,12 +194,12 @@ SENSOR_REACTIVE_POWERUSAGE: REACTIVE_POWER, SENSOR_TODAY: ENERGY_KILO_WATT_HOUR, SENSOR_TOTAL_START_TIME: None, + SENSOR_TOTAL_TARIFF: ENERGY_KILO_WATT_HOUR, SENSOR_TOTAL: ENERGY_KILO_WATT_HOUR, SENSOR_TVOC: CONCENTRATION_PARTS_PER_BILLION, SENSOR_VOLTAGE: VOLT, SENSOR_WEIGHT: MASS_KILOGRAMS, SENSOR_YESTERDAY: ENERGY_KILO_WATT_HOUR, - SENSOR_TOTAL_TARIFF: ENERGY_KILO_WATT_HOUR, } SUPPORTED_PRESSURE_UNITS = [PRESSURE_HPA, PRESSURE_MMHG]