aboutsummaryrefslogtreecommitdiff
path: root/devices/thinkpad-fan.cpp
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2010-11-29 19:53:48 -0800
committerArjan van de Ven <arjan@linux.intel.com>2010-11-29 19:53:48 -0800
commitb2d9b63f239fd7dbed028748c034850a80d8acdd (patch)
tree41a7c82a5e3de049ffcfb39c840a8388c25f3f72 /devices/thinkpad-fan.cpp
parentff2dc1270cf95daa45071bc2d5db673d952f00d4 (diff)
downloadpowertop-b2d9b63f239fd7dbed028748c034850a80d8acdd.tar.gz
minor fan tweaks
Diffstat (limited to 'devices/thinkpad-fan.cpp')
-rw-r--r--devices/thinkpad-fan.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/devices/thinkpad-fan.cpp b/devices/thinkpad-fan.cpp
index 20a8d69..fab1766 100644
--- a/devices/thinkpad-fan.cpp
+++ b/devices/thinkpad-fan.cpp
@@ -80,9 +80,9 @@ void create_thinkpad_fan(void)
if (access(filename, R_OK) !=0)
return;
- register_parameter("thinkpad-fan", 7);
- register_parameter("thinkpad-fan-sqr", 7);
- register_parameter("thinkpad-fan-cub", 7);
+ register_parameter("thinkpad-fan", 10);
+ register_parameter("thinkpad-fan-sqr", 5);
+ register_parameter("thinkpad-fan-cub", 10);
fan = new class thinkpad_fan();
all_devices.push_back(fan);
@@ -108,7 +108,7 @@ double thinkpad_fan::power_usage(struct result_bundle *result, struct parameter_
factor = get_parameter_value(fancub_index, bundle);
power += factor * pow(utilization / 3600.0, 3);
- factor = get_parameter_value(fansqr_index, bundle) - 4.0;
+ factor = get_parameter_value(fansqr_index, bundle) - 5.0;
power += factor * pow(utilization / 3600.0, 2);
factor = get_parameter_value(fan_index, bundle) - 10.0;