Skip to content
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

Jump to bottom

Add energy device class to (kilo)calories sensors #4698

Merged
merged 1 commit into from
Oct 7, 2024
+12 −1
Merged

Add energy device class to (kilo)calories sensors #4698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions app/src/full/java/io/homeassistant/companion/android/sensors/HealthConnectSensorManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class HealthConnectSensorManager : SensorManager {
commonR.string.basic_sensor_name_active_calories_burned,
commonR.string.sensor_description_active_calories_burned,
"mdi:fire",
"energy",
unitOfMeasurement = "kcal",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.WORKER
Expand All @@ -43,6 +44,7 @@ class HealthConnectSensorManager : SensorManager {
commonR.string.basic_sensor_name_total_calories_burned,
commonR.string.sensor_description_total_calories_burned,
"mdi:fire",
"energy",
unitOfMeasurement = "kcal",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.WORKER
Expand Down
8 changes: 8 additions & 0 deletions ...homeassistant/companion/android/common/data/integration/impl/IntegrationRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ class IntegrationRepositoryImpl @AssistedInject constructor(
val canRegisterDeviceClassDistance = server.version?.isAtLeast(2022, 10, 0) == true
val canRegisterNullProperties = server.version?.isAtLeast(2023, 2, 0) == true
val canRegisterDeviceClassEnum = server.version?.isAtLeast(2023, 1, 0) == true
val canRegisterDeviceClassEnergyCalories = server.version?.isAtLeast(2024, 10, 0) == true

val registrationData = SensorRegistrationRequest(
sensorRegistration.uniqueId,
Expand All @@ -721,6 +722,13 @@ class IntegrationRepositoryImpl @AssistedInject constructor(
when (sensorRegistration.deviceClass) {
"distance" -> if (canRegisterDeviceClassDistance) sensorRegistration.deviceClass else null
"enum" -> if (canRegisterDeviceClassEnum) sensorRegistration.deviceClass else null
"energy" -> if (
canRegisterDeviceClassEnergyCalories || sensorRegistration.unitOfMeasurement !in listOf("cal", "kcal")
) {
sensorRegistration.deviceClass
} else {
null
}
else -> sensorRegistration.deviceClass
},
sensorRegistration.unitOfMeasurement,
Expand Down
3 changes: 2 additions & 1 deletion wear/src/main/java/io/homeassistant/companion/android/sensors/HealthServicesSensorManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ class HealthServicesSensorManager : SensorManager {
commonR.string.sensor_name_daily_calories,
commonR.string.sensor_description_daily_calories,
"mdi:fire",
unitOfMeasurement = "kcal",
"energy",
unitOfMeasurement = "cal",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.WORKER
)
Expand Down