From 823a112a37347e5ded796aae8ca638ee990c53bd Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Sun, 15 Feb 2009 22:30:14 +1100 Subject: [PATCH] battery: update for latest any_tracking kernel The 'force_usb_limit_dangerous' file is gone, and the two current limits (batter charge and usb input) are separately visible. --- battery/battery.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/battery/battery.py b/battery/battery.py index e9f23ca..2b8f6cc 100755 --- a/battery/battery.py +++ b/battery/battery.py @@ -21,9 +21,9 @@ capfile = "/sys/class/power_supply/battery/capacity" fullfile = "/sys/class/power_supply/battery/time_to_full_now" emptyfile = "/sys/class/power_supply/battery/time_to_empty_now" statusfile = "/sys/class/power_supply/battery/status" -curlimfile = "/sys/class/power_supply/usb/device/usb_curlim" +usb_curlimfile = "/sys/class/power_supply/usb/device/usb_curlim" +chg_curlimfile = "/sys/class/power_supply/usb/device/chg_curlim" chgfile = "/sys/class/power_supply/usb/device/chgmode" -danger_file = "/sys/class/power_supply/usb/device/force_usb_limit_dangerous" # 'fast 3' or ... currfile = "/sys/class/power_supply/battery/current_now" filename = "/usr/local/pixmaps/battery_%03d.png" @@ -48,7 +48,7 @@ def setfile(icon): cap = file_num(capfile) capr = int((cap+5)/10)*10 curr = file_num(currfile) - lim = file_num(curlimfile) + lim = file_num(usb_curlimfile) if curr >= 0 or lim == 0: f = filename % capr else: @@ -120,7 +120,8 @@ class BatteryConfig(gtk.Window): self.addlabel('Status', fd) self.addlabel('Current', fd) self.addlabel('ChargeMode', fd) - self.addlabel('Curr Lim', fd) + self.addlabel('USB Curr Lim', fd) + self.addlabel('Chg Curr Lim', fd) self.addlabel('TimeToFull', fd) self.addlabel('TimeToEmpty', fd) ev.connect('button_press_event', self.update_labels) @@ -164,7 +165,7 @@ class BatteryConfig(gtk.Window): def set_curr(self, widget, curr): try: - f = open(danger_file, "w") + f = open(usb_curlimfile, "w") f.write("%d" % curr) f.close() except: @@ -182,7 +183,8 @@ class BatteryConfig(gtk.Window): self.labels['Status'].set_text(file_text(statusfile)) self.labels['Current'].set_text(file_text(currfile)) self.labels['ChargeMode'].set_text(file_text(chgfile)) - self.labels['Curr Lim'].set_text(file_text(curlimfile)) + self.labels['USB Curr Lim'].set_text(file_text(usb_curlimfile)) + self.labels['Chg Curr Lim'].set_text(file_text(chg_curlimfile)) self.labels['TimeToFull'].set_text(to_time(file_num(fullfile))) self.labels['TimeToEmpty'].set_text(to_time(file_num(emptyfile))) global icon -- 2.39.5