From 4ac930375472c4214a02601fba13a282bbf72e7d Mon Sep 17 00:00:00 2001
From: "NGnius (Graham)" <ngniusness@gmail.com>
Date: Sat, 10 Jun 2023 16:27:13 -0400
Subject: [PATCH] Add battery power API

---
 backend/build.sh                           |   8 ++++----
 backend/src/settings/generic/battery.rs    |   4 ++++
 backend/src/settings/steam_deck/battery.rs |  16 ++++++++++++++++
 backend/src/settings/traits.rs             |   2 ++
 backend/src/settings/unknown/battery.rs    |   4 ++++
 translations/fr-CA.mo                      | Bin 2697 -> 2943 bytes
 translations/fr-FR.mo                      | Bin 2697 -> 2943 bytes
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/backend/build.sh b/backend/build.sh
index d99c6e4..7e408f6 100755
--- a/backend/build.sh
+++ b/backend/build.sh
@@ -6,7 +6,7 @@
 cargo build
 
 mkdir -p ../bin
-#cp ./target/x86_64-unknown-linux-musl/release/powertools ../bin/backend
-#cp ./target/x86_64-unknown-linux-musl/debug/powertools ../bin/backend
-#cp ./target/debug/powertools ../bin/backend
-cp ./target/debug/powertools ../bin/backend
+#cp --preserve=mode ./target/x86_64-unknown-linux-musl/release/powertools ../bin/backend
+#cp --preserve=mode ./target/x86_64-unknown-linux-musl/debug/powertools ../bin/backend
+#cp --preserve=mode ./target/debug/powertools ../bin/backend
+cp --preserve=mode ./target/debug/powertools ../bin/backend
diff --git a/backend/src/settings/generic/battery.rs b/backend/src/settings/generic/battery.rs
index 1a70c37..3390f1f 100644
--- a/backend/src/settings/generic/battery.rs
+++ b/backend/src/settings/generic/battery.rs
@@ -129,6 +129,10 @@ impl TBattery for Battery {
         None
     }
 
+    fn read_charge_power(&self) -> Option<f64> {
+        None
+    }
+
     fn charge_limit(&mut self, _limit: Option<f64>) {}
 
     fn get_charge_limit(&self) -> Option<f64> {
diff --git a/backend/src/settings/steam_deck/battery.rs b/backend/src/settings/steam_deck/battery.rs
index 9ea5372..f6481c3 100644
--- a/backend/src/settings/steam_deck/battery.rs
+++ b/backend/src/settings/steam_deck/battery.rs
@@ -320,6 +320,12 @@ impl Battery {
         }
     }
 
