From d04f1c7306ebcb17375585911f24f0897b138339 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 17 Dec 2007 21:59:15 +0000 Subject: [PATCH] sensors.conf.eg: Fix voltage value references in compute statements. The measured voltage value are now named inX_input, not just inX, but the default configuration file was not properly updated to reflect this. This caused errors to be displayed by "sensors" for the g520sm, lm80 and pc87366 chips. Reported by Aurelien Jarno. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5076 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + etc/sensors.conf.eg | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index b36cf370..907e83e4 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,7 @@ SVN sensord: Fix rrd support (#2276) Use the same colors for daily and weekly charts Drop workaround needed by old versions of rrdtool + sensors.conf.eg: Fix voltage value references (g520sm, lm80, pc87366) sensors-detect: Drop PCA9540 detection 3.0.0 (2007-11-24) diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index 7736007a..862e4ece 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -937,7 +937,7 @@ chip "gl520sm-*" # compute in2 (197/47)*@ , @/(197/47) - compute in4 (5*@)-(4*in0) , (@+4*in0)/5 + compute in4 (5*@)-(4*in0_input) , (@+4*in0_input)/5 # set in0_min 4.8 # set in0_max 5.2 @@ -987,8 +987,8 @@ chip "lm80-*" compute in2 (22.1/30 + 1) * @ , @ / (22.1/30 + 1) compute in3 (2.8/1.9) * @, @ * 1.9/2.8 compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) - compute in5 (160/35.7)*(@ - in0) + @, (@ + in0 * 160/35.7)/ (1 + 160/35.7) - compute in6 (36/16.2)*(@ - in0) + @, (@ + in0 * 36/16.2) / (1 + 36/16.2) + compute in5 (160/35.7)*(@ - in0_input) + @, (@ + in0_input * 160/35.7)/ (1 + 160/35.7) + compute in6 (36/16.2)*(@ - in0_input) + @, (@ + in0_input * 36/16.2) / (1 + 36/16.2) # set in0_min 5 * 0.95 # set in0_max 5 * 1.05 @@ -2064,12 +2064,12 @@ chip "pc87366-*" # We also assume that you have a working in10 (which is forcibly enabled by # default). If not, use 3.3 instead, but you lose accuracy. - compute temp4 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \ - in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) - compute temp5 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \ - in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) - compute temp6 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \ - in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) + compute temp4 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \ + in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) + compute temp5 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \ + in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) + compute temp6 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \ + in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) # set temp4_min 0 # set temp4_max 70