Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion homeassistant/components/blink/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from homeassistant.const import (
DEVICE_CLASS_SIGNAL_STRENGTH,
DEVICE_CLASS_TEMPERATURE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
TEMP_FAHRENHEIT,
)
from homeassistant.helpers.entity import Entity
Expand All @@ -14,7 +15,11 @@

SENSORS = {
TYPE_TEMPERATURE: ["Temperature", TEMP_FAHRENHEIT, DEVICE_CLASS_TEMPERATURE],
TYPE_WIFI_STRENGTH: ["Wifi Signal", "dBm", DEVICE_CLASS_SIGNAL_STRENGTH],
TYPE_WIFI_STRENGTH: [
"Wifi Signal",
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
DEVICE_CLASS_SIGNAL_STRENGTH,
],
}


Expand Down
9 changes: 8 additions & 1 deletion homeassistant/components/canary/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
DEVICE_CLASS_SIGNAL_STRENGTH,
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
TEMP_CELSIUS,
)
from homeassistant.helpers.entity import Entity
Expand All @@ -34,7 +35,13 @@
["temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE, [CANARY_PRO]],
["humidity", PERCENTAGE, None, DEVICE_CLASS_HUMIDITY, [CANARY_PRO]],
["air_quality", None, "mdi:weather-windy", None, [CANARY_PRO]],
["wifi", "dBm", None, DEVICE_CLASS_SIGNAL_STRENGTH, [CANARY_FLEX]],
[
"wifi",
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
None,
DEVICE_CLASS_SIGNAL_STRENGTH,
[CANARY_FLEX],
],
["battery", PERCENTAGE, None, DEVICE_CLASS_BATTERY, [CANARY_FLEX]],
]

Expand Down
10 changes: 7 additions & 3 deletions homeassistant/components/netgear_lte/sensor_types.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
"""Define possible sensor types."""

from homeassistant.components.binary_sensor import DEVICE_CLASS_CONNECTIVITY
from homeassistant.const import DATA_MEBIBYTES, PERCENTAGE
from homeassistant.const import (
DATA_MEBIBYTES,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
)

