anonfunc/PyFan
2
0
Fork 0
Code Issues Pull Requests Releases 10 Wiki Activity

handled None return for temp

Browse Source
This commit is contained in:
Giovanni Harting
2019-09-15 00:47:09 +02:00
parent e4bda467bf
commit 69bac0b97b
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pyfan.py
View File

@@ -35,30 +35,34 @@ class ThermalZone:
self.pid.Kd))) self.pid.Kd)))
def eval(self): def eval(self):
diff = self.target - self.get_temp() if self.get_temp():
val = self.pid(diff) diff = self.target - self.get_temp()
val = self.pid(diff)
try: try:
for target_fan in self.fans: for target_fan in self.fans:
if type(target_fan) is dict: if type(target_fan) is dict:
self.write_sysfs(list(target_fan.keys())[0], min(int(val), list(target_fan.values())[0])) self.write_sysfs(list(target_fan.keys())[0], min(int(val), list(target_fan.values())[0]))
else: else:
self.write_sysfs(target_fan, int(val)) self.write_sysfs(target_fan, int(val))
except OSError as err: except OSError as err:
logging.getLogger("pyfan").warning( logging.getLogger("pyfan").warning(
"[%s] Failed to set pwm, trying to reset it. (%s)" % (self.name, err.strerror)) "[%s] Failed to set pwm, trying to reset it. (%s)" % (self.name, err.strerror))
self.setup_pwm(1) self.setup_pwm(1)
p, i, d = self.pid.components p, i, d = self.pid.components
logging.getLogger("pyfan").debug( logging.getLogger("pyfan").debug(
"[{name}] {val}% ({diff}C/{temp}C) ({p}|{i}|{d})".format(name=self.name, val=int(val / 255 * 100), "[{name}] {val}% ({diff}C/{temp}C) ({p}|{i}|{d})".format(name=self.name, val=int(val / 255 * 100),
diff=diff, diff=diff,
temp=self.get_temp(), p=int(p), i=int(i), temp=self.get_temp(), p=int(p), i=int(i),
d=int(d))) d=int(d)))
def get_temp(self): def get_temp(self):
return float(self.read_sysfs(self.temp_source)) * self.factor if self.read_sysfs(self.temp_source):
return float(self.read_sysfs(self.temp_source)) * self.factor
else:
return None
def restore(self): def restore(self):
self.setup_pwm(2) self.setup_pwm(2)
@@ -94,6 +98,7 @@ class ThermalZone:
logging.getLogger("pyfan").warning( logging.getLogger("pyfan").warning(
"[%s] temp source not found. Not ready yet or wrong path? (%s)" % (self.name, "[%s] temp source not found. Not ready yet or wrong path? (%s)" % (self.name,
err.strerror)) err.strerror))
return None
def set_pwm_mode(self, path, value=1): def set_pwm_mode(self, path, value=1):
self.write_sysfs(path + "_enable", value) self.write_sysfs(path + "_enable", value)