diff --git a/pyfan.py b/pyfan.py index f55c407..f1351e5 100644 --- a/pyfan.py +++ b/pyfan.py @@ -25,8 +25,8 @@ class ThermalZone: self.alias_replace = re.compile("|".join(self.hwmap.keys())) self.setup_pwm() - logging.getLogger("pyfan").info("[%s] Source=%s Fans=%s Factor=%d PID=%f", self.name, self.temp_source, - self.fans, self.factor, (self.pid.Kp, self.pid.Ki, self.pid.Kd)) + logging.getLogger("pyfan").info("[%s] Source=%s Fans=%s Factor=%d PID=%s", self.name, self.temp_source, + self.fans, self.factor, self.pid) def eval(self): if self.get_temp(): @@ -48,7 +48,7 @@ class ThermalZone: else: self.write_sysfs(fan, min(val, fan_val)) - logging.getLogger("pyfan").debug("[%s] %s is set at %i%%", self.name, fan, + logging.getLogger("pyfan").debug("[%s] %s=%i%%", self.name, fan, int(int(self.read_sysfs(fan)) / 255 * 100)) else: self.write_sysfs(target_fan, val) @@ -57,10 +57,8 @@ class ThermalZone: err.strerror) self.setup_pwm(1) - p, i, d = self.pid.components - - logging.getLogger("pyfan").debug("[%s] %i%% (%iC/%iC) (%f|%f|%f)", self.name, int(val / 255 * 100), diff, - self.get_temp(), p, i, d) + logging.getLogger("pyfan").debug("[%s] %i%% D:%iC T:%iC pid:%s", self.name, int(val / 255 * 100), diff, + self.get_temp(), self.pid) def get_temp(self): if isinstance(self.temp_source, list):