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

power: rc4, remove energy_full_design check

Browse Source
This commit is contained in:
Luke D. Jones
2022-08-26 21:09:52 +12:00
parent 97481cd45e
commit bff98ddf7b
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -552,7 +552,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]] [[package]]
name = "daemon" name = "daemon"
version = "4.4.0-rc3" version = "4.4.0-rc4"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"env_logger", "env_logger",

2
daemon/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "daemon" name = "daemon"
version = "4.4.0-rc3" version = "4.4.0-rc4"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"
authors = ["Luke <luke@ljones.dev>"] authors = ["Luke <luke@ljones.dev>"]

2
rog-control-center/src/main.rs
View File

@@ -6,7 +6,7 @@ use rog_control_center::{
}; };
use std::{ use std::{
fs::{self, OpenOptions}, fs::OpenOptions,
io::{Read, Write}, io::{Read, Write},
path::PathBuf, path::PathBuf,
sync::{atomic::AtomicBool, Arc}, sync::{atomic::AtomicBool, Arc},

12
rog-platform/src/power.rs
View File

@@ -70,15 +70,9 @@ impl AsusPower {
.attribute_value("charge_control_end_threshold") .attribute_value("charge_control_end_threshold")
.is_some() .is_some()
{ {
if let Some(m) = device.attribute_value("energy_full_design") { info!("Found battery power at {:?}, matched charge_control_end_threshold and energy_full_design", device.sysname());
if let Ok(num) = m.to_string_lossy().parse::<u32>() { battery = Some(device.syspath().to_path_buf());
if num >= 50_000_000 { } else if device.sysname().to_string_lossy().starts_with("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().contains("BAT") {
info!( info!(
"Found battery power at {:?}, sysfs path ended with BAT<n>", "Found battery power at {:?}, sysfs path ended with BAT<n>",
device.sysname() device.sysname()