Cleaned up

This commit is contained in:
Luke D Jones
2021-03-22 10:52:14 +13:00
parent 0449a4b06b
commit 7a51cd1c70
3 changed files with 48 additions and 83 deletions

View File

@@ -1,4 +1,4 @@
use daemon::{ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu}, laptops::laptop_data};
use daemon::{ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu}, laptops::LaptopLedData};
use daemon::ctrl_leds::{CtrlKbdBacklight, DbusKbdBacklight};
use daemon::{
config::Config, ctrl_supported::SupportedFunctions, laptops::print_board_info, GetSupported,
@@ -135,12 +135,12 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
DbusFanAndCpu::new(tmp).add_to_server(&mut object_server);
};
let laptop = laptop_data();
if !laptop.supported_modes().standard.is_empty() {
let aura_config = AuraConfig::load(laptop.supported_modes());
if let Some(laptop) = LaptopLedData::get_data() {
if !laptop.standard.is_empty() {
let aura_config = AuraConfig::load(&laptop);
if let Ok(ctrl) = CtrlKbdBacklight::new(
laptop.supported_modes().to_owned(),
laptop,
aura_config,
)
.map_err(|err| {
@@ -151,7 +151,7 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
DbusKbdBacklight::new(tmp.clone()).add_to_server(&mut object_server);
tasks.push(tmp);
}
}
}}
// TODO: implement messaging between threads to check fails
// These tasks generally read a sys path or file to check for a