battery: if charging use (q_full - q_now)/i_now for time

1 files changed, 4 insertions, 2 deletions

diff --git a/battery b/battery
index f6db0b9..8e6caa9 100755
--- a/battery
+++ b/battery
@@ -1,14 +1,16 @@
 #!/bin/sh
 
-awk 'BEGIN { status = ""; q_now = 0; i_now = 1; perc = 0; FS="="; }
+awk 'BEGIN { status = ""; q_now = 0; q_full = 0; i_now = 1; perc = 0; FS="="; }
 /POWER_SUPPLY_STATUS/ { status = $2; }
 /POWER_SUPPLY_CURRENT_NOW=/ { i_now = $2; }
 /POWER_SUPPLY_CHARGE_NOW/ { q_now = $2; }
+/POWER_SUPPLY_CHARGE_FULL/ { q_full = $2; }
 /POWER_SUPPLY_CAPACITY=/ { perc = $2; }
 END {   if (status=="Full"||status=="Unknown") {
             print status
         } else {
-            h=q_now/i_now;
+            if (status=="Charging") {q = q_full - q_now} else {q = q_now};
+            h=q/i_now;
             m=(h-int(h))*60;
             printf("%s%d%% %dh%dm\n",
                     substr(status, 0, 1),