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

relax detection of SODIMMs

Browse Source
This commit is contained in:
Meliox 2025-09-06 21:33:39 +02:00
parent 02b335f0a2
commit c33f18c697
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,33 +125,33 @@ function configure {
msg "\nDetecting support for CPU temperature sensors..." msg "\nDetecting support for CPU temperature sensors..."
supportedCPU=false supportedCPU=false
for item in "${KNOWN_CPU_SENSORS[@]}"; do for item in "${KNOWN_CPU_SENSORS[@]}"; do
if (echo "$sensorsOutput" | grep -q "$item"); then if (echo "$sensorsOutput" | grep -q "$item"); then
echo $item echo $item
supportedCPU=true supportedCPU=true
fi fi
done done
# Prompt user for which CPU temperature to use # Prompt user for which CPU temperature to use
if [ $supportedCPU = true ]; then if [ $supportedCPU = true ]; then
while true; do while true; do
local choiceTempDisplayType=$(ask "Do you wish to display temperatures for all cores [C] or just an average temperature per CPU [a] (note: AMD only supports average)? (C/a)") local choiceTempDisplayType=$(ask "Do you wish to display temperatures for all cores [C] or just an average temperature per CPU [a] (note: AMD only supports average)? (C/a)")
case "$choiceTempDisplayType" in case "$choiceTempDisplayType" in
# Set temperature search criteria # Set temperature search criteria
[cC] | "") [cC] | "")
CPU_TEMP_TARGET="Core" CPU_TEMP_TARGET="Core"
info "Temperatures will be displayed for all cores." info "Temperatures will be displayed for all cores."
;; ;;
[aA]) [aA])
CPU_TEMP_TARGET="Package" CPU_TEMP_TARGET="Package"
info "An average temperature will be displayed per CPU." info "An average temperature will be displayed per CPU."
;; ;;
*) *)
# If the user enters an invalid input, print an warning message and retry as> # If the user enters an invalid input, print an warning message and retry as>
warn "Invalid input." warn "Invalid input."
continue continue
;; ;;
esac esac
break break
done done
SENSORS_DETECTED=true SENSORS_DETECTED=true
else else
@ -160,7 +160,7 @@ function configure {
# Look for ram temps # Look for ram temps
msg "\nDetecting support for RAM temperature sensors..." msg "\nDetecting support for RAM temperature sensors..."
if (echo "$sensorsOutput" | grep -q '"SODIMM":'); then if echo "$sensorsOutput" | grep -Eq '"SODIMM[0-9]{0,2}":'; then
msg "Detected RAM temperature sensors:\n$(echo "$sensorsOutput" | grep -o '"SODIMM[^"]*"' | sed 's/"//g')" msg "Detected RAM temperature sensors:\n$(echo "$sensorsOutput" | grep -o '"SODIMM[^"]*"' | sed 's/"//g')"
ENABLE_RAM_TEMP=true ENABLE_RAM_TEMP=true
SENSORS_DETECTED=true SENSORS_DETECTED=true
@ -169,7 +169,6 @@ function configure {
ENABLE_RAM_TEMP=false ENABLE_RAM_TEMP=false
fi fi
# Check if HDD/SSD data is installed
# Check if HDD/SSD data is installed # Check if HDD/SSD data is installed
msg "\nDetecting support for HDD/SDD temperature sensors..." msg "\nDetecting support for HDD/SDD temperature sensors..."
if [ $DEBUG_REMOTE = true ]; then if [ $DEBUG_REMOTE = true ]; then
@ -1032,7 +1031,8 @@ generate_hdd_widget() {
# use subshell to allow variable expansion # use subshell to allow variable expansion
( (
export HELPERCTORPARAMS export HELPERCTORPARAMS
cat <<'EOF' | envsubst '$HELPERCTORPARAMS' > "$1" export HDD_ITEMS_PER_ROW
cat <<'EOF' | envsubst '$HDD_ITEMS_PER_ROW $HELPERCTORPARAMS' > "$1"
{ {
itemId: 'thermalHdd', itemId: 'thermalHdd',
colspan: 2, colspan: 2,
@ -1046,7 +1046,7 @@ generate_hdd_widget() {
const sensorName = "temp1"; const sensorName = "temp1";
const tempHelper = Ext.create('PVE.mod.TempHelper', $HELPERCTORPARAMS); const tempHelper = Ext.create('PVE.mod.TempHelper', $HELPERCTORPARAMS);
// display configuration // display configuration
const itemsPerRow = ${HDD_ITEMS_PER_ROW}; const itemsPerRow = $HDD_ITEMS_PER_ROW;
// --- // ---
let objValue; let objValue;
try { try {