From d4377872aa0e56a9d16e894e1831d36fc0598383 Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Tue, 7 May 2024 17:51:44 -0400 Subject: [PATCH 1/5] Update to sysfuss v0.3, sort of fix #156 --- backend/Cargo.lock | 8 ++++---- backend/Cargo.toml | 6 +++--- backend/limits_core/src/json_v2/battery_limit.rs | 4 ++-- backend/src/settings/steam_deck/battery.rs | 14 +++++++------- backend/src/settings/steam_deck/gpu.rs | 9 ++++----- backend/src/settings/steam_deck/power_dpm_force.rs | 2 +- backend/src/settings/steam_deck/util.rs | 10 ++++++++-- package.json | 2 +- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 0c0b7e5..0ea6e5a 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -1170,7 +1170,7 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "powertools" -version = "2.0.2-alpha1" +version = "2.0.3-alpha1" dependencies = [ "async-trait", "chrono", @@ -1481,7 +1481,7 @@ dependencies = [ [[package]] name = "smokepatio" -version = "0.1.0" +version = "0.2.0" dependencies = [ "embedded-io", "log", @@ -1538,9 +1538,9 @@ dependencies = [ [[package]] name = "sysfuss" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa4dd5879b3fd41aff63991a59970cdfeced6f0d5920c5da0937279904d9f45" +checksum = "f33bae529511a671b5f2ed4cc46ae0b2ccdf8c03ccf7eebe95a5a886ff7914dc" [[package]] name = "termcolor" diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 074257f..b686141 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "powertools" -version = "2.0.2-alpha1" +version = "2.0.3-alpha1" edition = "2021" authors = ["NGnius (Graham) "] description = "Backend (superuser) functionality for PowerTools" @@ -16,7 +16,7 @@ usdpl-back = { version = "0.10.1", features = ["blocking", "decky"] }#, path = " serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" ron = "0.8" -sysfuss = { version = "0.2", features = ["derive"] }#,path = "../../sysfs-nav"} +sysfuss = { version = "0.3", features = ["derive"] }#,path = "../../sysfs-nav"} # async tokio = { version = "*", features = ["time"] } @@ -31,7 +31,7 @@ limits_core = { version = "3", path = "./limits_core" } regex = "1" # steam deck libs -smokepatio = { version = "0.1", features = [ "std" ], path = "../../smokepatio" } +smokepatio = { version = "0.2", default-features = false, path = "../../smokepatio" } libc = "0.2" # online settings diff --git a/backend/limits_core/src/json_v2/battery_limit.rs b/backend/limits_core/src/json_v2/battery_limit.rs index 3506d4b..d9bc581 100644 --- a/backend/limits_core/src/json_v2/battery_limit.rs +++ b/backend/limits_core/src/json_v2/battery_limit.rs @@ -34,8 +34,8 @@ impl GenericBatteryLimit { fn default_steam_deck() -> Self { Self { charge_rate: Some(RangeLimit { - min: Some(250), - max: Some(2500), + min: Some(0), + max: Some(100), }), charge_modes: vec![ "normal".to_owned(), diff --git a/backend/src/settings/steam_deck/battery.rs b/backend/src/settings/steam_deck/battery.rs index d48e2a5..6b092c3 100644 --- a/backend/src/settings/steam_deck/battery.rs +++ b/backend/src/settings/steam_deck/battery.rs @@ -4,7 +4,7 @@ use std::sync::{Arc, Mutex}; use sysfuss::capability::attributes; use sysfuss::{ HwMonAttribute, HwMonAttributeItem, HwMonAttributeType, HwMonPath, PowerSupplyAttribute, - PowerSupplyPath, SysAttribute, SysEntity, SysEntityAttributesExt, + PowerSupplyPath, SysEntity, SysEntityAttributesExt, SysAttributeExt, }; use limits_core::json_v2::GenericBatteryLimit; @@ -230,12 +230,12 @@ const HWMON_NEEDS: &[HwMonAttribute] = &[ ]; const MAX_BATTERY_CHARGE_RATE_ATTR: HwMonAttribute = - HwMonAttribute::custom("maximum_battery_charge_rate"); + HwMonAttribute::custom("max_battery_charge_rate"); const MAX_BATTERY_CHARGE_LEVEL_ATTR: HwMonAttribute = HwMonAttribute::custom("max_battery_charge_level"); -const MAX_CHARGE_RATE: u64 = 2500; -const MIN_CHARGE_RATE: u64 = 250; +const MAX_CHARGE_RATE: u64 = 100; +const MIN_CHARGE_RATE: u64 = 0; impl Battery { fn find_battery_sysfs(root: Option>) -> PowerSupplyPath { @@ -325,7 +325,7 @@ impl Battery { self.state.charge_rate_set = true; let path = MAX_BATTERY_CHARGE_RATE_ATTR.path(&*self.sysfs_hwmon); self.sysfs_hwmon - .set(MAX_BATTERY_CHARGE_RATE_ATTR, charge_rate) + .set(MAX_BATTERY_CHARGE_RATE_ATTR, format!("{}\n", charge_rate)) .map_err(|e| SettingError { msg: format!("Failed to write to `{}`: {}", path.display(), e), setting: crate::settings::SettingVariant::Battery, @@ -336,10 +336,10 @@ impl Battery { self.sysfs_hwmon .set( MAX_BATTERY_CHARGE_RATE_ATTR, - self.limits + format!("{}\n", self.limits .charge_rate .and_then(|lim| lim.max) - .unwrap_or(2500), + .unwrap_or(100)), ) .map_err(|e| SettingError { msg: format!("Failed to write to `{}`: {}", path.display(), e), diff --git a/backend/src/settings/steam_deck/gpu.rs b/backend/src/settings/steam_deck/gpu.rs index 2899e1b..6eea1de 100644 --- a/backend/src/settings/steam_deck/gpu.rs +++ b/backend/src/settings/steam_deck/gpu.rs @@ -1,8 +1,7 @@ use std::convert::Into; use sysfuss::{ - capability::attributes, BasicEntityPath, HwMonPath, SysAttribute, SysEntity, - SysEntityAttributes, SysEntityAttributesExt, + capability::attributes, BasicEntityPath, HwMonPath, SysEntity, SysEntityAttributesExt, SysAttributeExt, }; use limits_core::json_v2::GenericGpuLimit; @@ -151,7 +150,7 @@ impl Gpu { if let super::Model::OLED = self.variant { if let Ok(f) = self .sysfs_card - .read_value(GPU_CLOCK_READOUT_ATTRIBUTE.to_owned()) + .read_value(&GPU_CLOCK_READOUT_ATTRIBUTE.to_owned()) { let options = parse_pp_dpm_sclk(&String::from_utf8_lossy(&f)); return options @@ -192,7 +191,7 @@ impl Gpu { fn quantize_memory_clock(&self, clock: u64) -> u64 { if let Ok(f) = self .sysfs_card - .read_value(GPU_MEMORY_DOWNCLOCK_ATTRIBUTE.to_owned()) + .read_value(&GPU_MEMORY_DOWNCLOCK_ATTRIBUTE.to_owned()) { let options = parse_pp_dpm_fclk(&String::from_utf8_lossy(&f)); // round (and find) nearest valid clock step @@ -238,7 +237,7 @@ impl Gpu { { let options_count = self .sysfs_card - .read_value(GPU_MEMORY_DOWNCLOCK_ATTRIBUTE.to_owned()) + .read_value(&GPU_MEMORY_DOWNCLOCK_ATTRIBUTE.to_owned()) .map(|b| parse_pp_dpm_fclk(&String::from_utf8_lossy(&b)).len()) .unwrap_or_else(|_| if is_oled { 4 } else { 2 }); let modifier = (options_count - 1) as u64; diff --git a/backend/src/settings/steam_deck/power_dpm_force.rs b/backend/src/settings/steam_deck/power_dpm_force.rs index 039026a..ce1c891 100644 --- a/backend/src/settings/steam_deck/power_dpm_force.rs +++ b/backend/src/settings/steam_deck/power_dpm_force.rs @@ -5,7 +5,7 @@ use std::sync::atomic::{AtomicU64, Ordering}; -use sysfuss::{BasicEntityPath, SysAttribute, SysEntityAttributesExt}; +use sysfuss::{BasicEntityPath, SysEntityAttributesExt, SysAttributeExt}; use crate::settings::SettingError; diff --git a/backend/src/settings/steam_deck/util.rs b/backend/src/settings/steam_deck/util.rs index 3f02be1..9343757 100644 --- a/backend/src/settings/steam_deck/util.rs +++ b/backend/src/settings/steam_deck/util.rs @@ -1,9 +1,13 @@ #![allow(dead_code)] +use std::sync::Mutex; + pub const JUPITER_HWMON_NAME: &'static str = "jupiter"; pub const STEAMDECK_HWMON_NAME: &'static str = "steamdeck_hwmon"; pub const GPU_HWMON_NAME: &'static str = "amdgpu"; +pub static THING_EC: Mutex = Mutex::new(smokepatio::ec::unnamed_power::UnnamedPowerEC::new()); + pub fn range_min_or_fallback( range: &Option>, fallback: I, @@ -25,6 +29,7 @@ pub fn card_also_has(card: &dyn sysfuss::SysEntity, extensions: &'static [&'stat } const THINGS: &[u8] = &[ + 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, @@ -35,13 +40,14 @@ const TIME_UNIT: std::time::Duration = std::time::Duration::from_millis(250); pub fn flash_led() { use smokepatio::ec::ControllerSet; - let mut ec = smokepatio::ec::unnamed_power::UnnamedPowerEC::new(); + + let mut ec = THING_EC.lock().unwrap(); for &code in THINGS { let on = code != 0; let colour = if on { smokepatio::ec::unnamed_power::StaticColour::Red } else { - smokepatio::ec::unnamed_power::StaticColour::Off + smokepatio::ec::unnamed_power::StaticColour::Disabled }; if let Err(e) = ec.set(colour) { log::error!("Thing err: {}", e); diff --git a/package.json b/package.json index e3e3573..1406247 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PowerTools", - "version": "2.0.2-alpha1", + "version": "2.0.3-alpha1", "description": "Power tweaks for power users", "scripts": { "build": "shx rm -rf dist && rollup -c", From dc014ca1c774b72a82f61081572ee63b53a5bf63 Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Tue, 7 May 2024 17:57:48 -0400 Subject: [PATCH 2/5] Update battery charge rate to % #156 --- src/components/battery.tsx | 2 +- translations/es-ES.po | 4 ++-- translations/fr-CA.po | 4 ++-- translations/it-IT.po | 4 ++-- translations/ru-RU.po | 4 ++-- translations/uk-UA.po | 4 ++-- translations/zh-CN.po | 4 ++-- translations/zh-HK.po | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/battery.tsx b/src/components/battery.tsx index 59b476d..f8de495 100644 --- a/src/components/battery.tsx +++ b/src/components/battery.tsx @@ -85,7 +85,7 @@ export class Battery extends Component { }} /> { get_value(CHARGE_RATE_BATT) != null && Date: Tue, 7 May 2024 18:40:06 -0400 Subject: [PATCH 3/5] Add more logging for #153 --- backend/src/api/handler.rs | 100 ++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/backend/src/api/handler.rs b/backend/src/api/handler.rs index 5058eab..dfc065a 100644 --- a/backend/src/api/handler.rs +++ b/backend/src/api/handler.rs @@ -32,6 +32,30 @@ pub enum ApiMessage { UploadCurrentVariant(String, String), // SteamID, Steam username } +impl core::fmt::Display for ApiMessage { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::Battery(x) => write!(f, "Battery;{}", x), + Self::Cpu(x) => write!(f, "Cpu;{}", x), + Self::Gpu(x) => write!(f, "Gpu;{}", x), + Self::General(x) => write!(f, "General;{}", x), + Self::OnResume => write!(f, "OnResume"), + Self::OnPluggedIn => write!(f, "OnPluggedIn"), + Self::OnUnplugged => write!(f, "OnUnplugged"), + Self::OnChargeChange(x) => write!(f, "OnChargeChange({:?})", x), + Self::PowerVibeCheck => write!(f, "PowerVibeCheck"), + Self::WaitForEmptyQueue(_) => write!(f, "WaitForEmptyQueue"), + Self::LoadSettings(path, name, variant, variant_name) => write!(f, "LoadSettings({}, {}, {}, {})", path, name, variant, variant_name), + Self::LoadVariant(variant, variant_name) => write!(f, "LoadVariant({}, {})", variant, variant_name), + Self::LoadMainSettings => write!(f, "LoadMainSettings"), + Self::LoadSystemSettings => write!(f, "LoadSystemSettings"), + Self::GetLimits(_) => write!(f, "GetLimits"), + Self::GetProvider(s, _) => write!(f, "GetProvider({})", s), + Self::UploadCurrentVariant(id, user) => write!(f, "UploadCurrentVariant(id: {}, user: {})", id, user), + } + } +} + pub enum BatteryMessage { SetChargeRate(Option), GetChargeRate(Callback>), @@ -46,6 +70,24 @@ pub enum BatteryMessage { GetChargeLimit(Callback>), } +impl core::fmt::Display for BatteryMessage { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::SetChargeRate(x) => write!(f, "SetChargeRate({:?})", x), + Self::GetChargeRate(_) => write!(f, "GetChargeRate"), + Self::SetChargeMode(x) => write!(f, "SetChargeMode({:?})", x), + Self::GetChargeMode(_) => write!(f, "GetChargeMode"), + Self::ReadChargeFull(_) => write!(f, "ReadChargeFull"), + Self::ReadChargeNow(_) => write!(f, "ReadChargeNow"), + Self::ReadChargeDesign(_) => write!(f, "ReadChargeDesign"), + Self::ReadCurrentNow(_) => write!(f, "ReadCurrentNow"), + Self::ReadChargePower(_) => write!(f, "ReadChargePower"), + Self::SetChargeLimit(x) => write!(f, "SetChargeLimit({:?})", x), + Self::GetChargeLimit(_) => write!(f, "GetChargeLimit"), + } + } +} + impl BatteryMessage { fn process(self, settings: &mut dyn TBattery) -> bool { let dirty = self.is_modify(); @@ -87,6 +129,23 @@ pub enum CpuMessage { GetCpusGovernor(Callback>), } +impl core::fmt::Display for CpuMessage { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::SetCpuOnline(i, x) => write!(f, "SetCpuOnline({}, {})", i, x), + Self::SetCpusOnline(x) => write!(f, "SetCpusOnline({:?})", x), + Self::SetSmt(x, _) => write!(f, "SetChargeMode({})", x), + Self::GetSmt(_) => write!(f, "GetSmt"), + Self::GetCpusOnline(_) => write!(f, "GetCpusOnline"), + Self::SetClockLimits(x, y) => write!(f, "SetClockLimits({}, {:?})", x, y), + Self::GetClockLimits(x, _) => write!(f, "GetClockLimits({})", x), + Self::SetCpuGovernor(i, x) => write!(f, "SetCpuGovernor({}, {})", i, x), + Self::SetCpusGovernor(x) => write!(f, "SetCpusGovernor({:?})", x), + Self::GetCpusGovernor(_) => write!(f, "GetCpusGovernor"), + } + } +} + impl CpuMessage { fn process(self, settings: &mut dyn TCpus) -> bool { let dirty = self.is_modify(); @@ -206,6 +265,19 @@ pub enum GpuMessage { GetMemoryClock(Callback>), } +impl core::fmt::Display for GpuMessage { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::SetPpt(x, y) => write!(f, "SetPpt(fast {:?}, slow {:?})", x, y), + Self::GetPpt(_) => write!(f, "GetPpt"), + Self::SetClockLimits(x) => write!(f, "SetClockLimits({:?})", x), + Self::GetClockLimits(_) => write!(f, "GetClockLimits"), + Self::SetMemoryClock(x) => write!(f, "SetMemoryClock({:?})", x), + Self::GetMemoryClock(_) => write!(f, "GetMemoryClock"), + } + } +} + impl GpuMessage { fn process(self, settings: &mut dyn TGpu) -> bool { let dirty = self.is_modify(); @@ -242,6 +314,21 @@ pub enum GeneralMessage { ApplyNow, } +impl core::fmt::Display for GeneralMessage { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::SetPersistent(x) => write!(f, "SetPersistent({})", x), + Self::GetPersistent(_) => write!(f, "GetPersistent"), + Self::GetCurrentProfileName(_) => write!(f, "GetCurrentProfileName"), + Self::GetPath(_) => write!(f, "GetPath"), + Self::GetCurrentVariant(_) => write!(f, "GetCurrentVariant"), + Self::GetAllVariants(_) => write!(f, "GetAllVariants"), + Self::AddVariant(variant, _) => write!(f, "AddVariant(name: `{}` [...])", variant.name), + Self::ApplyNow => write!(f, "ApplyNow"), + } + } +} + impl GeneralMessage { fn process(self, settings: &mut dyn TGeneral) -> bool { let dirty = self.is_modify(); @@ -285,20 +372,31 @@ fn print_errors(call_name: &str, errors: Vec) { log::error!("Settings {}() err:\n{}", call_name, err_list); } +fn print_messages(msgs: &Vec) { + let mut log_msg = String::new(); + for msg in msgs.iter() { + //use core::fmt::Write; + write!(log_msg, "{}, ", msg).unwrap(); + } + log::info!("Processed messages: [{}]", log_msg); +} + impl ApiMessageHandler { pub fn process_forever(&mut self, settings: &mut Settings) { crate::utility::ioperm_power_ec(); //let mut dirty_echo = true; // set everything twice, to make sure PowerTools wins on race conditions while let Ok(msg) = self.intake.recv() { + let mut messages = vec![msg.to_string()]; // keep messages for logging let mut dirty = self.process(settings, msg); while let Ok(msg) = self.intake.try_recv() { + messages.push(msg.to_string()); dirty |= self.process(settings, msg); } if dirty /*|| dirty_echo */ { //dirty_echo = dirty; // echo only once - + print_messages(&messages); // run on_set if let Err(e) = settings.on_set() { print_errors("on_set", e); From 83983a111d5833d72de3fc647884bc89cfbf58be Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Tue, 7 May 2024 18:44:30 -0400 Subject: [PATCH 4/5] Revert "Update battery charge rate to % #156" This reverts commit dc014ca1c774b72a82f61081572ee63b53a5bf63. --- src/components/battery.tsx | 2 +- translations/es-ES.po | 4 ++-- translations/fr-CA.po | 4 ++-- translations/it-IT.po | 4 ++-- translations/ru-RU.po | 4 ++-- translations/uk-UA.po | 4 ++-- translations/zh-CN.po | 4 ++-- translations/zh-HK.po | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/battery.tsx b/src/components/battery.tsx index f8de495..59b476d 100644 --- a/src/components/battery.tsx +++ b/src/components/battery.tsx @@ -85,7 +85,7 @@ export class Battery extends Component { }} /> { get_value(CHARGE_RATE_BATT) != null && Date: Tue, 7 May 2024 18:46:21 -0400 Subject: [PATCH 5/5] Make Stanto happy #152 --- src/components/battery.tsx | 2 +- translations/en-US.mo | Bin 0 -> 348 bytes translations/en-US.po | 16 ++++++++++++++++ translations/pt.pot | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 translations/en-US.mo create mode 100644 translations/en-US.po diff --git a/src/components/battery.tsx b/src/components/battery.tsx index 59b476d..f8de495 100644 --- a/src/components/battery.tsx +++ b/src/components/battery.tsx @@ -85,7 +85,7 @@ export class Battery extends Component { }} /> { get_value(CHARGE_RATE_BATT) != null && U<6 zd1|ia`|#jv!rEhwm=k87Ib}u_%rOryIF38Ns=Rx}hG5ac6Z&ABm13L4S+vC7d4e)% z)57(j1Jq864N)Itl4wJ*)z-vANFMHBHG`@fw6P(n+&lW(x$a+TLKrYa)gvr%YepNG zDMBgoG@n9x2I;xT3OUU=Pt)jL1%lcu8#+bKOTith2c;2eRBwN3DbT`t6_tx}zWX4H y)9A)oLd$19d-fsxprr4Vv6rIRC?Aln*7YqEyS>rw1wG7d<62|26veZlXz~NobYklO literal 0 HcmV?d00001 diff --git a/translations/en-US.po b/translations/en-US.po new file mode 100644 index 0000000..69ddc14 --- /dev/null +++ b/translations/en-US.po @@ -0,0 +1,16 @@ +# TEMPLATE TITLE. +# Copyright (C) 2024 NGnius +# This file is distributed under the same license as the PowerTools package. +# NGnius (Graham) , 2024. +msgid "" +msgstr "" +"Project-Id-Version: v1.1\n" +"Report-Msgid-Bugs-To: https://git.ngni.us/NG-SD-Plugins/PowerTools/PowerTools/issues\n" +"POT-Creation-Date: 2023-01-09 19:52-0500\n" +"PO-Revision-Date: 2024-05-07 18:42-0500\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: en-US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt.pot b/translations/pt.pot index d39e7b3..4d28a32 100644 --- a/translations/pt.pot +++ b/translations/pt.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: v1.1\n" -"Report-Msgid-Bugs-To: https://github.com/NGnius/PowerTools/issues\n" +"Report-Msgid-Bugs-To: https://git.ngni.us/NG-SD-Plugins/PowerTools/issues\n" "POT-Creation-Date: 2023-01-09 19:52-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n"