From b7cf8b8caf7aa7f2d4b31f34d5f31c2b137a2596 Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Mon, 7 Aug 2023 15:57:08 -0400 Subject: [PATCH] Use incompatible hwmon for battery in the unlikely event the hwmon still has the correct name. version to alpha2 --- backend/Cargo.lock | 2 +- backend/Cargo.toml | 2 +- backend/src/settings/steam_deck/battery.rs | 8 +++----- package.json | 2 +- translations/fr-CA.mo | Bin 2943 -> 2992 bytes translations/fr-FR.mo | Bin 2943 -> 2992 bytes translations/ru-RU.mo | Bin 0 -> 3602 bytes translations/uk-UA.mo | Bin 0 -> 3636 bytes 8 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 translations/ru-RU.mo create mode 100644 translations/uk-UA.mo diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 4d5882f..b39eac7 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -1043,7 +1043,7 @@ dependencies = [ [[package]] name = "powertools" -version = "1.4.0-alpha" +version = "1.4.0-alpha2" dependencies = [ "async-trait", "libryzenadj", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 43d4a7b..cdf6af4 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "powertools" -version = "1.4.0-alpha" +version = "1.4.0-alpha2" edition = "2021" authors = ["NGnius (Graham) "] description = "Backend (superuser) functionality for PowerTools" diff --git a/backend/src/settings/steam_deck/battery.rs b/backend/src/settings/steam_deck/battery.rs index a4327fc..e57662f 100644 --- a/backend/src/settings/steam_deck/battery.rs +++ b/backend/src/settings/steam_deck/battery.rs @@ -279,12 +279,10 @@ impl Battery { let root = crate::settings::util::root_or_default_sysfs(root); match root.hwmon_by_name(super::util::JUPITER_HWMON_NAME) { Ok(hwmon) => { - if hwmon.capable(attributes(HWMON_NEEDS.into_iter().copied())) { - hwmon - } else { - log::error!("Failed to find SteamDeck battery hwmon in sysfs (hwmon by name {} exists but missing attributes), using naive fallback", super::util::JUPITER_HWMON_NAME); - root.hwmon_by_index(5) + if !hwmon.capable(attributes(HWMON_NEEDS.into_iter().copied())) { + log::warn!("Found incapable SteamDeck battery hwmon in sysfs (hwmon by name {} exists but missing attributes), persevering because ignorance is bliss", super::util::JUPITER_HWMON_NAME); } + hwmon }, Err(e) => { log::error!("Failed to find SteamDeck battery hwmon in sysfs ({}), using naive fallback", e); diff --git a/package.json b/package.json index 4bdafab..fde69b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PowerTools", - "version": "1.4.0-alpha", + "version": "1.4.0-alpha2", "description": "Power tweaks for power users", "scripts": { "build": "shx rm -rf dist && rollup -c", diff --git a/translations/fr-CA.mo b/translations/fr-CA.mo index 673bd8cdbaeff09eddcc21fff3955057543bafee..f25dd7832c35a2ff9df0d0ab6e5f18b7cd98ff0b 100644 GIT binary patch delta 1063 zcmXxjOGs2v9LMp0&8xK}Ep+ICi|#s*K+JTd zt|D+#%%WCG%T|KqDvFk~5Go=OnXvC~I`=T=e(pJQ?m7SSKldJ&ye;*=6?)4?X{AJn@(C$Dz--QaO9~JN*D&P@RU_NS|1iIvY@flQrMMR_V^{69?V++nAKU?Rb z^){7%GM*iz36vI1tSI#XD1A*-4OWR#wG%CRg&LIR;0E>5mAZBebu>ZIS9Y1IY*(mL z=N}a9JfEtUMdzy2D%u9B(yyXjXonZ6Is!Iqjnwm0vYsu8t delta 1015 zcmYk*O-NKx6u|LgGpS8!I@Zi&R+H(J9|Iy3NC+WBDDpB z5HX6ohv;bEGZD@B1JB_vY{FbNg3HL`Ni5(o9K@qIf)%`uKK}p@;}dkgDQt_V#WWX< z+<1+ra1qP6hEDVa&)`n-yR#f&+=)yOJ!m4A(TPXUM90vC?x6EL#uj{*+<#sl*COVV zAC{0cVg*fT9i8AqGTufL{ET_rMHARZci6^Dj!S4leb|jvbe>!2`x9tFPqB&hW15TG zl>LP_7=NQ1z@O-jI_R9R3q7JTy3i=L;!V7S6X^T1Xocpm0~fG_?~o;869@4V*1Y)3 zg&9?NYZ!;|BHlwMc!{3zTQre%^!W`O!Y#D4d&&LA+`n-i-FZ0~SJ4EnqLm)YasE^< zZg8W3<47(siC6F;@)t{VC-6Nw!AJD@Z8X6h^!Y#N(NxLK5BeIK=p#B8oI(m6?SvaD zvVMI6AM%5@e0_uu+x(E+fs6JKY3olf@GN06wqC+Yq|GGC!~o&h|KHqr>m=QI;y7Vx z*+9MY6|{Lg?#TZDD?o+oXYKi?&5Csrr-=)M-$>g0086iaXYQ}w%@(t(bIskE1K+wu AHUIzs diff --git a/translations/fr-FR.mo b/translations/fr-FR.mo index 673bd8cdbaeff09eddcc21fff3955057543bafee..f25dd7832c35a2ff9df0d0ab6e5f18b7cd98ff0b 100644 GIT binary patch delta 1063 zcmXxjOGs2v9LMp0&8xK}Ep+ICi|#s*K+JTd zt|D+#%%WCG%T|KqDvFk~5Go=OnXvC~I`=T=e(pJQ?m7SSKldJ&ye;*=6?)4?X{AJn@(C$Dz--QaO9~JN*D&P@RU_NS|1iIvY@flQrMMR_V^{69?V++nAKU?Rb z^){7%GM*iz36vI1tSI#XD1A*-4OWR#wG%CRg&LIR;0E>5mAZBebu>ZIS9Y1IY*(mL z=N}a9JfEtUMdzy2D%u9B(yyXjXonZ6Is!Iqjnwm0vYsu8t delta 1015 zcmYk*O-NKx6u|LgGpS8!I@Zi&R+H(J9|Iy3NC+WBDDpB z5HX6ohv;bEGZD@B1JB_vY{FbNg3HL`Ni5(o9K@qIf)%`uKK}p@;}dkgDQt_V#WWX< z+<1+ra1qP6hEDVa&)`n-yR#f&+=)yOJ!m4A(TPXUM90vC?x6EL#uj{*+<#sl*COVV zAC{0cVg*fT9i8AqGTufL{ET_rMHARZci6^Dj!S4leb|jvbe>!2`x9tFPqB&hW15TG zl>LP_7=NQ1z@O-jI_R9R3q7JTy3i=L;!V7S6X^T1Xocpm0~fG_?~o;869@4V*1Y)3 zg&9?NYZ!;|BHlwMc!{3zTQre%^!W`O!Y#D4d&&LA+`n-i-FZ0~SJ4EnqLm)YasE^< zZg8W3<47(siC6F;@)t{VC-6Nw!AJD@Z8X6h^!Y#N(NxLK5BeIK=p#B8oI(m6?SvaD zvVMI6AM%5@e0_uu+x(E+fs6JKY3olf@GN06wqC+Yq|GGC!~o&h|KHqr>m=QI;y7Vx z*+9MY6|{Lg?#TZDD?o+oXYKi?&5Csrr-=)M-$>g0086iaXYQ}w%@(t(bIskE1K+wu AHUIzs diff --git a/translations/ru-RU.mo b/translations/ru-RU.mo new file mode 100644 index 0000000000000000000000000000000000000000..30e36e28468a6053f367bf29768c6dc983f53ec6 GIT binary patch literal 3602 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 literal 0 HcmV?d00001