NG-SD-Plugins/PowerTools
NG-SD-Plugins/PowerTools
4
4
Fork 3
Code Issues 17 Pull requests 1 Projects Releases 24 Wiki Activity

Improve current limits settings for newer kernels

Browse source
This commit is contained in:
NGnius (Graham) 2023-08-07 20:17:47 -04:00
parent 594f69b24c
commit 79484e15a2
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
backend/src/settings/steam_deck/battery.rs
View file

@ -144,7 +144,11 @@ impl EventInstruction {
fn set_charge_rate(&self) -> Result<(), SettingError> { fn set_charge_rate(&self) -> Result<(), SettingError> {
if let Some(charge_rate) = self.charge_rate { if let Some(charge_rate) = self.charge_rate {
let attr = HwMonAttribute::custom("maximum_battery_charge_rate"); let attr = if MAX_BATTERY_CHARGE_RATE_ATTR.exists(&*self.sysfs_hwmon) {
MAX_BATTERY_CHARGE_RATE_ATTR
} else {
MAXIMUM_BATTERY_CHARGE_RATE_ATTR
};
self.sysfs_hwmon.set(attr, charge_rate).map_err( self.sysfs_hwmon.set(attr, charge_rate).map_err(
|e| SettingError { |e| SettingError {
msg: format!("Failed to write to `{:?}`: {}", attr, e), msg: format!("Failed to write to `{:?}`: {}", attr, e),
@ -209,6 +213,10 @@ const HWMON_NEEDS: &[HwMonAttribute] = &[
//HwMonAttribute::custom("maximum_battery_charge_rate"), // NOTE: Cannot filter by custom capabilities //HwMonAttribute::custom("maximum_battery_charge_rate"), // NOTE: Cannot filter by custom capabilities
]; ];
const MAXIMUM_BATTERY_CHARGE_RATE_ATTR: HwMonAttribute = HwMonAttribute::custom("maximum_battery_charge_rate");
const MAX_BATTERY_CHARGE_RATE_ATTR: HwMonAttribute = HwMonAttribute::custom("maximum_battery_charge_rate");
const MAX_BATTERY_CHARGE_LEVEL_ATTR: HwMonAttribute = HwMonAttribute::custom("max_battery_charge_level");
impl Battery { impl Battery {
#[inline] #[inline]
pub fn from_json(other: BatteryJson, version: u64) -> Self { pub fn from_json(other: BatteryJson, version: u64) -> Self {
@ -298,6 +306,7 @@ impl Battery {
log::error!("Failed to find SteamDeck battery hwmon in sysfs ({}), using naive fallback", e); log::error!("Failed to find SteamDeck battery hwmon in sysfs ({}), using naive fallback", e);
root.hwmon_by_index(5) root.hwmon_by_index(5)
} }
}
} }
} }
} }
@ -325,7 +334,11 @@ impl Battery {
fn set_charge_rate(&mut self) -> Result<(), SettingError> { fn set_charge_rate(&mut self) -> Result<(), SettingError> {
if let Some(charge_rate) = self.charge_rate { if let Some(charge_rate) = self.charge_rate {
self.state.charge_rate_set = true; self.state.charge_rate_set = true;
let attr = HwMonAttribute::custom("maximum_battery_charge_rate"); let attr = if MAX_BATTERY_CHARGE_RATE_ATTR.exists(&*self.sysfs_hwmon) {
MAX_BATTERY_CHARGE_RATE_ATTR
} else {
MAXIMUM_BATTERY_CHARGE_RATE_ATTR
};
let path = attr.path(&*self.sysfs_hwmon); let path = attr.path(&*self.sysfs_hwmon);
self.sysfs_hwmon.set(attr, charge_rate).map_err( self.sysfs_hwmon.set(attr, charge_rate).map_err(
|e| SettingError { |e| SettingError {
@ -335,7 +348,11 @@ impl Battery {
) )
} else if self.state.charge_rate_set { } else if self.state.charge_rate_set {
self.state.charge_rate_set = false; self.state.charge_rate_set = false;
let attr = HwMonAttribute::custom("maximum_battery_charge_rate"); let attr = if MAX_BATTERY_CHARGE_RATE_ATTR.exists(&*self.sysfs_hwmon) {
MAX_BATTERY_CHARGE_RATE_ATTR
} else {
MAXIMUM_BATTERY_CHARGE_RATE_ATTR
};
let path = attr.path(&*self.sysfs_hwmon); let path = attr.path(&*self.sysfs_hwmon);
self.sysfs_hwmon.set(attr, self.limits.charge_rate.max,).map_err( self.sysfs_hwmon.set(attr, self.limits.charge_rate.max,).map_err(
|e| SettingError { |e| SettingError {
@ -561,17 +578,16 @@ impl OnPowerEvent for Battery {
PowerMode::BatteryCharge(_) => Ok(()), PowerMode::BatteryCharge(_) => Ok(()),
} }
.unwrap_or_else(|mut e| errors.append(&mut e)); .unwrap_or_else(|mut e| errors.append(&mut e));
let new_charge_control_attr = HwMonAttribute::custom("max_battery_charge_level"); let attr_exists = MAX_BATTERY_CHARGE_LEVEL_ATTR.exists(&*self.sysfs_hwmon);
let attr_exists = new_charge_control_attr.exists(&*self.sysfs_hwmon);
log::info!("Does battery limit attribute (max_battery_charge_level) exist? {}", attr_exists); log::info!("Does battery limit attribute (max_battery_charge_level) exist? {}", attr_exists);
for ev in &mut self.events { for ev in &mut self.events {
if attr_exists { if attr_exists {
if let EventTrigger::BatteryAbove(level) = ev.trigger { if let EventTrigger::BatteryAbove(level) = ev.trigger {
if let Some(ChargeMode::Idle) = ev.charge_mode { if let Some(ChargeMode::Idle) = ev.charge_mode {
self.sysfs_hwmon.set(new_charge_control_attr, (level * 100.0).round() as u64) self.sysfs_hwmon.set(MAX_BATTERY_CHARGE_LEVEL_ATTR, (level * 100.0).round() as u64)
.unwrap_or_else(|e| errors.push( .unwrap_or_else(|e| errors.push(
SettingError { SettingError {
msg: format!("Failed to write to {:?}: {}", new_charge_control_attr, e), msg: format!("Failed to write to {:?}: {}", MAX_BATTERY_CHARGE_LEVEL_ATTR, e),
setting: crate::settings::SettingVariant::Battery, setting: crate::settings::SettingVariant::Battery,
} }
)); ));