Skip to content

Commit

Permalink
fix: deprecated temperature units
Browse files Browse the repository at this point in the history
fixes #244
  • Loading branch information
TheRealWaldo committed Jan 6, 2025
1 parent 281573c commit 7edcf6f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
35 changes: 17 additions & 18 deletions custom_components/thermal_vision/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
CONF_HOST,
CONF_NAME,
CONF_VERIFY_SSL,
TEMP_CELSIUS,
TEMP_FAHRENHEIT,
UnitOfTemperature,
STATE_UNKNOWN,
STATE_UNAVAILABLE,
)
Expand Down Expand Up @@ -209,24 +208,24 @@ def extra_state_attributes(self):
return {
"fps": self._fps,
"min": self._pixel_min_temp
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._pixel_min_temp, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._pixel_min_temp, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
),
"max": self._pixel_max_temp
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._pixel_max_temp, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._pixel_max_temp, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
),
"range_min": self._min_temperature
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._min_temperature, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._min_temperature, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
),
"range_max": self._max_temperature
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._max_temperature, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._max_temperature, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
),
}

Expand Down Expand Up @@ -393,30 +392,30 @@ def _camera_image(self, pixels):
if self._overlay:
min_temp = (
self._pixel_min_temp
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._pixel_min_temp, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._pixel_min_temp, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
)
)
max_temp = (
self._pixel_max_temp
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._pixel_max_temp, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._pixel_max_temp, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
)
)
min_temperature = (
self._min_temperature
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._min_temperature, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._min_temperature, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
)
)
max_temperature = (
self._max_temperature
if self._temperature_unit == TEMP_CELSIUS
if self._temperature_unit == UnitOfTemperature.CELSIUS
else TemperatureConverter.convert(
self._max_temperature, TEMP_CELSIUS, TEMP_FAHRENHEIT
self._max_temperature, UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT
)
)

Expand Down
4 changes: 2 additions & 2 deletions custom_components/thermal_vision/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
CONF_HOST,
CONF_SCAN_INTERVAL,
CONF_VERIFY_SSL,
TEMP_CELSIUS,
UnitOfTemperature,
)

from .const import (
Expand Down Expand Up @@ -180,7 +180,7 @@ def native_unit_of_measurement(self):
if self._state_type == ATTR_PERSON_DETECTED:
return None
else:
return TEMP_CELSIUS
return UnitOfTemperature.CELSIUS

@property
def device_class(self):
Expand Down

0 comments on commit 7edcf6f

Please sign in to comment.