OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add same logic for intel

Browse Source
This commit is contained in:
Meliox 2024-06-12 19:34:15 +02:00
parent 7a3b2572bc
commit 65ed63de58
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pve-mod-gui-sensors.sh
View File

@ -86,6 +86,7 @@ function install_packages {
function configure { function configure {
sensorsDetected=false sensorsDetected=false
local sensorsOutput=$(sensors -j) local sensorsOutput=$(sensors -j)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
err "Sensor output error.\n\nCommand output:\n${sensorsOutput}\n\nExiting...\n" err "Sensor output error.\n\nCommand output:\n${sensorsOutput}\n\nExiting...\n"
fi fi
@ -98,23 +99,25 @@ function configure {
"coretemp-"*) "coretemp-"*)
# Intel CPU # Intel CPU
# Set temperature search criterias # Set temperature search criterias
if (echo "$sensorsOutput" | grep -A 10 "$item" | grep -q "Core "); then
CPU_ADDRESS_PREFIX=$item CPU_ADDRESS_PREFIX=$item
CPU_ITEM_PREFIX="Core " CPU_ITEM_PREFIX="Core "
CPU_TEMP_CAPTION="Core" CPU_TEMP_CAPTION="Core"
fi
break break
;; ;;
"k10temp-"*) "k10temp-"*)
# AMD CPU # AMD CPU
# Find and set temperature search criterias # Find and set temperature search criterias
if (echo "$sensorsOutput" | grep -A 2 "$item" | grep -q "Tctl"); then if (echo "$sensorsOutput" | grep -A 4 "$item" | grep -q "Tctl"); then
CPU_ADDRESS_PREFIX=$item CPU_ADDRESS_PREFIX=$item
CPU_ITEM_PREFIX="Tccd" CPU_ITEM_PREFIX="Tccd"
CPU_TEMP_CAPTION="Temp" CPU_TEMP_CAPTION="Temp"
elif (echo "$sensorsOutput" | grep -A 2 "$item" | grep -q "Tccd"); then elif (echo "$sensorsOutput" | grep -A 4 "$item" | grep -q "Tccd"); then
CPU_ADDRESS_PREFIX=$item CPU_ADDRESS_PREFIX=$item
CPU_ITEM_PREFIX="Tccd" CPU_ITEM_PREFIX="Tccd"
CPU_TEMP_CAPTION="Temp" CPU_TEMP_CAPTION="Temp"
else elif (echo "$sensorsOutput" | grep -A 4 "$item" | grep -q "temp"); then
CPU_ADDRESS_PREFIX=$item CPU_ADDRESS_PREFIX=$item
CPU_ITEM_PREFIX="temp" CPU_ITEM_PREFIX="temp"
CPU_TEMP_CAPTION="Temp" CPU_TEMP_CAPTION="Temp"