diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py index 74ec924af78..ba4aec66f35 100644 --- a/homeassistant/components/zha/sensor.py +++ b/homeassistant/components/zha/sensor.py @@ -216,8 +216,9 @@ class Battery(Sensor): SENSOR_ATTR = "battery_percentage_remaining" _attr_device_class: SensorDeviceClass = SensorDeviceClass.BATTERY _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT - _unit = PERCENTAGE _attr_entity_category = EntityCategory.DIAGNOSTIC + _attr_name: str = "Battery" + _unit = PERCENTAGE @classmethod def create_entity( @@ -268,6 +269,7 @@ class ElectricalMeasurement(Sensor): _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER _attr_should_poll = True # BaseZhaEntity defaults to False _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Active power" _unit = POWER_WATT _div_mul_prefix = "ac_power" @@ -309,6 +311,7 @@ class ElectricalMeasurementApparentPower( SENSOR_ATTR = "apparent_power" _attr_device_class: SensorDeviceClass = SensorDeviceClass.APPARENT_POWER _attr_should_poll = False # Poll indirectly by ElectricalMeasurementSensor + _attr_name: str = "Apparent power" _unit = POWER_VOLT_AMPERE _div_mul_prefix = "ac_power" @@ -320,6 +323,7 @@ class ElectricalMeasurementRMSCurrent(ElectricalMeasurement, id_suffix="rms_curr SENSOR_ATTR = "rms_current" _attr_device_class: SensorDeviceClass = SensorDeviceClass.CURRENT _attr_should_poll = False # Poll indirectly by ElectricalMeasurementSensor + _attr_name: str = "RMS current" _unit = ELECTRIC_CURRENT_AMPERE _div_mul_prefix = "ac_current" @@ -331,6 +335,7 @@ class ElectricalMeasurementRMSVoltage(ElectricalMeasurement, id_suffix="rms_volt SENSOR_ATTR = "rms_voltage" _attr_device_class: SensorDeviceClass = SensorDeviceClass.CURRENT _attr_should_poll = False # Poll indirectly by ElectricalMeasurementSensor + _attr_name: str = "RMS voltage" _unit = ELECTRIC_POTENTIAL_VOLT _div_mul_prefix = "ac_voltage" @@ -342,6 +347,7 @@ class ElectricalMeasurementFrequency(ElectricalMeasurement, id_suffix="ac_freque SENSOR_ATTR = "ac_frequency" _attr_device_class: SensorDeviceClass = SensorDeviceClass.FREQUENCY _attr_should_poll = False # Poll indirectly by ElectricalMeasurementSensor + _attr_name: str = "AC frequency" _unit = FREQUENCY_HERTZ _div_mul_prefix = "ac_frequency" @@ -353,6 +359,7 @@ class ElectricalMeasurementPowerFactor(ElectricalMeasurement, id_suffix="power_f SENSOR_ATTR = "power_factor" _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER_FACTOR _attr_should_poll = False # Poll indirectly by ElectricalMeasurementSensor + _attr_name: str = "Power factor" _unit = PERCENTAGE @@ -366,6 +373,7 @@ class Humidity(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.HUMIDITY _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Humidity" _divisor = 100 _unit = PERCENTAGE @@ -377,6 +385,7 @@ class SoilMoisture(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.HUMIDITY _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Soil moisture" _divisor = 100 _unit = PERCENTAGE @@ -388,6 +397,7 @@ class LeafWetness(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.HUMIDITY _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Leaf wetness" _divisor = 100 _unit = PERCENTAGE @@ -399,6 +409,7 @@ class Illuminance(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.ILLUMINANCE _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Illuminance" _unit = LIGHT_LUX def formatter(self, value: int) -> float: @@ -416,6 +427,7 @@ class SmartEnergyMetering(Sensor): SENSOR_ATTR: int | str = "instantaneous_demand" _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Instantaneous demand" unit_of_measure_map = { 0x00: POWER_WATT, @@ -463,6 +475,7 @@ class SmartEnergySummation(SmartEnergyMetering, id_suffix="summation_delivered") SENSOR_ATTR: int | str = "current_summ_delivered" _attr_device_class: SensorDeviceClass = SensorDeviceClass.ENERGY _attr_state_class: SensorStateClass = SensorStateClass.TOTAL_INCREASING + _attr_name: str = "Summation delivered" unit_of_measure_map = { 0x00: ENERGY_KILO_WATT_HOUR, @@ -513,6 +526,7 @@ class Pressure(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.PRESSURE _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Pressure" _decimals = 0 _unit = PRESSURE_HPA @@ -524,6 +538,7 @@ class Temperature(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.TEMPERATURE _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Temperature" _divisor = 100 _unit = TEMP_CELSIUS @@ -535,6 +550,7 @@ class DeviceTemperature(Sensor): SENSOR_ATTR = "current_temperature" _attr_device_class: SensorDeviceClass = SensorDeviceClass.TEMPERATURE _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Device temperature" _divisor = 100 _unit = TEMP_CELSIUS _attr_entity_category = EntityCategory.DIAGNOSTIC @@ -547,6 +563,7 @@ class CarbonDioxideConcentration(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.CO2 _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Carbon dioxide concentration" _decimals = 0 _multiplier = 1e6 _unit = CONCENTRATION_PARTS_PER_MILLION @@ -559,6 +576,7 @@ class CarbonMonoxideConcentration(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.CO _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Carbon monoxide concentration" _decimals = 0 _multiplier = 1e6 _unit = CONCENTRATION_PARTS_PER_MILLION @@ -572,6 +590,7 @@ class VOCLevel(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "VOC level" _decimals = 0 _multiplier = 1e6 _unit = CONCENTRATION_MICROGRAMS_PER_CUBIC_METER @@ -588,6 +607,7 @@ class PPBVOCLevel(Sensor): SENSOR_ATTR = "measured_value" _attr_device_class: SensorDeviceClass = SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "VOC level" _decimals = 0 _multiplier = 1 _unit = CONCENTRATION_PARTS_PER_BILLION @@ -599,6 +619,7 @@ class PM25(Sensor): SENSOR_ATTR = "measured_value" _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Particulate matter" _decimals = 0 _multiplier = 1 _unit = CONCENTRATION_MICROGRAMS_PER_CUBIC_METER @@ -610,6 +631,7 @@ class FormaldehydeConcentration(Sensor): SENSOR_ATTR = "measured_value" _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_name: str = "Formaldehyde concentration" _decimals = 0 _multiplier = 1e6 _unit = CONCENTRATION_PARTS_PER_MILLION @@ -619,6 +641,8 @@ class FormaldehydeConcentration(Sensor): class ThermostatHVACAction(Sensor, id_suffix="hvac_action"): """Thermostat HVAC action sensor.""" + _attr_name: str = "HVAC action" + @classmethod def create_entity( cls: type[_ThermostatHVACActionSelfT], @@ -744,6 +768,7 @@ class RSSISensor(Sensor, id_suffix="rssi"): _attr_entity_category = EntityCategory.DIAGNOSTIC _attr_entity_registry_enabled_default = False _attr_should_poll = True # BaseZhaEntity defaults to False + _attr_name: str = "RSSI" unique_id_suffix: str @classmethod @@ -773,6 +798,8 @@ class RSSISensor(Sensor, id_suffix="rssi"): class LQISensor(RSSISensor, id_suffix="lqi"): """LQI sensor for a device.""" + _attr_name: str = "LQI" + @MULTI_MATCH( channel_names="tuya_manufacturer", @@ -786,6 +813,7 @@ class TimeLeft(Sensor, id_suffix="time_left"): SENSOR_ATTR = "timer_time_left" _attr_device_class: SensorDeviceClass = SensorDeviceClass.DURATION _attr_icon = "mdi:timer" + _attr_name: str = "Time left" _unit = TIME_MINUTES @@ -796,6 +824,7 @@ class IkeaDeviceRunTime(Sensor, id_suffix="device_run_time"): SENSOR_ATTR = "device_run_time" _attr_device_class: SensorDeviceClass = SensorDeviceClass.DURATION _attr_icon = "mdi:timer" + _attr_name: str = "Device run time" _unit = TIME_MINUTES @@ -806,4 +835,5 @@ class IkeaFilterRunTime(Sensor, id_suffix="filter_run_time"): SENSOR_ATTR = "filter_run_time" _attr_device_class: SensorDeviceClass = SensorDeviceClass.DURATION _attr_icon = "mdi:timer" + _attr_name: str = "Filter run time" _unit = TIME_MINUTES diff --git a/tests/components/zha/test_sensor.py b/tests/components/zha/test_sensor.py index 0698c07db9e..55ea9833caa 100644 --- a/tests/components/zha/test_sensor.py +++ b/tests/components/zha/test_sensor.py @@ -309,7 +309,7 @@ async def async_test_device_temperature(hass, cluster, entity_id): ), ( smartenergy.Metering.cluster_id, - "smartenergy_metering", + "instantaneous_demand", async_test_metering, 1, { @@ -323,7 +323,7 @@ async def async_test_device_temperature(hass, cluster, entity_id): ), ( smartenergy.Metering.cluster_id, - "smartenergy_summation", + "summation_delivered", async_test_smart_energy_summation, 1, { @@ -339,7 +339,7 @@ async def async_test_device_temperature(hass, cluster, entity_id): ), ( homeautomation.ElectricalMeasurement.cluster_id, - "electrical_measurement", + "active_power", async_test_electrical_measurement, 7, {"ac_power_divisor": 1000, "ac_power_multiplier": 1}, @@ -347,7 +347,7 @@ async def async_test_device_temperature(hass, cluster, entity_id): ), ( homeautomation.ElectricalMeasurement.cluster_id, - "electrical_measurement_apparent_power", + "apparent_power", async_test_em_apparent_power, 7, {"ac_power_divisor": 1000, "ac_power_multiplier": 1}, @@ -355,7 +355,7 @@ async def async_test_device_temperature(hass, cluster, entity_id): ), ( homeautomation.ElectricalMeasurement.cluster_id, - "electrical_measurement_rms_current", + "rms_current", async_test_em_rms_current, 7, {"ac_current_divisor": 1000, "ac_current_multiplier": 1}, @@ -363,7 +363,7 @@ async def async_test_device_temperature(hass, cluster, entity_id): ), ( homeautomation.ElectricalMeasurement.cluster_id, - "electrical_measurement_rms_voltage", + "rms_voltage", async_test_em_rms_voltage, 7, {"ac_voltage_divisor": 10, "ac_voltage_multiplier": 1}, @@ -437,7 +437,7 @@ async def test_sensor( zigpy_device.node_desc.mac_capability_flags |= 0b_0000_0100 cluster.PLUGGED_ATTR_READS = read_plug zha_device = await zha_device_joined_restored(zigpy_device) - entity_id = ENTITY_ID_PREFIX.format(entity_suffix.replace("_", "")) + entity_id = ENTITY_ID_PREFIX.format(entity_suffix) await async_enable_traffic(hass, [zha_device], enabled=False) await hass.async_block_till_done() @@ -642,37 +642,37 @@ async def test_electrical_measurement_init( homeautomation.ElectricalMeasurement.cluster_id, {"apparent_power", "rms_voltage", "rms_current"}, { - "electrical_measurement", - "electrical_measurement_frequency", - "electrical_measurement_power_factor", + "active_power", + "ac_frequency", + "power_factor", }, { - "electrical_measurement_apparent_power", - "electrical_measurement_rms_voltage", - "electrical_measurement_rms_current", + "apparent_power", + "rms_voltage", + "rms_current", }, ), ( homeautomation.ElectricalMeasurement.cluster_id, {"apparent_power", "rms_current", "ac_frequency", "power_factor"}, - {"electrical_measurement_rms_voltage", "electrical_measurement"}, + {"rms_voltage", "active_power"}, { - "electrical_measurement_apparent_power", - "electrical_measurement_rms_current", - "electrical_measurement_frequency", - "electrical_measurement_power_factor", + "apparent_power", + "rms_current", + "ac_frequency", + "power_factor", }, ), ( homeautomation.ElectricalMeasurement.cluster_id, set(), { - "electrical_measurement_rms_voltage", - "electrical_measurement", - "electrical_measurement_apparent_power", - "electrical_measurement_rms_current", - "electrical_measurement_frequency", - "electrical_measurement_power_factor", + "rms_voltage", + "active_power", + "apparent_power", + "rms_current", + "ac_frequency", + "power_factor", }, set(), ), @@ -682,10 +682,10 @@ async def test_electrical_measurement_init( "instantaneous_demand", }, { - "smartenergy_summation", + "summation_delivered", }, { - "smartenergy_metering", + "instantaneous_demand", }, ), ( @@ -693,16 +693,16 @@ async def test_electrical_measurement_init( {"instantaneous_demand", "current_summ_delivered"}, {}, { - "smartenergy_summation", - "smartenergy_metering", + "summation_delivered", + "instantaneous_demand", }, ), ( smartenergy.Metering.cluster_id, {}, { - "smartenergy_summation", - "smartenergy_metering", + "summation_delivered", + "instantaneous_demand", }, {}, ), @@ -719,10 +719,8 @@ async def test_unsupported_attributes_sensor( ): """Test zha sensor platform.""" - entity_ids = {ENTITY_ID_PREFIX.format(e.replace("_", "")) for e in entity_ids} - missing_entity_ids = { - ENTITY_ID_PREFIX.format(e.replace("_", "")) for e in missing_entity_ids - } + entity_ids = {ENTITY_ID_PREFIX.format(e) for e in entity_ids} + missing_entity_ids = {ENTITY_ID_PREFIX.format(e) for e in missing_entity_ids} zigpy_device = zigpy_device_mock( { @@ -836,7 +834,7 @@ async def test_se_summation_uom( ): """Test zha smart energy summation.""" - entity_id = ENTITY_ID_PREFIX.format("smartenergysummation") + entity_id = ENTITY_ID_PREFIX.format("summation_delivered") zigpy_device = zigpy_device_mock( { 1: { @@ -890,7 +888,7 @@ async def test_elec_measurement_sensor_type( ): """Test zha electrical measurement sensor type.""" - entity_id = ENTITY_ID_PREFIX.format("electricalmeasurement") + entity_id = ENTITY_ID_PREFIX.format("active_power") zigpy_dev = elec_measurement_zigpy_dev zigpy_dev.endpoints[1].electrical_measurement.PLUGGED_ATTR_READS[ "measurement_type" @@ -939,7 +937,7 @@ async def test_elec_measurement_skip_unsupported_attribute( ): """Test zha electrical measurement skipping update of unsupported attributes.""" - entity_id = ENTITY_ID_PREFIX.format("electricalmeasurement") + entity_id = ENTITY_ID_PREFIX.format("active_power") zha_dev = elec_measurement_zha_dev cluster = zha_dev.device.endpoints[1].electrical_measurement diff --git a/tests/components/zha/zha_devices_list.py b/tests/components/zha/zha_devices_list.py index f79ba06f721..72ce080781d 100644 --- a/tests/components/zha/zha_devices_list.py +++ b/tests/components/zha/zha_devices_list.py @@ -177,14 +177,14 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019"], DEV_SIG_ENTITIES: [ "button.centralite_3210_l_identifybutton", - "sensor.centralite_3210_l_electricalmeasurement", - "sensor.centralite_3210_l_electricalmeasurementapparentpower", - "sensor.centralite_3210_l_electricalmeasurementrmscurrent", - "sensor.centralite_3210_l_electricalmeasurementrmsvoltage", - "sensor.centralite_3210_l_electricalmeasurementfrequency", - "sensor.centralite_3210_l_electricalmeasurementpowerfactor", - "sensor.centralite_3210_l_smartenergymetering", - "sensor.centralite_3210_l_smartenergysummation", + "sensor.centralite_3210_l_active_power", + "sensor.centralite_3210_l_apparent_power", + "sensor.centralite_3210_l_rms_current", + "sensor.centralite_3210_l_rms_voltage", + "sensor.centralite_3210_l_ac_frequency", + "sensor.centralite_3210_l_power_factor", + "sensor.centralite_3210_l_instantaneous_demand", + "sensor.centralite_3210_l_summation_delivered", "switch.centralite_3210_l_switch", "sensor.centralite_3210_l_rssi", "sensor.centralite_3210_l_lqi", @@ -203,42 +203,42 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.centralite_3210_l_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -590,8 +590,8 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["4:0x0019"], DEV_SIG_ENTITIES: [ "button.climaxtechnology_psmp5_00_00_02_02tc_identifybutton", - "sensor.climaxtechnology_psmp5_00_00_02_02tc_smartenergymetering", - "sensor.climaxtechnology_psmp5_00_00_02_02tc_smartenergysummation", + "sensor.climaxtechnology_psmp5_00_00_02_02tc_instantaneous_demand", + "sensor.climaxtechnology_psmp5_00_00_02_02tc_summation_delivered", "switch.climaxtechnology_psmp5_00_00_02_02tc_switch", "sensor.climaxtechnology_psmp5_00_00_02_02tc_rssi", "sensor.climaxtechnology_psmp5_00_00_02_02tc_lqi", @@ -610,12 +610,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.climaxtechnology_psmp5_00_00_02_02tc_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.climaxtechnology_psmp5_00_00_02_02tc_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.climaxtechnology_psmp5_00_00_02_02tc_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.climaxtechnology_psmp5_00_00_02_02tc_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -1580,8 +1580,8 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019", "2:0x0006", "2:0x0008"], DEV_SIG_ENTITIES: [ "button.jasco_products_45852_identifybutton", - "sensor.jasco_products_45852_smartenergymetering", - "sensor.jasco_products_45852_smartenergysummation", + "sensor.jasco_products_45852_instantaneous_demand", + "sensor.jasco_products_45852_summation_delivered", "light.jasco_products_45852_light", "sensor.jasco_products_45852_rssi", "sensor.jasco_products_45852_lqi", @@ -1600,12 +1600,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45852_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45852_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45852_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45852_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -1644,8 +1644,8 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.jasco_products_45856_identifybutton", "light.jasco_products_45856_light", - "sensor.jasco_products_45856_smartenergymetering", - "sensor.jasco_products_45856_smartenergysummation", + "sensor.jasco_products_45856_instantaneous_demand", + "sensor.jasco_products_45856_summation_delivered", "sensor.jasco_products_45856_rssi", "sensor.jasco_products_45856_lqi", ], @@ -1663,12 +1663,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45856_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45856_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45856_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45856_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -1707,8 +1707,8 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.jasco_products_45857_identifybutton", "light.jasco_products_45857_light", - "sensor.jasco_products_45857_smartenergymetering", - "sensor.jasco_products_45857_smartenergysummation", + "sensor.jasco_products_45857_instantaneous_demand", + "sensor.jasco_products_45857_summation_delivered", "sensor.jasco_products_45857_rssi", "sensor.jasco_products_45857_lqi", ], @@ -1726,12 +1726,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45857_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45857_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45857_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.jasco_products_45857_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -2239,19 +2239,19 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019"], DEV_SIG_ENTITIES: [ "button.lumi_lumi_plug_maus01_identifybutton", - "sensor.lumi_lumi_plug_maus01_electricalmeasurement", - "sensor.lumi_lumi_plug_maus01_electricalmeasurementapparentpower", - "sensor.lumi_lumi_plug_maus01_electricalmeasurementrmscurrent", - "sensor.lumi_lumi_plug_maus01_electricalmeasurementrmsvoltage", - "sensor.lumi_lumi_plug_maus01_electricalmeasurementfrequency", - "sensor.lumi_lumi_plug_maus01_electricalmeasurementpowerfactor", + "sensor.lumi_lumi_plug_maus01_active_power", + "sensor.lumi_lumi_plug_maus01_apparent_power", + "sensor.lumi_lumi_plug_maus01_rms_current", + "sensor.lumi_lumi_plug_maus01_rms_voltage", + "sensor.lumi_lumi_plug_maus01_ac_frequency", + "sensor.lumi_lumi_plug_maus01_power_factor", "sensor.lumi_lumi_plug_maus01_analoginput", "sensor.lumi_lumi_plug_maus01_analoginput_2", "binary_sensor.lumi_lumi_plug_maus01_binaryinput", "switch.lumi_lumi_plug_maus01_switch", "sensor.lumi_lumi_plug_maus01_rssi", "sensor.lumi_lumi_plug_maus01_lqi", - "sensor.lumi_lumi_plug_maus01_devicetemperature", + "sensor.lumi_lumi_plug_maus01_device_temperature", ], DEV_SIG_ENT_MAP: { ("switch", "00:11:22:33:44:55:66:77-1"): { @@ -2262,7 +2262,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2"): { DEV_SIG_CHANNELS: ["device_temperature"], DEV_SIG_ENT_MAP_CLASS: "DeviceTemperature", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_devicetemperature", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_device_temperature", }, ("button", "00:11:22:33:44:55:66:77-1-3"): { DEV_SIG_CHANNELS: ["identify"], @@ -2272,32 +2272,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_plug_maus01_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -2352,15 +2352,15 @@ DEVICES = [ "button.lumi_lumi_relay_c2acn01_identifybutton", "light.lumi_lumi_relay_c2acn01_light", "light.lumi_lumi_relay_c2acn01_light_2", - "sensor.lumi_lumi_relay_c2acn01_electricalmeasurement", - "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementapparentpower", - "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementrmscurrent", - "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementrmsvoltage", - "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementfrequency", - "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementpowerfactor", + "sensor.lumi_lumi_relay_c2acn01_active_power", + "sensor.lumi_lumi_relay_c2acn01_apparent_power", + "sensor.lumi_lumi_relay_c2acn01_rms_current", + "sensor.lumi_lumi_relay_c2acn01_rms_voltage", + "sensor.lumi_lumi_relay_c2acn01_ac_frequency", + "sensor.lumi_lumi_relay_c2acn01_power_factor", "sensor.lumi_lumi_relay_c2acn01_rssi", "sensor.lumi_lumi_relay_c2acn01_lqi", - "sensor.lumi_lumi_relay_c2acn01_devicetemperature", + "sensor.lumi_lumi_relay_c2acn01_device_temperature", ], DEV_SIG_ENT_MAP: { ("light", "00:11:22:33:44:55:66:77-1"): { @@ -2371,7 +2371,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2"): { DEV_SIG_CHANNELS: ["device_temperature"], DEV_SIG_ENT_MAP_CLASS: "DeviceTemperature", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_devicetemperature", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_device_temperature", }, ("button", "00:11:22:33:44:55:66:77-1-3"): { DEV_SIG_CHANNELS: ["identify"], @@ -2381,32 +2381,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_relay_c2acn01_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -3513,7 +3513,7 @@ DEVICES = [ "binary_sensor.lumi_lumi_sensor_wleak_aq1_iaszone", "sensor.lumi_lumi_sensor_wleak_aq1_rssi", "sensor.lumi_lumi_sensor_wleak_aq1_lqi", - "sensor.lumi_lumi_sensor_wleak_aq1_devicetemperature", + "sensor.lumi_lumi_sensor_wleak_aq1_device_temperature", ], DEV_SIG_ENT_MAP: { ("binary_sensor", "00:11:22:33:44:55:66:77-1-1280"): { @@ -3524,7 +3524,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2"): { DEV_SIG_CHANNELS: ["device_temperature"], DEV_SIG_ENT_MAP_CLASS: "DeviceTemperature", - DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_sensor_wleak_aq1_devicetemperature", + DEV_SIG_ENT_MAP_ID: "sensor.lumi_lumi_sensor_wleak_aq1_device_temperature", }, ("button", "00:11:22:33:44:55:66:77-1-3"): { DEV_SIG_CHANNELS: ["identify"], @@ -3966,12 +3966,12 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.osram_lightify_rt_tunable_white_identifybutton", "light.osram_lightify_rt_tunable_white_light", - "sensor.osram_lightify_rt_tunable_white_electricalmeasurement", - "sensor.osram_lightify_rt_tunable_white_electricalmeasurementapparentpower", - "sensor.osram_lightify_rt_tunable_white_electricalmeasurementrmscurrent", - "sensor.osram_lightify_rt_tunable_white_electricalmeasurementrmsvoltage", - "sensor.osram_lightify_rt_tunable_white_electricalmeasurementfrequency", - "sensor.osram_lightify_rt_tunable_white_electricalmeasurementpowerfactor", + "sensor.osram_lightify_rt_tunable_white_active_power", + "sensor.osram_lightify_rt_tunable_white_apparent_power", + "sensor.osram_lightify_rt_tunable_white_rms_current", + "sensor.osram_lightify_rt_tunable_white_rms_voltage", + "sensor.osram_lightify_rt_tunable_white_ac_frequency", + "sensor.osram_lightify_rt_tunable_white_power_factor", "sensor.osram_lightify_rt_tunable_white_rssi", "sensor.osram_lightify_rt_tunable_white_lqi", ], @@ -3989,32 +3989,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-3-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.osram_lightify_rt_tunable_white_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-3-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -4045,12 +4045,12 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["3:0x0019"], DEV_SIG_ENTITIES: [ "button.osram_plug_01_identifybutton", - "sensor.osram_plug_01_electricalmeasurement", - "sensor.osram_plug_01_electricalmeasurementapparentpower", - "sensor.osram_plug_01_electricalmeasurementrmscurrent", - "sensor.osram_plug_01_electricalmeasurementrmsvoltage", - "sensor.osram_plug_01_electricalmeasurementfrequency", - "sensor.osram_plug_01_electricalmeasurementpowerfactor", + "sensor.osram_plug_01_active_power", + "sensor.osram_plug_01_apparent_power", + "sensor.osram_plug_01_rms_current", + "sensor.osram_plug_01_rms_voltage", + "sensor.osram_plug_01_ac_frequency", + "sensor.osram_plug_01_power_factor", "switch.osram_plug_01_switch", "sensor.osram_plug_01_rssi", "sensor.osram_plug_01_lqi", @@ -4069,32 +4069,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-3-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-3-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.osram_plug_01_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-3-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -4449,12 +4449,12 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0005", "1:0x0006", "1:0x0019"], DEV_SIG_ENTITIES: [ "button.securifi_ltd_unk_model_identifybutton", - "sensor.securifi_ltd_unk_model_electricalmeasurement", - "sensor.securifi_ltd_unk_model_electricalmeasurementapparentpower", - "sensor.securifi_ltd_unk_model_electricalmeasurementrmscurrent", - "sensor.securifi_ltd_unk_model_electricalmeasurementrmsvoltage", - "sensor.securifi_ltd_unk_model_electricalmeasurementfrequency", - "sensor.securifi_ltd_unk_model_electricalmeasurementpowerfactor", + "sensor.securifi_ltd_unk_model_active_power", + "sensor.securifi_ltd_unk_model_apparent_power", + "sensor.securifi_ltd_unk_model_rms_current", + "sensor.securifi_ltd_unk_model_rms_voltage", + "sensor.securifi_ltd_unk_model_ac_frequency", + "sensor.securifi_ltd_unk_model_power_factor", "switch.securifi_ltd_unk_model_switch", "sensor.securifi_ltd_unk_model_rssi", "sensor.securifi_ltd_unk_model_lqi", @@ -4468,32 +4468,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.securifi_ltd_unk_model_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -4592,14 +4592,14 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019", "2:0x0006"], DEV_SIG_ENTITIES: [ "button.sercomm_corp_sz_esw01_identifybutton", - "sensor.sercomm_corp_sz_esw01_electricalmeasurement", - "sensor.sercomm_corp_sz_esw01_electricalmeasurementapparentpower", - "sensor.sercomm_corp_sz_esw01_electricalmeasurementrmscurrent", - "sensor.sercomm_corp_sz_esw01_electricalmeasurementrmsvoltage", - "sensor.sercomm_corp_sz_esw01_electricalmeasurementfrequency", - "sensor.sercomm_corp_sz_esw01_electricalmeasurementpowerfactor", - "sensor.sercomm_corp_sz_esw01_smartenergymetering", - "sensor.sercomm_corp_sz_esw01_smartenergysummation", + "sensor.sercomm_corp_sz_esw01_active_power", + "sensor.sercomm_corp_sz_esw01_apparent_power", + "sensor.sercomm_corp_sz_esw01_rms_current", + "sensor.sercomm_corp_sz_esw01_rms_voltage", + "sensor.sercomm_corp_sz_esw01_ac_frequency", + "sensor.sercomm_corp_sz_esw01_power_factor", + "sensor.sercomm_corp_sz_esw01_instantaneous_demand", + "sensor.sercomm_corp_sz_esw01_summation_delivered", "light.sercomm_corp_sz_esw01_light", "sensor.sercomm_corp_sz_esw01_rssi", "sensor.sercomm_corp_sz_esw01_lqi", @@ -4618,42 +4618,42 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.sercomm_corp_sz_esw01_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -4746,12 +4746,12 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019"], DEV_SIG_ENTITIES: [ "button.sinope_technologies_rm3250zb_identifybutton", - "sensor.sinope_technologies_rm3250zb_electricalmeasurement", - "sensor.sinope_technologies_rm3250zb_electricalmeasurementapparentpower", - "sensor.sinope_technologies_rm3250zb_electricalmeasurementrmscurrent", - "sensor.sinope_technologies_rm3250zb_electricalmeasurementrmsvoltage", - "sensor.sinope_technologies_rm3250zb_electricalmeasurementfrequency", - "sensor.sinope_technologies_rm3250zb_electricalmeasurementpowerfactor", + "sensor.sinope_technologies_rm3250zb_active_power", + "sensor.sinope_technologies_rm3250zb_apparent_power", + "sensor.sinope_technologies_rm3250zb_rms_current", + "sensor.sinope_technologies_rm3250zb_rms_voltage", + "sensor.sinope_technologies_rm3250zb_ac_frequency", + "sensor.sinope_technologies_rm3250zb_power_factor", "switch.sinope_technologies_rm3250zb_switch", "sensor.sinope_technologies_rm3250zb_rssi", "sensor.sinope_technologies_rm3250zb_lqi", @@ -4765,32 +4765,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_rm3250zb_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -4833,14 +4833,14 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019"], DEV_SIG_ENTITIES: [ "button.sinope_technologies_th1123zb_identifybutton", - "sensor.sinope_technologies_th1123zb_electricalmeasurement", - "sensor.sinope_technologies_th1123zb_electricalmeasurementapparentpower", - "sensor.sinope_technologies_th1123zb_electricalmeasurementrmscurrent", - "sensor.sinope_technologies_th1123zb_electricalmeasurementrmsvoltage", - "sensor.sinope_technologies_th1123zb_electricalmeasurementfrequency", - "sensor.sinope_technologies_th1123zb_electricalmeasurementpowerfactor", + "sensor.sinope_technologies_th1123zb_active_power", + "sensor.sinope_technologies_th1123zb_apparent_power", + "sensor.sinope_technologies_th1123zb_rms_current", + "sensor.sinope_technologies_th1123zb_rms_voltage", + "sensor.sinope_technologies_th1123zb_ac_frequency", + "sensor.sinope_technologies_th1123zb_power_factor", "sensor.sinope_technologies_th1123zb_temperature", - "sensor.sinope_technologies_th1123zb_sinopehvacaction", + "sensor.sinope_technologies_th1123zb_hvac_action", "climate.sinope_technologies_th1123zb_thermostat", "sensor.sinope_technologies_th1123zb_rssi", "sensor.sinope_technologies_th1123zb_lqi", @@ -4859,32 +4859,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-1026"): { DEV_SIG_CHANNELS: ["temperature"], @@ -4904,7 +4904,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-513-hvac_action"): { DEV_SIG_CHANNELS: ["thermostat"], DEV_SIG_ENT_MAP_CLASS: "SinopeHVACAction", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_sinopehvacaction", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1123zb_hvac_action", }, }, }, @@ -4932,14 +4932,14 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019"], DEV_SIG_ENTITIES: [ "button.sinope_technologies_th1124zb_identifybutton", - "sensor.sinope_technologies_th1124zb_electricalmeasurement", - "sensor.sinope_technologies_th1124zb_electricalmeasurementapparentpower", - "sensor.sinope_technologies_th1124zb_electricalmeasurementrmscurrent", - "sensor.sinope_technologies_th1124zb_electricalmeasurementrmsvoltage", - "sensor.sinope_technologies_th1124zb_electricalmeasurementfrequency", - "sensor.sinope_technologies_th1124zb_electricalmeasurementpowerfactor", + "sensor.sinope_technologies_th1124zb_active_power", + "sensor.sinope_technologies_th1124zb_apparent_power", + "sensor.sinope_technologies_th1124zb_rms_current", + "sensor.sinope_technologies_th1124zb_rms_voltage", + "sensor.sinope_technologies_th1124zb_ac_frequency", + "sensor.sinope_technologies_th1124zb_power_factor", "sensor.sinope_technologies_th1124zb_temperature", - "sensor.sinope_technologies_th1124zb_sinopehvacaction", + "sensor.sinope_technologies_th1124zb_hvac_action", "climate.sinope_technologies_th1124zb_thermostat", "sensor.sinope_technologies_th1124zb_rssi", "sensor.sinope_technologies_th1124zb_lqi", @@ -4958,32 +4958,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-1026"): { DEV_SIG_CHANNELS: ["temperature"], @@ -5003,7 +5003,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-513-hvac_action"): { DEV_SIG_CHANNELS: ["thermostat"], DEV_SIG_ENT_MAP_CLASS: "SinopeHVACAction", - DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_sinopehvacaction", + DEV_SIG_ENT_MAP_ID: "sensor.sinope_technologies_th1124zb_hvac_action", }, }, }, @@ -5024,12 +5024,12 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: ["1:0x0019"], DEV_SIG_ENTITIES: [ "button.smartthings_outletv4_identifybutton", - "sensor.smartthings_outletv4_electricalmeasurement", - "sensor.smartthings_outletv4_electricalmeasurementapparentpower", - "sensor.smartthings_outletv4_electricalmeasurementrmscurrent", - "sensor.smartthings_outletv4_electricalmeasurementrmsvoltage", - "sensor.smartthings_outletv4_electricalmeasurementfrequency", - "sensor.smartthings_outletv4_electricalmeasurementpowerfactor", + "sensor.smartthings_outletv4_active_power", + "sensor.smartthings_outletv4_apparent_power", + "sensor.smartthings_outletv4_rms_current", + "sensor.smartthings_outletv4_rms_voltage", + "sensor.smartthings_outletv4_ac_frequency", + "sensor.smartthings_outletv4_power_factor", "binary_sensor.smartthings_outletv4_binaryinput", "switch.smartthings_outletv4_switch", "sensor.smartthings_outletv4_rssi", @@ -5049,32 +5049,32 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-2820"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurement", - DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_electricalmeasurement", + DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_active_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-apparent_power"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementApparentPower", - DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_electricalmeasurementapparentpower", + DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_apparent_power", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_current"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSCurrent", - DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_electricalmeasurementrmscurrent", + DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_rms_current", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-rms_voltage"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementRMSVoltage", - DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_electricalmeasurementrmsvoltage", + DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_rms_voltage", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-ac_frequency"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementFrequency", - DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_electricalmeasurementfrequency", + DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_ac_frequency", }, ("sensor", "00:11:22:33:44:55:66:77-1-2820-power_factor"): { DEV_SIG_CHANNELS: ["electrical_measurement"], DEV_SIG_ENT_MAP_CLASS: "ElectricalMeasurementPowerFactor", - DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_electricalmeasurementpowerfactor", + DEV_SIG_ENT_MAP_ID: "sensor.smartthings_outletv4_power_factor", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -5311,7 +5311,7 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.zen_within_zen_01_identifybutton", "sensor.zen_within_zen_01_battery", - "sensor.zen_within_zen_01_thermostathvacaction", + "sensor.zen_within_zen_01_hvac_action", "climate.zen_within_zen_01_zenwithinthermostat", "sensor.zen_within_zen_01_rssi", "sensor.zen_within_zen_01_lqi", @@ -5345,7 +5345,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-513-hvac_action"): { DEV_SIG_CHANNELS: ["thermostat"], DEV_SIG_ENT_MAP_CLASS: "ThermostatHVACAction", - DEV_SIG_ENT_MAP_ID: "sensor.zen_within_zen_01_thermostathvacaction", + DEV_SIG_ENT_MAP_ID: "sensor.zen_within_zen_01_hvac_action", }, }, }, @@ -5494,8 +5494,8 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.sengled_e11_g13_identifybutton", "light.sengled_e11_g13_mintransitionlight", - "sensor.sengled_e11_g13_smartenergymetering", - "sensor.sengled_e11_g13_smartenergysummation", + "sensor.sengled_e11_g13_instantaneous_demand", + "sensor.sengled_e11_g13_summation_delivered", "sensor.sengled_e11_g13_rssi", "sensor.sengled_e11_g13_lqi", ], @@ -5513,12 +5513,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.sengled_e11_g13_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.sengled_e11_g13_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.sengled_e11_g13_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.sengled_e11_g13_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -5550,8 +5550,8 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.sengled_e12_n14_identifybutton", "light.sengled_e12_n14_mintransitionlight", - "sensor.sengled_e12_n14_smartenergymetering", - "sensor.sengled_e12_n14_smartenergysummation", + "sensor.sengled_e12_n14_instantaneous_demand", + "sensor.sengled_e12_n14_summation_delivered", "sensor.sengled_e12_n14_rssi", "sensor.sengled_e12_n14_lqi", ], @@ -5569,12 +5569,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.sengled_e12_n14_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.sengled_e12_n14_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.sengled_e12_n14_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.sengled_e12_n14_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -5606,8 +5606,8 @@ DEVICES = [ DEV_SIG_ENTITIES: [ "button.sengled_z01_a19nae26_identifybutton", "light.sengled_z01_a19nae26_mintransitionlight", - "sensor.sengled_z01_a19nae26_smartenergymetering", - "sensor.sengled_z01_a19nae26_smartenergysummation", + "sensor.sengled_z01_a19nae26_instantaneous_demand", + "sensor.sengled_z01_a19nae26_summation_delivered", "sensor.sengled_z01_a19nae26_rssi", "sensor.sengled_z01_a19nae26_lqi", ], @@ -5625,12 +5625,12 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1794"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergyMetering", - DEV_SIG_ENT_MAP_ID: "sensor.sengled_z01_a19nae26_smartenergymetering", + DEV_SIG_ENT_MAP_ID: "sensor.sengled_z01_a19nae26_instantaneous_demand", }, ("sensor", "00:11:22:33:44:55:66:77-1-1794-summation_delivered"): { DEV_SIG_CHANNELS: ["smartenergy_metering"], DEV_SIG_ENT_MAP_CLASS: "SmartEnergySummation", - DEV_SIG_ENT_MAP_ID: "sensor.sengled_z01_a19nae26_smartenergysummation", + DEV_SIG_ENT_MAP_ID: "sensor.sengled_z01_a19nae26_summation_delivered", }, ("sensor", "00:11:22:33:44:55:66:77-1-0-rssi"): { DEV_SIG_CHANNELS: ["basic"], @@ -5962,7 +5962,7 @@ DEVICES = [ DEV_SIG_EVT_CHANNELS: [], DEV_SIG_ENTITIES: [ "sensor.efektalab_ru_efekta_pws_battery", - "sensor.efektalab_ru_efekta_pws_soilmoisture", + "sensor.efektalab_ru_efekta_pws_soil_moisture", "sensor.efektalab_ru_efekta_pws_temperature", "sensor.efektalab_ru_efekta_pws_rssi", "sensor.efektalab_ru_efekta_pws_lqi", @@ -5976,7 +5976,7 @@ DEVICES = [ ("sensor", "00:11:22:33:44:55:66:77-1-1032"): { DEV_SIG_CHANNELS: ["soil_moisture"], DEV_SIG_ENT_MAP_CLASS: "SoilMoisture", - DEV_SIG_ENT_MAP_ID: "sensor.efektalab_ru_efekta_pws_soilmoisture", + DEV_SIG_ENT_MAP_ID: "sensor.efektalab_ru_efekta_pws_soil_moisture", }, ("sensor", "00:11:22:33:44:55:66:77-1-1026"): { DEV_SIG_CHANNELS: ["temperature"],