]> 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:

fixed formatting to follow contrib style
authorConor Heine <conor.heine@gmail.com>
Thu, 26 Sep 2013 05:30:39 +0000 (01:30 -0400)
committercopycat-killer <dada@archlinux.info>
Wed, 5 Aug 2015 11:30:30 +0000 (13:30 +0200)
widgets/contrib/tpbat/init.lua
widgets/contrib/tpbat/smapi.lua

index 673b66c83e0f4dc8abc4b52974198612aad63a44..d46697a895c620e551ae607d757ed7e197c9249d 100644 (file)
@@ -65,7 +65,7 @@ function tpbat:show(t_out)
     tpbat_notification = naughty.notify({
         preset = { fg = beautiful.fg_normal },
         text = str,
-       timeout = t_out
+        timeout = t_out
     })
 end
 
@@ -80,17 +80,17 @@ function tpbat.register(args)
     
     tpbat.widget = wibox.widget.textbox('')
 
-       if bat:get('state') == nil then
-               local n = naughty.notify({
-                       title = "SMAPI Battery Warning: Unable to read battery state!",
-                       text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
-                       position = "top_right",
-                       timeout = 15,
-                       fg="#202020",
-                       bg="#cdcdcd",
-                       ontop = true
-               })
-       end
+    if bat:get('state') == nil then
+        local n = naughty.notify({
+            title = "SMAPI Battery Warning: Unable to read battery state!",
+            text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
+            position = "top_right",
+            timeout = 15,
+            fg="#202020",
+            bg="#cdcdcd",
+            ontop = true
+        })
+    end
 
     function update()
         bat_now = {
index 6024fa9ab736bccf5e0be187d4fe3b0586d8822f..3291cc232ec1e6cb1ffa8c47b1c71ab7f9614911 100644 (file)
@@ -19,81 +19,81 @@ local apipath = "/sys/devices/platform/smapi"
 
 -- Most are readable values, but some can be written to (not implemented, yet?)
 local readable = {
-       barcoding = true,
-       charging_max_current = true,
-       charging_max_voltage = true,
-       chemistry = true,
-       current_avg = true,
-       current_now = true,
-       cycle_count = true,
-       design_capacity = true,
-       design_voltage = true,
-       dump = true,
-       first_use_date = true,
-       force_discharge = false,
-       group0_voltage = true,
-       group1_voltage = true,
-       group2_voltage = true,
-       group3_voltage = true,
-       inhibit_charge_minutes = false,
-       installed = true,
-       last_full_capacity = true,
-       manufacture_date = true,
-       manufacturer = true,
-       model = true,
-       power_avg = true,
-       power_now = true,
-       remaining_capacity = true,
-       remaining_charging_time = true,
-       remaining_percent = true,
-       remaining_percent_error = true,
-       remaining_running_time = true,
-       remaining_running_time_now = true,
-       serial = true,
-       start_charge_thresh = false,
-       state = true,
-       stop_charge_thresh = false,
-       temperature = true,
-       voltage = true,
+    barcoding = true,
+    charging_max_current = true,
+    charging_max_voltage = true,
+    chemistry = true,
+    current_avg = true,
+    current_now = true,
+    cycle_count = true,
+    design_capacity = true,
+    design_voltage = true,
+    dump = true,
+    first_use_date = true,
+    force_discharge = false,
+    group0_voltage = true,
+    group1_voltage = true,
+    group2_voltage = true,
+    group3_voltage = true,
+    inhibit_charge_minutes = false,
+    installed = true,
+    last_full_capacity = true,
+    manufacture_date = true,
+    manufacturer = true,
+    model = true,
+    power_avg = true,
+    power_now = true,
+    remaining_capacity = true,
+    remaining_charging_time = true,
+    remaining_percent = true,
+    remaining_percent_error = true,
+    remaining_running_time = true,
+    remaining_running_time_now = true,
+    serial = true,
+    start_charge_thresh = false,
+    state = true,
+    stop_charge_thresh = false,
+    temperature = true,
+    voltage = true,
 }
 
 function smapi:battery(name)
-       local bat = {}
+    local bat = {}
 
-       bat.name = name
-       bat.path = apipath .. "/" .. name
-       
-       function bat:get(item)
-               return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
-       end
+    bat.name = name
+    bat.path = apipath .. "/" .. name
+    
+    function bat:get(item)
+        return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
+    end
 
-       function bat:installed()
-               return self:get("installed") == "1"
-       end
+    function bat:installed()
+        return self:get("installed") == "1"
+    end
 
-       function bat:status()
-               return self:get('state')
-       end
+    function bat:status()
+        return self:get('state')
+    end
 
-       -- Remaining time can either be time until battery dies or time until charging completes
-       function bat:remaining_time()
-               local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
-               local mins_left = self:get(time_val)
+    -- Remaining time can either be time until battery dies or time until charging completes
+    function bat:remaining_time()
+        local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
+        local mins_left = self:get(time_val)
 
-               if mins_left:find("^%d+") == nil then
-                       return "N/A"
-               end
-               
-               local hrs = mins_left / 60
-               local min = mins_left % 60
-               return string.format("%02d:%02d", hrs, min)
-       end
+        if mins_left:find("^%d+") == nil then
+            return "N/A"
+        end
+        
+        local hrs = mins_left / 60
+        local min = mins_left % 60
+        return string.format("%02d:%02d", hrs, min)
+    end
 
-       function bat:percent()
-               return tonumber(self:get("remaining_percent"))
-       end
+    function bat:percent()
+        return tonumber(self:get("remaining_percent"))
+    end
 
-       return setmetatable(bat, {__metatable = false, __newindex = false})
+    return setmetatable(bat, {__metatable = false, __newindex = false})
 end
 
 return smapi
\ No newline at end of file