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

Better update of aura modes if supported list changed

Browse Source
This commit is contained in:
Luke D. Jones
2023-04-27 10:57:45 +12:00
parent bee5508099
commit 14f031ad34
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
daemon/src/ctrl_aura/controller.rs
View File

@@ -114,14 +114,35 @@ impl CtrlKbdLed {
LEDNode::None LEDNode::None
}; };
let config_init = AuraConfig::create_default(led_prod, &supported_modes); let mut config_init = AuraConfig::create_default(led_prod, &supported_modes);
let mut config = config_init.clone().load(); let mut config_loaded = config_init.clone().load();
// Do updates of supported modes if required
for mode in &config_init.builtins { for mode in &mut config_init.builtins {
if !config.builtins.contains_key(mode.0) { // update init values from loaded values if they exist
config.builtins.insert(*mode.0, mode.1.clone()); if let Some(loaded) = config_loaded.builtins.get(mode.0) {
*mode.1 = loaded.clone();
} }
} }
config_loaded.builtins = config_init.builtins;
if let (Some(mut multizone_init), Some(multizone_loaded)) =
(config_init.multizone, config_loaded.multizone.as_mut())
{
for mode in multizone_init.iter_mut() {
// update init values from loaded values if they exist
if let Some(loaded) = multizone_loaded.get(mode.0) {
let mut new_set = Vec::new();
// only reuse a zone mode if the mode is supported
for mode in loaded {
if supported_modes.basic_modes.contains(&mode.mode) {
new_set.push(mode.clone());
}
}
*mode.1 = new_set;
}
}
*multizone_loaded = multizone_init;
}
let ctrl = CtrlKbdLed { let ctrl = CtrlKbdLed {
led_prod, led_prod,
@@ -130,7 +151,7 @@ impl CtrlKbdLed {
supported_modes, supported_modes,
flip_effect_write: false, flip_effect_write: false,
per_key_mode_active: false, per_key_mode_active: false,
config, config: config_loaded,
}; };
Ok(ctrl) Ok(ctrl)
} }