gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-01-22 17:33:19 +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

4
daemon/src/config.rs
View File

@@ -1,4 +1,4 @@
use config_traits::{StdConfig, StdConfigLoad3};
use config_traits::{StdConfig, StdConfigLoad2};
use serde_derive::{Deserialize, Serialize};
const CONFIG_FILE: &str = "asusd.ron";
@@ -33,7 +33,7 @@ impl StdConfig for Config {
}
}
impl StdConfigLoad3<Config455, Config458> for Config {}
impl StdConfigLoad2<Config455, Config458> for Config {}
#[derive(Deserialize, Serialize, Default)]
#[serde(default)]

4
daemon/src/ctrl_anime/config.rs
View File

@@ -1,6 +1,6 @@
use std::time::Duration;
use config_traits::{StdConfig, StdConfigLoad3};
use config_traits::{StdConfig, StdConfigLoad2};
use rog_anime::error::AnimeError;
use rog_anime::{ActionData, ActionLoader, AnimTime, AnimeType, Fade, Vec2};
use serde_derive::{Deserialize, Serialize};
@@ -149,7 +149,7 @@ impl StdConfig for AnimeConfig {
}
}
impl StdConfigLoad3<AnimeConfigV341, AnimeConfigV352> for AnimeConfig {}
impl StdConfigLoad2<AnimeConfigV341, AnimeConfigV352> for AnimeConfig {}
impl AnimeConfig {
// fn clamp_config_brightness(mut config: &mut AnimeConfig) {

4
daemon/src/ctrl_aura/config.rs
View File

@@ -1,6 +1,6 @@
use std::collections::{BTreeMap, HashSet};
use config_traits::{StdConfig, StdConfigLoad1};
use config_traits::{StdConfig, StdConfigLoad};
use rog_aura::aura_detection::{LaptopLedData, ASUS_KEYBOARD_DEVICES};
use rog_aura::usb::{AuraDev1866, AuraDev19b6, AuraDevTuf, AuraDevice, AuraPowerDev};
use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Direction, LedBrightness, Speed, GRADIENT};
@@ -199,7 +199,7 @@ impl StdConfig for AuraConfig {
}
}
impl StdConfigLoad1 for AuraConfig {}
impl StdConfigLoad for AuraConfig {}
impl AuraConfig {
fn create_default(support_data: &LaptopLedData) -> Self {

6
daemon/src/ctrl_profiles/config.rs
View File

@@ -1,6 +1,6 @@
use std::path::PathBuf;
use config_traits::{StdConfig, StdConfigLoad1};
use config_traits::{StdConfig, StdConfigLoad};
use rog_profiles::fan_curve_set::FanCurveSet;
use rog_profiles::{FanCurveProfiles, Profile};
use serde_derive::{Deserialize, Serialize};
@@ -32,7 +32,7 @@ impl StdConfig for ProfileConfig {
}
}
impl StdConfigLoad1 for ProfileConfig {}
impl StdConfigLoad for ProfileConfig {}
#[derive(Deserialize, Serialize, Debug, Default)]
pub struct FanCurveConfig {
@@ -81,4 +81,4 @@ impl StdConfig for FanCurveConfig {
}
}
impl StdConfigLoad1 for FanCurveConfig {}
impl StdConfigLoad for FanCurveConfig {}

2
daemon/src/daemon.rs
View File

@@ -6,7 +6,7 @@ use std::time::Duration;
use ::zbus::export::futures_util::lock::Mutex;
use ::zbus::Connection;
use config_traits::{StdConfig, StdConfigLoad1, StdConfigLoad3};
use config_traits::{StdConfig, StdConfigLoad, StdConfigLoad2};
use daemon::config::Config;
use daemon::ctrl_anime::config::AnimeConfig;
use daemon::ctrl_anime::trait_impls::CtrlAnimeZbus;