From 55025a67fc67fba497a5656739d37edb6259e97c Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Mon, 29 Apr 2024 03:03:42 +0200 Subject: [PATCH] Fixed visibility of device configs --- src/devices/air_filter.rs | 6 +++--- src/devices/audio_setup.rs | 10 +++++----- src/devices/contact_sensor.rs | 12 ++++++------ src/devices/debug_bridge.rs | 4 ++-- src/devices/hue_bridge.rs | 4 ++-- src/devices/hue_light.rs | 4 ++-- src/devices/ikea_outlet.rs | 10 +++++----- src/devices/kasa_outlet.rs | 4 ++-- src/devices/light_sensor.rs | 6 +++--- src/devices/ntfy.rs | 12 ++++++------ src/devices/presence.rs | 4 ++-- src/devices/wake_on_lan.rs | 10 +++++----- src/devices/washer.rs | 8 ++++---- 13 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/devices/air_filter.rs b/src/devices/air_filter.rs index a455c2d..0fad2d9 100644 --- a/src/devices/air_filter.rs +++ b/src/devices/air_filter.rs @@ -18,11 +18,11 @@ use crate::mqtt::WrappedAsyncClient; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct AirFilterConfig { #[device_config(flatten)] - info: InfoConfig, + pub info: InfoConfig, #[device_config(flatten)] - mqtt: MqttDeviceConfig, + pub mqtt: MqttDeviceConfig, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/audio_setup.rs b/src/devices/audio_setup.rs index bbc9101..f6c6925 100644 --- a/src/devices/audio_setup.rs +++ b/src/devices/audio_setup.rs @@ -13,15 +13,15 @@ use crate::mqtt::WrappedAsyncClient; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct AudioSetupConfig { - identifier: String, + pub identifier: String, #[device_config(flatten)] - mqtt: MqttDeviceConfig, + pub mqtt: MqttDeviceConfig, #[device_config(from_lua)] - mixer: WrappedDevice, + pub mixer: WrappedDevice, #[device_config(from_lua)] - speakers: WrappedDevice, + pub speakers: WrappedDevice, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/contact_sensor.rs b/src/devices/contact_sensor.rs index fe3b1d0..a8e58c9 100644 --- a/src/devices/contact_sensor.rs +++ b/src/devices/contact_sensor.rs @@ -44,22 +44,22 @@ impl From for Vec<(WrappedDevice, bool)> { #[derive(Debug, Clone, LuaDeviceConfig)] pub struct TriggerConfig { #[device_config(from_lua, from(TriggerDevicesHelper))] - devices: Vec<(WrappedDevice, bool)>, + pub devices: Vec<(WrappedDevice, bool)>, #[device_config(default, with(|t: Option<_>| t.map(Duration::from_secs)))] pub timeout: Option, } #[derive(Debug, Clone, LuaDeviceConfig)] pub struct ContactSensorConfig { - identifier: String, + pub identifier: String, #[device_config(flatten)] - mqtt: MqttDeviceConfig, + pub mqtt: MqttDeviceConfig, #[device_config(from_lua)] - presence: Option, + pub presence: Option, #[device_config(from_lua)] - trigger: Option, + pub trigger: Option, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/debug_bridge.rs b/src/devices/debug_bridge.rs index 834847d..a4de62c 100644 --- a/src/devices/debug_bridge.rs +++ b/src/devices/debug_bridge.rs @@ -13,11 +13,11 @@ use crate::mqtt::WrappedAsyncClient; #[derive(Debug, LuaDeviceConfig, Clone)] pub struct DebugBridgeConfig { - identifier: String, + pub identifier: String, #[device_config(flatten)] pub mqtt: MqttDeviceConfig, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/hue_bridge.rs b/src/devices/hue_bridge.rs index 7cf7df0..2fc0fe1 100644 --- a/src/devices/hue_bridge.rs +++ b/src/devices/hue_bridge.rs @@ -18,8 +18,8 @@ pub enum Flag { #[derive(Debug, Clone, Deserialize)] pub struct FlagIDs { - pub presence: isize, - pub darkness: isize, + presence: isize, + darkness: isize, } #[derive(Debug, LuaDeviceConfig, Clone)] diff --git a/src/devices/hue_light.rs b/src/devices/hue_light.rs index 084b54b..fdb8517 100644 --- a/src/devices/hue_light.rs +++ b/src/devices/hue_light.rs @@ -18,7 +18,7 @@ use crate::traits::Timeout; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct HueGroupConfig { - identifier: String, + pub identifier: String, #[device_config(rename("ip"), with(|ip| SocketAddr::new(ip, 80)))] pub addr: SocketAddr, pub login: String, @@ -28,7 +28,7 @@ pub struct HueGroupConfig { #[device_config(default)] pub remotes: Vec, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/ikea_outlet.rs b/src/devices/ikea_outlet.rs index 219054f..f20fc5d 100644 --- a/src/devices/ikea_outlet.rs +++ b/src/devices/ikea_outlet.rs @@ -31,18 +31,18 @@ pub enum OutletType { #[derive(Debug, Clone, LuaDeviceConfig)] pub struct IkeaOutletConfig { #[device_config(flatten)] - info: InfoConfig, + pub info: InfoConfig, #[device_config(flatten)] - mqtt: MqttDeviceConfig, + pub mqtt: MqttDeviceConfig, #[device_config(default(OutletType::Outlet))] - outlet_type: OutletType, + pub outlet_type: OutletType, #[device_config(default, with(|t: Option<_>| t.map(Duration::from_secs)))] - timeout: Option, + pub timeout: Option, #[device_config(default)] pub remotes: Vec, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/kasa_outlet.rs b/src/devices/kasa_outlet.rs index 440b9ec..4bb35da 100644 --- a/src/devices/kasa_outlet.rs +++ b/src/devices/kasa_outlet.rs @@ -17,9 +17,9 @@ use super::{Device, LuaDeviceCreate}; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct KasaOutletConfig { - identifier: String, + pub identifier: String, #[device_config(rename("ip"), with(|ip| SocketAddr::new(ip, 9999)))] - addr: SocketAddr, + pub addr: SocketAddr, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/light_sensor.rs b/src/devices/light_sensor.rs index 99ba696..041aa57 100644 --- a/src/devices/light_sensor.rs +++ b/src/devices/light_sensor.rs @@ -12,7 +12,7 @@ use crate::mqtt::WrappedAsyncClient; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct LightSensorConfig { - identifier: String, + pub identifier: String, #[device_config(flatten)] pub mqtt: MqttDeviceConfig, pub min: isize, @@ -20,10 +20,10 @@ pub struct LightSensorConfig { #[device_config(rename("event_channel"), from_lua, with(|ec: EventChannel| ec.get_tx()))] pub tx: event::Sender, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } -pub const DEFAULT: bool = false; +const DEFAULT: bool = false; #[derive(Debug, LuaDevice)] pub struct LightSensor { diff --git a/src/devices/ntfy.rs b/src/devices/ntfy.rs index a4ab142..e9a6f94 100644 --- a/src/devices/ntfy.rs +++ b/src/devices/ntfy.rs @@ -35,9 +35,9 @@ pub enum ActionType { #[derive(Debug, Serialize, Clone)] pub struct Action { #[serde(flatten)] - action: ActionType, - label: String, - clear: Option, + pub action: ActionType, + pub label: String, + pub clear: Option, } #[derive(Serialize)] @@ -114,10 +114,10 @@ impl Default for Notification { #[derive(Debug, LuaDeviceConfig)] pub struct NtfyConfig { #[device_config(default("https://ntfy.sh".into()))] - url: String, - topic: String, + pub url: String, + pub topic: String, #[device_config(rename("event_channel"), from_lua, with(|ec: EventChannel| ec.get_tx()))] - tx: event::Sender, + pub tx: event::Sender, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/presence.rs b/src/devices/presence.rs index 1a7d39b..18880b3 100644 --- a/src/devices/presence.rs +++ b/src/devices/presence.rs @@ -17,9 +17,9 @@ pub struct PresenceConfig { #[device_config(flatten)] pub mqtt: MqttDeviceConfig, #[device_config(from_lua, rename("event_channel"), with(|ec: EventChannel| ec.get_tx()))] - tx: event::Sender, + pub tx: event::Sender, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } pub const DEFAULT_PRESENCE: bool = false; diff --git a/src/devices/wake_on_lan.rs b/src/devices/wake_on_lan.rs index 2e7c2af..51722e7 100644 --- a/src/devices/wake_on_lan.rs +++ b/src/devices/wake_on_lan.rs @@ -19,14 +19,14 @@ use crate::mqtt::WrappedAsyncClient; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct WakeOnLANConfig { #[device_config(flatten)] - info: InfoConfig, + pub info: InfoConfig, #[device_config(flatten)] - mqtt: MqttDeviceConfig, - mac_address: MacAddress, + pub mqtt: MqttDeviceConfig, + pub mac_address: MacAddress, #[device_config(default(Ipv4Addr::new(255, 255, 255, 255)))] - broadcast_ip: Ipv4Addr, + pub broadcast_ip: Ipv4Addr, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } #[derive(Debug, LuaDevice)] diff --git a/src/devices/washer.rs b/src/devices/washer.rs index 9d0f1f7..29bc4cb 100644 --- a/src/devices/washer.rs +++ b/src/devices/washer.rs @@ -12,15 +12,15 @@ use crate::mqtt::WrappedAsyncClient; #[derive(Debug, Clone, LuaDeviceConfig)] pub struct WasherConfig { - identifier: String, + pub identifier: String, #[device_config(flatten)] - mqtt: MqttDeviceConfig, + pub mqtt: MqttDeviceConfig, // Power in Watt - threshold: f32, + pub threshold: f32, #[device_config(rename("event_channel"), from_lua, with(|ec: EventChannel| ec.get_tx()))] pub tx: event::Sender, #[device_config(from_lua)] - client: WrappedAsyncClient, + pub client: WrappedAsyncClient, } // TODO: Add google home integration