From bff98ddf7b9ab6c523e8988adb6f2468d3223a2e Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 26 Aug 2022 21:09:52 +1200 Subject: [PATCH] power: rc4, remove energy_full_design check --- Cargo.lock | 2 +- daemon/Cargo.toml | 2 +- rog-control-center/src/main.rs | 2 +- rog-platform/src/power.rs | 12 +++--------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f33692ba..304a2c83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -552,7 +552,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "daemon" -version = "4.4.0-rc3" +version = "4.4.0-rc4" dependencies = [ "async-trait", "env_logger", diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index bd662855..d788b60b 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daemon" -version = "4.4.0-rc3" +version = "4.4.0-rc4" license = "MPL-2.0" readme = "README.md" authors = ["Luke "] diff --git a/rog-control-center/src/main.rs b/rog-control-center/src/main.rs index 907f0a09..634342aa 100644 --- a/rog-control-center/src/main.rs +++ b/rog-control-center/src/main.rs @@ -6,7 +6,7 @@ use rog_control_center::{ }; use std::{ - fs::{self, OpenOptions}, + fs::OpenOptions, io::{Read, Write}, path::PathBuf, sync::{atomic::AtomicBool, Arc}, diff --git a/rog-platform/src/power.rs b/rog-platform/src/power.rs index 4b131aea..aa0ca66c 100644 --- a/rog-platform/src/power.rs +++ b/rog-platform/src/power.rs @@ -70,15 +70,9 @@ impl AsusPower { .attribute_value("charge_control_end_threshold") .is_some() { - if let Some(m) = device.attribute_value("energy_full_design") { - if let Ok(num) = m.to_string_lossy().parse::() { - if num >= 50_000_000 { - info!("Found battery power at {:?}, matched charge_control_end_threshold and energy_full_design", device.sysname()); - battery = Some(device.syspath().to_path_buf()); - } - } - } - } else if device.sysname().to_string_lossy().contains("BAT") { + info!("Found battery power at {:?}, matched charge_control_end_threshold and energy_full_design", device.sysname()); + battery = Some(device.syspath().to_path_buf()); + } else if device.sysname().to_string_lossy().starts_with("BAT") { info!( "Found battery power at {:?}, sysfs path ended with BAT", device.sysname()