+    pub fn read_charge_power() -> Result<f64, SettingError> {
+        let current = Self::read_current_now()? as f64 / 1000.0; // mA -> A
+        let voltage = Self::read_usb_voltage()?;
+        Ok(current * voltage)
+    }
+
     pub fn read_charge_now() -> Result<f64, SettingError> {
         match usdpl_back::api::files::read_single::<_, u64, _>(BATTERY_CHARGE_NOW_PATH) {
             Err(e) => Err(SettingError {
@@ -552,6 +558,16 @@ impl TBattery for Battery {
         }
     }
 
+    fn read_charge_power(&self) -> Option<f64> {
+        match Self::read_charge_power() {
+            Ok(x) => Some(x as f64),
+            Err(e) => {
+                log::warn!("read_current_now err: {}", e.msg);
+                None
+            }
+        }
+    }
+
     fn charge_limit(&mut self, limit: Option<f64>) {
         // upper limit
         let index = self.find_limit_event();
diff --git a/backend/src/settings/traits.rs b/backend/src/settings/traits.rs
index f98c44d..4e96882 100644
--- a/backend/src/settings/traits.rs
+++ b/backend/src/settings/traits.rs
@@ -129,6 +129,8 @@ pub trait TBattery: OnSet + OnResume + OnPowerEvent + Debug + Send {
 
     fn read_current_now(&self) -> Option<f64>;
 
+    fn read_charge_power(&self) -> Option<f64>;
+
     fn charge_limit(&mut self, limit: Option<f64>);
 
     fn get_charge_limit(&self) -> Option<f64>;
diff --git a/backend/src/settings/unknown/battery.rs b/backend/src/settings/unknown/battery.rs
index c4ba71a..f0c67a3 100644
--- a/backend/src/settings/unknown/battery.rs
+++ b/backend/src/settings/unknown/battery.rs
@@ -75,6 +75,10 @@ impl TBattery for Battery {
         None
     }
 
+    fn read_charge_power(&self) -> Option<f64> {
+        None
+    }
+
     fn charge_limit(&mut self, _limit: Option<f64>) {}
 
     fn get_charge_limit(&self) -> Option<f64> {
diff --git a/translations/fr-CA.mo b/translations/fr-CA.mo
index d0cc852e6b2fcb053eb825676fa7b028969eac38..673bd8cdbaeff09eddcc21fff3955057543bafee 100644
GIT binary patch
delta 1267
zcmZA0OGs2v9LMqFD|0HdF&~-LDIaM%AVP(RkXl5LAx29VSLdXc=H)n}X$u!dAW<7j
zf*=Tl5P~8Lp`eXL3tP2l*~1n=xsF=d_czW!bnt&a=iGbefBxs3>s-ZV<;<sG;ax)u
z5w*niJY%|WBcBWHOMx-l@hcv}A6SfmLSyKfAXZ={?!;EyfgRY0XHf4)un1GAeA8HF
z%#4|(vyB^fa39`Bi!V@#KH>pf&pua{62>)10#lDF<TxsE2ddB>R6#?iJaOEG*RuEL
zGUFLz7P1c(kvYsWR6#4K1h2E>HB^BgFo+wd0ya@AEaOKSSECAQ#v>R)<>^QLeh^jA
zBo;HjnWb})ZNI4-j6ZW}!SARQm2*+TTGSC))I?oaiWjg62T{Mjf!d+lSdRCw8XqH5
zn77!9?{P+*KXg=4Bfo0Lc07s>mEacYj31&3SwX%33fu4<YHNRI?{5oijf1F_+w3@m
zDxed!(>(#spWQQOxlxIING&FeCoqcqnME#p@d+xy8`S%2r~=nf@Bcy_O^E9BL7zeu
z8snk~r;&{|dk8J4iup4M^pZY!ZC^8?m(}zkX$6|Jp2)RhxegvARE$~!p`FMz6=8`M
zLTCSP)51%2{)dU(gtnFiWVXH$)pR^sk^Td;1MG0-tabjmrX8yx_7io4zL8wh2dJ|*
z-Qfu@HtfQtI}(Xc+SI7Cz5SQ${L_NYqVs;#Pc45d2;`m2bnTFrO1b2e9Uk?PBhF5a
zx|sDQy(`Z2c~@=IX*ceV#F{nmqv@z^YM5^;X_>DpN|g;bFOi5$*>RUj`LU7l<%Ob(
z{F+QwXTvU=(e%aXYq<QpIFWa5>v_^fyxf#LW3W|+@9bFGi-qm#(uDIPk=3QGGJ4~&
h)kkUfUmY*2%)siBs_@6sj-1XWlJU!aWd3K#gTDt#otppv

delta 993
zcmZY8y-!n77{~FarLAo(ir5wuv==J2jW3BE>R<>YBn~7Uj1dMGC2bgt;-CqW4Y7+R
z$Z%uSm^c^{hq`rRa6nijp?`q}LRoxCba0RX{QjE5<ddHJx#!$_-kx*2pMH|6eeDfB
zH=;lpq*MZCSMWoS3-PkcEQ+r%gKzN=t{^}A%q4{zco^Gw7Js4M>kFBMF@qXs1bgrz
zM$Bq9#?1*DuA+yxPy;RCDO_~V8yKU$h8m!S%we0Tf!mnCpV*DNt{!D})l<$a^2jb>
zg!!$+jXI8Y8q6k93%Z8Acn3A%Bh-$TP!qqvVSJ71{}I)19kqcS)ce2jI$8be>SY?w
z(S8G?%x??aXuzkaBY1{Kuz`78Mt-)<MH%>x$MFyLV~p*SN*l)WSa43E7V;R2xP&=e
zLG}NJHJ#laH(EfF(bb_Jm9jI=B5H@@u3kn>coUV%8Dw)di)p-z3~6;N;UdOy6_eOP
z)^6<>`PWK*xEJ-7QhpgP;3R56^QejHNG3a-mFj~~*7RJHAETV49Hl6<L50Rq=;Iuq
zWL44m>#No|7F2hk^JYz*U24S&=Ke2+T#I&l5ZaJJ8PzfNQAQ{VkD^TK*p#uHR<3{A
zX-b}=FJ2kwq~HJ2HPsvs1q1#}IPDL_J^x+!L9-A^24m&9O4Z{x(VULn4<yRB=e_*I
U+`UilA6EUI_;R4?Z^hsI1Gno^9RL6T

diff --git a/translations/fr-FR.mo b/translations/fr-FR.mo
index d0cc852e6b2fcb053eb825676fa7b028969eac38..673bd8cdbaeff09eddcc21fff3955057543bafee 100644
GIT binary patch
delta 1267
zcmZA0OGs2v9LMqFD|0HdF&~-LDIaM%AVP(RkXl5LAx29VSLdXc=H)n}X$u!dAW<7j
zf*=Tl5P~8Lp`eXL3tP2l*~1n=xsF=d_czW!bnt&a=iGbefBxs3>s-ZV<;<sG;ax)u
z5w*niJY%|WBcBWHOMx-l@hcv}A6SfmLSyKfAXZ={?!;EyfgRY0XHf4)un1GAeA8HF
z%#4|(vyB^fa39`Bi!V@#KH>pf&pua{62>)10#lDF<TxsE2ddB>R6#?iJaOEG*RuEL
zGUFLz7P1c(kvYsWR6#4K1h2E>HB^BgFo+wd0ya@AEaOKSSECAQ#v>R)<>^QLeh^jA
zBo;HjnWb})ZNI4-j6ZW}!SARQm2*+TTGSC))I?oaiWjg62T{Mjf!d+lSdRCw8XqH5
zn77!9?{P+*KXg=4Bfo0Lc07s>mEacYj31&3SwX%33fu4<YHNRI?{5oijf1F_+w3@m
zDxed!(>(#spWQQOxlxIING&FeCoqcqnME#p@d+xy8`S%2r~=nf@Bcy_O^E9BL7zeu
z8snk~r;&{|dk8J4iup4M^pZY!ZC^8?m(}zkX$6|Jp2)RhxegvARE$~!p`FMz6=8`M
zLTCSP)51%2{)dU(gtnFiWVXH$)pR^sk^Td;1MG0-tabjmrX8yx_7io4zL8wh2dJ|*
z-Qfu@HtfQtI}(Xc+SI7Cz5SQ${L_NYqVs;#Pc45d2;`m2bnTFrO1b2e9Uk?PBhF5a
zx|sDQy(`Z2c~@=IX*ceV#F{nmqv@z^YM5^;X_>DpN|g;bFOi5$*>RUj`LU7l<%Ob(
z{F+QwXTvU=(e%aXYq<QpIFWa5>v_^fyxf#LW3W|+@9bFGi-qm#(uDIPk=3QGGJ4~&
h)kkUfUmY*2%)siBs_@6sj-1XWlJU!aWd3K#gTDt#otppv

delta 993
zcmZY8y-!n77{~FarLAo(ir5wuv==J2jW3BE>R<>YBn~7Uj1dMGC2bgt;-CqW4Y7+R
z$Z%uSm^c^{hq`rRa6nijp?`q}LRoxCba0RX{QjE5<ddHJx#!$_-kx*2pMH|6eeDfB
zH=;lpq*MZCSMWoS3-PkcEQ+r%gKzN=t{^}A%q4{zco^Gw7Js4M>kFBMF@qXs1bgrz
zM$Bq9#?1*DuA+yxPy;RCDO_~V8yKU$h8m!S%we0Tf!mnCpV*DNt{!D})l<$a^2jb>
zg!!$+jXI8Y8q6k93%Z8Acn3A%Bh-$TP!qqvVSJ71{}I)19kqcS)ce2jI$8be>SY?w
z(S8G?%x??aXuzkaBY1{Kuz`78Mt-)<MH%>x$MFyLV~p*SN*l)WSa43E7V;R2xP&=e
zLG}NJHJ#laH(EfF(bb_Jm9jI=B5H@@u3kn>coUV%8Dw)di)p-z3~6;N;UdOy6_eOP
z)^6<>`PWK*xEJ-7QhpgP;3R56^QejHNG3a-mFj~~*7RJHAETV49Hl6<L50Rq=;Iuq
zWL44m>#No|7F2hk^JYz*U24S&=Ke2+T#I&l5ZaJJ8PzfNQAQ{VkD^TK*p#uHR<3{A
zX-b}=FJ2kwq~HJ2HPsvs1q1#}IPDL_J^x+!L9-A^24m&9O4Z{x(VULn4<yRB=e_*I
U+`UilA6EUI_;R4?Z^hsI1Gno^9RL6T