Skip to content

Add temperature unit to climate and water_heater #1600

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
bdraco merged 7 commits into from
Apr 22, 2026
Merged

Add temperature unit to climate and water_heater #1600

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9a3e8d
Add temperature unit for climate and water heater
jhenkens Apr 22, 2026
83eb532
Address copilot feedback
jhenkens Apr 22, 2026
9865325
Set default back to Celsius
jhenkens Apr 22, 2026
e021dde
Add default deserialization unit test
jhenkens Apr 22, 2026
6d33750
Update tests/test_model.py
bdraco Apr 22, 2026
f271843
Update tests/test_model.py
bdraco Apr 22, 2026
52616cc
cover, reorder so temp fields together since order does not matter to…
bdraco Apr 22, 2026
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
9 changes: 9 additions & 0 deletions aioesphomeapi/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,13 @@ message CameraImageRequest {
bool stream = 2;
}

// ==================== TEMPERATURE UNIT ====================
enum TemperatureUnit {
TEMPERATURE_UNIT_CELSIUS = 0;
TEMPERATURE_UNIT_FAHRENHEIT = 1;
TEMPERATURE_UNIT_KELVIN = 2;
}

// ==================== CLIMATE ====================
enum ClimateMode {
CLIMATE_MODE_OFF = 0;
Expand Down Expand Up @@ -1110,6 +1117,7 @@ message ListEntitiesClimateResponse {
float visual_max_humidity = 25;
uint32 device_id = 26 [(field_ifdef) = "USE_DEVICES"];
uint32 feature_flags = 27;
Comment thread
bdraco marked this conversation as resolved.
TemperatureUnit temperature_unit = 28;
}
message ClimateStateResponse {
option (id) = 47;
Expand Down Expand Up @@ -1203,6 +1211,7 @@ message ListEntitiesWaterHeaterResponse {
repeated WaterHeaterMode supported_modes = 11 [(container_pointer_no_template) = "water_heater::WaterHeaterModeMask"];
// Bitmask of WaterHeaterFeature flags
uint32 supported_features = 12;
TemperatureUnit temperature_unit = 13;
}

message WaterHeaterStateResponse {
Expand Down
610 changes: 306 additions & 304 deletions aioesphomeapi/api_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions aioesphomeapi/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,12 @@ class ClimatePreset(APIIntEnum):
ACTIVITY = 7


class TemperatureUnit(APIIntEnum):
CELSIUS = 0
FAHRENHEIT = 1
KELVIN = 2


@_frozen_dataclass_decorator
class ClimateInfo(EntityInfo):
feature_flags: int = 0
Expand Down Expand Up @@ -733,6 +739,10 @@ class ClimateInfo(EntityInfo):
supports_target_humidity: bool = False
visual_min_humidity: float = 0
visual_max_humidity: float = 0
temperature_unit: TemperatureUnit | None = converter_field(
default=None,
converter=TemperatureUnit.convert,
)

def supported_feature_flags_compat(self, api_version: APIVersion) -> int:
if api_version < APIVersion(1, 13):
Expand Down Expand Up @@ -1183,6 +1193,10 @@ class WaterHeaterInfo(EntityInfo):
default_factory=list, converter=WaterHeaterMode.convert_list
)
supported_features: int = 0
temperature_unit: TemperatureUnit | None = converter_field(
default=None,
converter=TemperatureUnit.convert,
)


@_frozen_dataclass_decorator
Expand Down
Loading