X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f0deb3749f0188c31ac91f3308e8925275dcb290..ebefc1e21d71c4b53e27e142cd199f3ec600da9c:/widgets/bat.lua diff --git a/widgets/bat.lua b/widgets/bat.lua index e43875f..991885a 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -62,6 +62,7 @@ local function worker(args) } bat_now.n_status = {} + bat_now.n_perc = {} for i = 1, #batteries do bat_now.n_status[i] = "N/A" bat_now.n_perc[i] = 0 @@ -124,7 +125,7 @@ local function worker(args) rate_time = sum_energy_now / div end - if rate_time < 0.01 then -- check for magnitude discrepancies (#199) + if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199) rate_time_magnitude = math.abs(math.floor(math.log10(rate_time))) rate_time = rate_time * 10^(rate_time_magnitude - 2) end @@ -134,6 +135,10 @@ local function worker(args) bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100)) bat_now.time = string.format("%02d:%02d", hours, minutes) bat_now.watt = tonumber(string.format("%.2f", sum_rate_energy / 1e6)) + elseif bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then + bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100)) + bat_now.time = "00:00" + bat_now.watt = 0 elseif bat_now.status == "Full" then bat_now.perc = 100 bat_now.time = "00:00"