Dreaded_X/automation_rs
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Improved the internals of the LuaDeviceConfig macro and improve the

Browse Source 
usability of the macro
This commit is contained in:
Dreaded_X
2024-04-26 04:53:45 +02:00
parent 024b9c9dbc
commit 55237a2ba2
16 changed files with 226 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/contact_sensor.rs
View File

@@ -13,7 +13,6 @@ use crate::device_manager::{DeviceConfig, WrappedDevice};
use crate::devices::DEFAULT_PRESENCE;
use crate::error::DeviceConfigError;
use crate::event::{OnMqtt, OnPresence};
use crate::helper::DurationSeconds;
use crate::messages::{ContactMessage, PresenceMessage};
use crate::mqtt::WrappedAsyncClient;
use crate::traits::Timeout;
@@ -23,7 +22,7 @@ use crate::traits::Timeout;
pub struct PresenceDeviceConfig {
#[device_config(flatten)]
pub mqtt: MqttDeviceConfig,
#[device_config(with = "DurationSeconds")]
#[device_config(with(Duration::from_secs))]
pub timeout: Duration,
}
@@ -44,9 +43,9 @@ impl From<TriggerDevicesHelper> for Vec<(WrappedDevice, bool)> {
#[derive(Debug, Clone, LuaDeviceConfig)]
pub struct TriggerConfig {
#[device_config(user_data, with = "TriggerDevicesHelper")]
#[device_config(from_lua, from(TriggerDevicesHelper))]
devices: Vec<(WrappedDevice, bool)>,
#[device_config(with = "Option<DurationSeconds>")]
#[device_config(default, with(|t: Option<_>| t.map(Duration::from_secs)))]
pub timeout: Option<Duration>,
}
@@ -54,11 +53,11 @@ pub struct TriggerConfig {
pub struct ContactSensorConfig {
#[device_config(flatten)]
mqtt: MqttDeviceConfig,
#[device_config(user_data)]
#[device_config(from_lua)]
presence: Option<PresenceDeviceConfig>,
#[device_config(user_data)]
#[device_config(from_lua)]
trigger: Option<TriggerConfig>,
#[device_config(user_data)]
#[device_config(from_lua)]
client: WrappedAsyncClient,
}