SENSOR_SMS = "sms"
SENSOR_SMS_TOTAL = "sms_total"
Expand All @@ -12,8 +16,8 @@
SENSOR_SMS_TOTAL: "messages",
SENSOR_USAGE: DATA_MEBIBYTES,
"radio_quality": PERCENTAGE,
"rx_level": "dBm",
"tx_level": "dBm",
"rx_level": SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
"tx_level": SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
"upstream": None,
"connection_text": None,
"connection_type": None,
Expand Down
3 changes: 2 additions & 1 deletion homeassistant/components/rfxtrx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
PERCENTAGE,
POWER_WATT,
PRESSURE_HPA,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
SPEED_METERS_PER_SECOND,
TEMP_CELSIUS,
TIME_HOURS,
Expand Down Expand Up @@ -83,7 +84,7 @@
("Voltage", VOLT),
("Current", ELECTRICAL_CURRENT_AMPERE),
("Battery numeric", PERCENTAGE),
("Rssi numeric", "dBm"),
("Rssi numeric", SIGNAL_STRENGTH_DECIBELS_MILLIWATT),
]
)

Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/ring/sensor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""This component provides HA sensor support for Ring Door Bell/Chimes."""
import logging

from homeassistant.const import PERCENTAGE
from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT
from homeassistant.core import callback
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.icon import icon_for_battery_level
Expand Down Expand Up @@ -256,7 +256,7 @@ def device_state_attributes(self):
"wifi_signal_strength": [
"WiFi Signal Strength",
["chimes", "doorbots", "authorized_doorbots", "stickup_cams"],
"dBm",
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
"wifi",
None,
"signal_strength",
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/sms/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import gammu # pylint: disable=import-error, no-member

from homeassistant.const import DEVICE_CLASS_SIGNAL_STRENGTH
from homeassistant.const import DEVICE_CLASS_SIGNAL_STRENGTH, SIGNAL_STRENGTH_DECIBELS
from homeassistant.helpers.entity import Entity

from .const import DOMAIN, SMS_GATEWAY
Expand Down Expand Up @@ -50,7 +50,7 @@ def name(self):
@property
def unit_of_measurement(self):
"""Return the unit the value is expressed in."""
return "dB"
return SIGNAL_STRENGTH_DECIBELS

@property
def device_class(self):
Expand Down
3 changes: 2 additions & 1 deletion homeassistant/components/wirelesstag/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
CONF_PASSWORD,
CONF_USERNAME,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
VOLT,
)
import homeassistant.helpers.config_validation as cv
Expand Down Expand Up @@ -281,7 +282,7 @@ def device_state_attributes(self):
return {
ATTR_BATTERY_LEVEL: int(self._tag.battery_remaining * 100),
ATTR_VOLTAGE: f"{self._tag.battery_volts:.2f}{VOLT}",
ATTR_TAG_SIGNAL_STRENGTH: f"{self._tag.signal_strength}dBm",
ATTR_TAG_SIGNAL_STRENGTH: f"{self._tag.signal_strength}{SIGNAL_STRENGTH_DECIBELS_MILLIWATT}",
ATTR_TAG_OUT_OF_RANGE: not self._tag.is_in_range,
ATTR_TAG_POWER_CONSUMPTION: f"{self._tag.power_consumption:.2f}{PERCENTAGE}",
}
1 change: 0 additions & 1 deletion homeassistant/components/wled/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

# Units of measurement
CURRENT_MA = "mA"
SIGNAL_DBM = "dBm"

# Services
SERVICE_EFFECT = "effect"
5 changes: 3 additions & 2 deletions homeassistant/components/wled/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
DEVICE_CLASS_SIGNAL_STRENGTH,
DEVICE_CLASS_TIMESTAMP,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
)
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.typing import HomeAssistantType
from homeassistant.util.dt import utcnow

from . import WLEDDataUpdateCoordinator, WLEDDeviceEntity
from .const import ATTR_LED_COUNT, ATTR_MAX_POWER, CURRENT_MA, DOMAIN, SIGNAL_DBM
from .const import ATTR_LED_COUNT, ATTR_MAX_POWER, CURRENT_MA, DOMAIN

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -192,7 +193,7 @@ def __init__(self, entry_id: str, coordinator: WLEDDataUpdateCoordinator) -> Non
icon="mdi:wifi",
key="wifi_rssi",
name=f"{coordinator.data.info.name} Wi-Fi RSSI",
unit_of_measurement=SIGNAL_DBM,
unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
)

@property
Expand Down
4 changes: 4 additions & 0 deletions homeassistant/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,10 @@
SPEED_KILOMETERS_PER_HOUR = f"{LENGTH_KILOMETERS}/{TIME_HOURS}"
SPEED_MILES_PER_HOUR = "mph"

# Signal_strength units
SIGNAL_STRENGTH_DECIBELS = "dB"
SIGNAL_STRENGTH_DECIBELS_MILLIWATT = "dBm"
Comment thread
chemelli74 marked this conversation as resolved.
Outdated

# Data units
DATA_BITS = "bit"
DATA_KILOBITS = "kbit"
Expand Down
3 changes: 2 additions & 1 deletion tests/components/canary/test_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
DEVICE_CLASS_SIGNAL_STRENGTH,
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
TEMP_CELSIUS,
)
from homeassistant.setup import async_setup_component
Expand Down Expand Up @@ -180,7 +181,7 @@ async def test_sensors_flex(hass, canary) -> None:
"home_dining_room_wifi": (
"20_wifi",
"-57.0",
"dBm",
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
DEVICE_CLASS_SIGNAL_STRENGTH,
None,
),
Expand Down
10 changes: 9 additions & 1 deletion tests/components/huawei_lte/test_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@
import pytest

from homeassistant.components.huawei_lte import sensor
from homeassistant.const import (
SIGNAL_STRENGTH_DECIBELS,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
)


@pytest.mark.parametrize(
("value", "expected"),
(("-71 dBm", (-71, "dBm")), ("15dB", (15, "dB")), (">=-51dBm", (-51, "dBm"))),
(
("-71 dBm", (-71, SIGNAL_STRENGTH_DECIBELS_MILLIWATT)),
("15dB", (15, SIGNAL_STRENGTH_DECIBELS)),
(">=-51dBm", (-51, SIGNAL_STRENGTH_DECIBELS_MILLIWATT)),
),
)
def test_format_default(value, expected):
"""Test that default formatter copes with expected values."""
Expand Down
37 changes: 30 additions & 7 deletions tests/components/rfxtrx/test_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
import pytest

from homeassistant.components.rfxtrx.const import ATTR_EVENT
from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, TEMP_CELSIUS
from homeassistant.const import (
ATTR_UNIT_OF_MEASUREMENT,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
TEMP_CELSIUS,
)
from homeassistant.core import State
from homeassistant.setup import async_setup_component

Expand Down Expand Up @@ -93,7 +98,10 @@ async def test_one_sensor_no_datatype(hass, rfxtrx):
assert state
assert state.state == "unknown"
assert state.attributes.get("friendly_name") == f"{base_name} Rssi numeric"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)

state = hass.states.get(f"{base_id}_battery_numeric")
assert state
Expand Down Expand Up @@ -169,7 +177,10 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
state = hass.states.get(f"{base_id}_rssi_numeric")
assert state
assert state.state == "-64"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)

state = hass.states.get(f"{base_id}_temperature")
assert state
Expand Down Expand Up @@ -198,7 +209,10 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
state = hass.states.get(f"{base_id}_rssi_numeric")
assert state
assert state.state == "-64"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)

state = hass.states.get(f"{base_id}_temperature")
assert state
Expand Down Expand Up @@ -227,7 +241,10 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
state = hass.states.get(f"{base_id}_rssi_numeric")
assert state
assert state.state == "-64"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)

state = hass.states.get(f"{base_id}_temperature")
assert state
Expand Down Expand Up @@ -314,13 +331,19 @@ async def test_rssi_sensor(hass, rfxtrx):
assert state
assert state.state == "unknown"
assert state.attributes.get("friendly_name") == "PT2262 22670e Rssi numeric"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)

state = hass.states.get("sensor.ac_213c7f2_48_rssi_numeric")
assert state
assert state.state == "unknown"
assert state.attributes.get("friendly_name") == "AC 213c7f2:48 Rssi numeric"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)

await rfxtrx.signal("0913000022670e013b70")
await rfxtrx.signal("0b1100cd0213c7f230010f71")
Expand Down
7 changes: 5 additions & 2 deletions tests/components/wled/test_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
ATTR_MAX_POWER,
CURRENT_MA,
DOMAIN,
SIGNAL_DBM,
)
from homeassistant.const import (
ATTR_DEVICE_CLASS,
ATTR_ICON,
ATTR_UNIT_OF_MEASUREMENT,
DATA_BYTES,
PERCENTAGE,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
)
from homeassistant.core import HomeAssistant
from homeassistant.util import dt as dt_util
Expand Down Expand Up @@ -138,7 +138,10 @@ async def test_sensors(
state = hass.states.get("sensor.wled_rgb_light_wifi_rssi")
assert state
assert state.attributes.get(ATTR_ICON) == "mdi:wifi"
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SIGNAL_DBM
assert (
state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
== SIGNAL_STRENGTH_DECIBELS_MILLIWATT
)
assert state.state == "-62"

entry = registry.async_get("sensor.wled_rgb_light_wifi_rssi")
Expand Down
4 changes: 2 additions & 2 deletions tests/testing_config/custom_components/test/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Call init before using it in your tests to ensure clean test data.
"""
import homeassistant.components.sensor as sensor
from homeassistant.const import PERCENTAGE, PRESSURE_HPA
from homeassistant.const import PERCENTAGE, PRESSURE_HPA, SIGNAL_STRENGTH_DECIBELS

from tests.common import MockEntity

Expand All @@ -15,7 +15,7 @@
sensor.DEVICE_CLASS_BATTERY: PERCENTAGE, # % of battery that is left
sensor.DEVICE_CLASS_HUMIDITY: PERCENTAGE, # % of humidity in the air
sensor.DEVICE_CLASS_ILLUMINANCE: "lm", # current light level (lx/lm)
sensor.DEVICE_CLASS_SIGNAL_STRENGTH: "dB", # signal strength (dB/dBm)
sensor.DEVICE_CLASS_SIGNAL_STRENGTH: SIGNAL_STRENGTH_DECIBELS, # signal strength (dB/dBm)
sensor.DEVICE_CLASS_TEMPERATURE: "C", # temperature (C/F)
sensor.DEVICE_CLASS_TIMESTAMP: "hh:mm:ss", # timestamp (ISO8601)
sensor.DEVICE_CLASS_PRESSURE: PRESSURE_HPA, # pressure (hPa/mbar)
Expand Down