gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert repeated code in config-traits to a macro

Browse Source
This commit is contained in:
Luke D. Jones
2023-01-09 23:19:29 +13:00
parent 9cc62d63c9
commit 53b854ef6d
8 changed files with 172 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon-user/src/config.rs
View File

@@ -1,7 +1,7 @@
use std::path::PathBuf;
use std::time::Duration;
use config_traits::{StdConfig, StdConfigLoad1};
use config_traits::{StdConfig, StdConfigLoad};
use rog_anime::{ActionLoader, AnimTime, AnimeType, Fade, Sequences as AnimeSequences, Vec2};
use rog_aura::advanced::LedCode;
use rog_aura::effects::{AdvancedEffects as AuraSequences, Breathe, DoomFlicker, Effect, Static};
@@ -116,7 +116,7 @@ impl StdConfig for ConfigAnime {
}
}
impl StdConfigLoad1 for ConfigAnime {}
impl StdConfigLoad for ConfigAnime {}
#[derive(Debug, Deserialize, Serialize)]
pub struct ConfigAura {
@@ -188,7 +188,7 @@ impl StdConfig for ConfigAura {
}
}
impl StdConfigLoad1 for ConfigAura {}
impl StdConfigLoad for ConfigAura {}
#[derive(Debug, Default, Deserialize, Serialize)]
#[serde(default)]
@@ -216,4 +216,4 @@ impl StdConfig for ConfigBase {
}
}
impl StdConfigLoad1 for ConfigBase {}
impl StdConfigLoad for ConfigBase {}

2
daemon-user/src/daemon.rs
View File

@@ -4,7 +4,7 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex};
use config_traits::{StdConfig, StdConfigLoad1};
use config_traits::{StdConfig, StdConfigLoad};
use rog_anime::usb::get_anime_type;
use rog_aura::aura_detection::LaptopLedData;
use rog_aura::layouts::KeyLayout;