google_home/google_home/src/traits.rs

@@ -1,4 +1,3 @@
-#![allow(non_snake_case)]
 use automation_cast::Cast;
 use google_home_macro::traits;
 use serde::Serialize;
@@ -34,18 +33,11 @@ traits! {
         query_only_humidity_setting: Option<bool>,
 
         fn humidity_ambient_percent(&self) -> Result<isize, ErrorCode>,
-    },
-    "action.devices.traits.TemperatureControl" => trait TemperatureSetting {
-        query_only_temperature_control: Option<bool>,
-        // TODO: Add rename
-        temperatureUnitForUX: TemperatureUnit,
-
-        fn temperature_ambient_celsius(&self) -> f32,
     }
 }
 
 #[derive(Debug, Serialize)]
-pub struct SpeedValue {
+pub struct SpeedValues {
     pub speed_synonym: Vec<String>,
     pub lang: String,
 }
@@ -53,7 +45,7 @@ pub struct SpeedValue {
 #[derive(Debug, Serialize)]
 pub struct Speed {
     pub speed_name: String,
-    pub speed_values: Vec<SpeedValue>,
+    pub speed_values: Vec<SpeedValues>,
 }
 
 #[derive(Debug, Serialize)]
@@ -61,11 +53,3 @@ pub struct AvailableSpeeds {
     pub speeds: Vec<Speed>,
     pub ordered: bool,
 }
-
-#[derive(Debug, Serialize)]
-pub enum TemperatureUnit {
-    #[serde(rename = "C")]
-    Celsius,
-    #[serde(rename = "F")]
-    Fahrenheit,
-}

google_home/google_home_macro/src/lib.rs

@@ -248,7 +248,7 @@ fn get_state_struct(t: &Trait) -> proc_macro2::TokenStream {
 
     let name = get_state_struct_ident(t);
     quote! {
-        #[derive(Debug, serde::Serialize)]
+        #[derive(Debug, Default, serde::Serialize)]
         #[serde(rename_all = "camelCase")]
         struct #name {
             #(#fields,)*

src/devices/air_filter.rs

@@ -2,10 +2,7 @@ use async_trait::async_trait;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
 use google_home::device::Name;
 use google_home::errors::ErrorCode;
-use google_home::traits::{
+use google_home::traits::{AvailableSpeeds, FanSpeed, HumiditySetting, OnOff, Speed, SpeedValues};
-    AvailableSpeeds, FanSpeed, HumiditySetting, OnOff, Speed, SpeedValue, TemperatureSetting,
-    TemperatureUnit,
-};
 use google_home::types::Type;
 use rumqttc::Publish;
 use tracing::{debug, error, trace, warn};
@@ -72,7 +69,6 @@ impl LuaDeviceCreate for AirFilter {
             last_known_state: AirFilterState {
                 state: AirFilterFanState::Off,
                 humidity: 0.0,
-                temperature: 0.0,
             },
         })
     }
@@ -161,28 +157,28 @@ impl FanSpeed for AirFilter {
             speeds: vec![
                 Speed {
                     speed_name: "off".into(),
-                    speed_values: vec![SpeedValue {
+                    speed_values: vec![SpeedValues {
                         speed_synonym: vec!["Off".into()],
                         lang: "en".into(),
                     }],
                 },
                 Speed {
                     speed_name: "low".into(),
-                    speed_values: vec![SpeedValue {
+                    speed_values: vec![SpeedValues {
                         speed_synonym: vec!["Low".into()],
                         lang: "en".into(),
                     }],
                 },
                 Speed {
                     speed_name: "medium".into(),
-                    speed_values: vec![SpeedValue {
+                    speed_values: vec![SpeedValues {
                         speed_synonym: vec!["Medium".into()],
                         lang: "en".into(),
                     }],
                 },
                 Speed {
                     speed_name: "high".into(),
-                    speed_values: vec![SpeedValue {
+                    speed_values: vec![SpeedValues {
                         speed_synonym: vec!["High".into()],
                         lang: "en".into(),
                     }],
@@ -233,19 +229,3 @@ impl HumiditySetting for AirFilter {
         Ok(self.last_known_state.humidity.round() as isize)
     }
 }
-
-impl TemperatureSetting for AirFilter {
-    fn query_only_temperature_control(&self) -> Option<bool> {
-        Some(true)
-    }
-
-    #[allow(non_snake_case)]
-    fn temperatureUnitForUX(&self) -> TemperatureUnit {
-        TemperatureUnit::Celsius
-    }
-
-    fn temperature_ambient_celsius(&self) -> f32 {
-        // HACK: Round to one decimal place
-        (10.0 * self.last_known_state.temperature).round() / 10.0
-    }
-}

src/messages.rs

@@ -261,7 +261,6 @@ pub struct SetAirFilterFanState {
 pub struct AirFilterState {
     pub state: AirFilterFanState,
     pub humidity: f32,
-    pub temperature: f32,
 }
 
 impl SetAirFilterFanState {