Skip to content

Pull request #169

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

Merged
rneswold merged 2 commits into from
Feb 7, 2026
Merged

Pull request #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28c56ff
:memo: add log message if config parsing fails
rneswold Feb 7, 2026
292ce57
:wrench: tweak tplink config deserializer
rneswold Feb 7, 2026
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
4 changes: 4 additions & 0 deletions drivers/drmem-drv-tplink/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ use drmem_api::{driver::DriverConfig, Error};
use std::net::SocketAddrV4;

#[derive(serde::Deserialize)]
#[serde(rename_all = "lowercase")]
pub enum DevCfgType {
#[serde(alias = "Switch", alias = "SWITCH")]
Switch,
#[serde(alias = "Outlet", alias = "OUTLET")]
Outlet,
#[serde(alias = "Dimmer", alias = "DIMMER")]
Dimmer,
}

Expand Down
7 changes: 4 additions & 3 deletions drmemd/src/driver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub type Launcher<R> = fn(
driver::DriverConfig,
driver::RequestChan<R>,
Option<usize>,
barrier: Arc<Barrier>,
Arc<Barrier>,
) -> MgrTask;

type DriverInfo<R> = (&'static str, &'static str, Launcher<R>);
Expand Down Expand Up @@ -110,9 +110,10 @@ where
Box::pin(async move {
let cfg = match T::Config::try_from(cfg) {
Ok(cfg) => Ok(cfg),
err @ Err(_) => {
Err(e) => {
error!("config error -- {}", &e);
barrier.wait().await;
err
Err(e)
}
}?;

Expand Down