dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

made temp/fan speed tests more robust, good case from daniel-s-p showed problems

Browse source
This commit is contained in:
inxi-svn 2009-07-27 19:08:00 +00:00
parent 43862494d7
commit 9218415849
1 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.0.88-b1 #### version: 1.0.89-b1
#### Date: 26 July 2009 #### Date: 26 July 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -3018,7 +3018,9 @@ get_sensors_data()
BEGIN { BEGIN {
IGNORECASE=1 IGNORECASE=1
moboTemp="" moboTemp=""
moboTempLock=""
cpuTemp="" cpuTemp=""
cpuTempLock=""
cpuFan="" cpuFan=""
sysFan1="" sysFan1=""
sysFan2="" sysFan2=""
@ -3032,7 +3034,8 @@ get_sensors_data()
# there are some guesses here, and we will need a lot more data of # there are some guesses here, and we will need a lot more data of
# different systems before this can be trusted much. Note that there # different systems before this can be trusted much. Note that there
# is a hack here to handle cases where search term has 1 or 2 words with space # is a hack here to handle cases where search term has 1 or 2 words with space
/M\/B Temp|SYS Temp|temp2:/ { # also, the assumption that temp1 is cpu fan and temp2 is sys temp is not always right.
/M\/B Temp|MB Temp|SYS Temp|temp2:/ {
if ( $1 == "temp2:" ) { if ( $1 == "temp2:" ) {
tempData1=$2 tempData1=$2
tempData2=$3 tempData2=$3
@ -3041,10 +3044,16 @@ get_sensors_data()
tempData1=$3 tempData1=$3
tempData2=$4 tempData2=$4
} }
# this avoids problems if temp1 or temp2 are present also
if ( moboTempLock != "true" ){
moboTemp=gensub( /\+(.+)/, "\\1", 1, tempData1 ) moboTemp=gensub( /\+(.+)/, "\\1", 1, tempData1 )
if ( tempData2 ~ /C|F/ ){ if ( tempData2 ~ /C|F/ ){
moboTemp=moboTemp "°" tempData2 moboTemp=moboTemp "°" tempData2
} }
if ( $1 == "CPU" ) {
moboTempLock="true"
}
}
} }
/CPU Temp|temp1:/ { /CPU Temp|temp1:/ {
if ( $1 == "temp1:" ) { if ( $1 == "temp1:" ) {
@ -3055,14 +3064,26 @@ get_sensors_data()
tempData1=$3 tempData1=$3
tempData2=$4 tempData2=$4
} }
# this avoids problems if temp1 or temp2 are present also
if ( cpuTempLock != "true" ){
cpuTemp=gensub( /\+(.+)/, "\\1", 1, tempData1 ) cpuTemp=gensub( /\+(.+)/, "\\1", 1, tempData1 )
if ( tempData2 ~ /C|F/ ){ if ( tempData2 ~ /C|F/ ){
cpuTemp=cpuTemp "°" tempData2 cpuTemp=cpuTemp "°" tempData2
} }
if ( $1 == "CPU" ) {
cpuTempLock="true"
} }
/CPU Fan:/ { }
}
# note: can be cpu fan:, cpu fan speed:, etc
/CPU Fan(.*):/ {
if ( $3 ~ /(.+):/ ){
cpuFan=$4
}
else {
cpuFan=$3 cpuFan=$3
} }
}
/fan1:/ { /fan1:/ {
sysFan1=$2 sysFan1=$2
} }
@ -3074,6 +3095,17 @@ get_sensors_data()
} }
END { END {
# rough hack to get rid of bad fan speeds for cases where fan1 and cpu fan speeds are the same:
if ( cpuFan == sysFan1 && cpuFan != 0 ) {
sysFan1 = ""
}
if ( cpuFan == sysFan2 && cpuFan != 0 ) {
sysFan2 = ""
}
if ( cpuFan == sysFan3 && cpuFan != 0 ) {
sysFan3 = ""
}
# if they are ALL null, print error message # if they are ALL null, print error message
if ( moboTemp == "" && cpuTemp == "" && cpuFan == "" && sysFan1 == "" && sysFan2 == "" && sysFan3 == "" ) { if ( moboTemp == "" && cpuTemp == "" && cpuFan == "" && sysFan1 == "" && sysFan2 == "" && sysFan3 == "" ) {
print "No active sensors found. Have you configured your sensors yet?" print "No active sensors found. Have you configured your sensors yet?"