Cleanup

src/devices/air_filter.rs

@@ -4,7 +4,6 @@ use google_home::device::Name;
 use google_home::errors::ErrorCode;
 use google_home::traits::{AvailableSpeeds, FanSpeed, HumiditySetting, OnOff, Speed, SpeedValues};
 use google_home::types::Type;
-use google_home::GoogleHomeDevice;
 use rumqttc::Publish;
 use tracing::{debug, error, trace, warn};
 
@@ -106,7 +105,7 @@ impl OnMqtt for AirFilter {
     }
 }
 
-impl GoogleHomeDevice for AirFilter {
+impl google_home::Device for AirFilter {
     fn get_device_type(&self) -> Type {
         Type::AirPurifier
     }

src/devices/ikea_outlet.rs

@@ -3,10 +3,10 @@ use std::time::Duration;
 use anyhow::Result;
 use async_trait::async_trait;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
+use google_home::device;
 use google_home::errors::ErrorCode;
 use google_home::traits::{self, OnOff};
 use google_home::types::Type;
-use google_home::{device, GoogleHomeDevice};
 use rumqttc::{matches, Publish, SubscribeFilter};
 use serde::Deserialize;
 use tokio::task::JoinHandle;
@@ -171,7 +171,7 @@ impl OnPresence for IkeaOutlet {
     }
 }
 
-impl GoogleHomeDevice for IkeaOutlet {
+impl google_home::Device for IkeaOutlet {
     fn get_device_type(&self) -> Type {
         match self.config.outlet_type {
             OutletType::Outlet => Type::Outlet,

src/devices/mod.rs

@@ -17,7 +17,6 @@ use std::fmt::Debug;
 use async_trait::async_trait;
 use automation_cast::Cast;
 use google_home::traits::OnOff;
-use google_home::GoogleHomeDevice;
 
 pub use self::air_filter::*;
 pub use self::audio_setup::*;
@@ -67,7 +66,7 @@ pub trait Device:
     Debug
     + Sync
     + Send
-    + Cast<dyn GoogleHomeDevice>
+    + Cast<dyn google_home::Device>
     + Cast<dyn OnMqtt>
     + Cast<dyn OnMqtt>
     + Cast<dyn OnPresence>

src/devices/wake_on_lan.rs

@@ -3,10 +3,10 @@ use std::net::Ipv4Addr;
 use async_trait::async_trait;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
 use eui48::MacAddress;
+use google_home::device;
 use google_home::errors::ErrorCode;
 use google_home::traits::{self, Scene};
 use google_home::types::Type;
-use google_home::{device, GoogleHomeDevice};
 use rumqttc::Publish;
 use tracing::{debug, error, trace};
 
@@ -76,7 +76,7 @@ impl OnMqtt for WakeOnLAN {
     }
 }
 
-impl GoogleHomeDevice for WakeOnLAN {
+impl google_home::Device for WakeOnLAN {
     fn get_device_type(&self) -> Type {
         Type::Scene
     }