]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#199 #203 fix attempt 3
authorcopycat-killer <dada@archlinux.info>
Wed, 15 Jun 2016 07:33:52 +0000 (09:33 +0200)
committercopycat-killer <dada@archlinux.info>
Wed, 15 Jun 2016 07:33:52 +0000 (09:33 +0200)
widgets/bat.lua

index 92d1833f5aed83c32b4487b29dbdbbe37acaa28f..0c8fe5ffe4d9a637715ca9d7ac190d470bee57f1 100644 (file)
@@ -74,13 +74,14 @@ local function worker(args)
             local bstr    = "/sys/class/power_supply/" .. battery
             local present = first_line(bstr .. "/present")
 
             local bstr    = "/sys/class/power_supply/" .. battery
             local present = first_line(bstr .. "/present")
 
-            if present == "1"
+            if tonumber(present) == 1
             then
                 -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
                 local rate_current      = tonumber(first_line(bstr .. "/current_now"))
                 local rate_voltage      = tonumber(first_line(bstr .. "/voltage_now"))
                 local rate_power        = tonumber(first_line(bstr .. "/power_now"))
 
             then
                 -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
                 local rate_current      = tonumber(first_line(bstr .. "/current_now"))
                 local rate_voltage      = tonumber(first_line(bstr .. "/voltage_now"))
                 local rate_power        = tonumber(first_line(bstr .. "/power_now"))
 
+
                 -- energy_now(P)[uWh], charge_now(I)[uAh]
                 local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
                                           first_line(bstr .. "/charge_now"))
                 -- energy_now(P)[uWh], charge_now(I)[uAh]
                 local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
                                           first_line(bstr .. "/charge_now"))
@@ -97,7 +98,7 @@ local function worker(args)
                 sum_rate_current      = sum_rate_current + (rate_current or 0)
                 sum_rate_voltage      = sum_rate_voltage + rate_voltage
                 sum_rate_power        = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6))
                 sum_rate_current      = sum_rate_current + (rate_current or 0)
                 sum_rate_voltage      = sum_rate_voltage + rate_voltage
                 sum_rate_power        = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6))
-                sum_energy_now        = sum_energy_now + energy_now
+                sum_energy_now        = sum_energy_now + (energy_now or 0)
                 sum_energy_full       = sum_energy_full + energy_full
                 sum_energy_percentage = sum_energy_percentage + energy_percentage
             end
                 sum_energy_full       = sum_energy_full + energy_full
                 sum_energy_percentage = sum_energy_percentage + energy_percentage
             end
@@ -119,14 +120,13 @@ local function worker(args)
 
                 local hours   = math.floor(rate_time)
                 local minutes = math.floor((rate_time - hours) * 60)
 
                 local hours   = math.floor(rate_time)
                 local minutes = math.floor((rate_time - hours) * 60)
-                local watt    = (sum_rate_power / 1e6)
-
                 bat_now.perc  = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries)))
                 bat_now.time  = string.format("%02d:%02d", hours, minutes)
                 bat_now.perc  = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries)))
                 bat_now.time  = string.format("%02d:%02d", hours, minutes)
-                bat_now.watt  = tonumber(string.format("%.2f", watt))
-            -- consistency check
+                bat_now.watt  = tonumber(string.format("%.2f", sum_rate_power / 1e6))
             elseif bat_now.status == "Full" then
             elseif bat_now.status == "Full" then
-                bat_now.perc = 100
+                bat_now.perc  = 100
+                bat_now.time  = "00:00"
+                bat_now.watt  = 0
             end
         end
 
             end
         end