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

fixes

Browse Source
This commit is contained in:
Meliox 2025-09-07 00:22:46 +02:00
parent d52f4b0fac
commit 595bd96af6
1 changed files with 152 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ function configure {
info "Detected CPU sensors (${#cpuList[@]}): $(IFS=,; echo "${cpuList[*]}")" info "Detected CPU sensors (${#cpuList[@]}): $(IFS=,; echo "${cpuList[*]}")"
SENSORS_DETECTED=true SENSORS_DETECTED=true
while true; do while true; do
local choice=$(ask "Display temperatures for all cores [C] or average per CPU [a] (AMD only supports average)? (C/a)") local choice=$(ask "Display temperatures for all cores [C] or average per CPU [a] (some newer AMD variants support per die)? (C/a)")
case "$choice" in case "$choice" in
[cC]|"") [cC]|"")
CPU_TEMP_TARGET="Core" CPU_TEMP_TARGET="Core"
@ -799,27 +799,32 @@ generate_cpu_widget() {
const INTELPackagePrefix = '$CPU_TEMP_TARGET' == 'Core' ? 'Core ' : 'Package id'; const INTELPackagePrefix = '$CPU_TEMP_TARGET' == 'Core' ? 'Core ' : 'Package id';
const INTELPackageCaption = '$CPU_TEMP_TARGET' == 'Core' ? 'Core' : 'Package'; const INTELPackageCaption = '$CPU_TEMP_TARGET' == 'Core' ? 'Core' : 'Package';
let AMDPackagePrefix = 'Tccd'; let AMDPackagePrefix = 'Tccd';
let AMDPackageCaption = 'Chiplet'; let AMDPackageCaption = 'CCD';
if (cpuKeysA.length > 0) { if (cpuKeysA.length > 0) {
let bTccd = false; let bTccd = false;
let bTctl = false; let bTctl = false;
let bTdie = false; let bTdie = false;
let bCpuCoreTemp = false;
cpuKeysA.forEach((cpuKey, cpuIndex) => { cpuKeysA.forEach((cpuKey, cpuIndex) => {
let items = objValue[cpuKey]; let items = objValue[cpuKey];
bTccd = Object.keys(items).findIndex(item => { return String(item).startsWith('Tccd'); }) >= 0; bTccd = Object.keys(items).findIndex(item => { return String(item).startsWith('Tccd'); }) >= 0;
bTctl = Object.keys(items).findIndex(item => { return String(item).startsWith('Tctl'); }) >= 0; bTctl = Object.keys(items).findIndex(item => { return String(item).startsWith('Tctl'); }) >= 0;
bTdie = Object.keys(items).findIndex(item => { return String(item).startsWith('Tdie'); }) >= 0; bTdie = Object.keys(items).findIndex(item => { return String(item).startsWith('Tdie'); }) >= 0;
bCpuCoreTemp = Object.keys(items).findIndex(item => { return String(item) === 'CPU Core Temp'; }) >= 0;
}); });
if (bTccd && bTctl && '$CPU_TEMP_TARGET' == 'Core') { if (bTccd && '$CPU_TEMP_TARGET' == 'Core') {
AMDPackagePrefix = 'Tccd'; AMDPackagePrefix = 'Tccd';
AMDPackageCaption = 'Ccd'; AMDPackageCaption = 'CCD';
} else if (bCpuCoreTemp && '$CPU_TEMP_TARGET' == 'Package') {
AMDPackagePrefix = 'CPU Core Temp';
AMDPackageCaption = 'CPU';
} else if (bTdie) { } else if (bTdie) {
AMDPackagePrefix = 'Tdie'; AMDPackagePrefix = 'Tdie';
AMDPackageCaption = 'Die'; AMDPackageCaption = 'Die';
} else if (bTctl) { } else if (bTctl) {
AMDPackagePrefix = 'Tctl'; AMDPackagePrefix = 'Tctl';
AMDPackageCaption = 'Ctl'; AMDPackageCaption = 'Die';
} else { } else {
AMDPackagePrefix = 'temp'; AMDPackagePrefix = 'temp';
AMDPackageCaption = 'Temp'; AMDPackageCaption = 'Temp';
@ -837,7 +842,13 @@ generate_cpu_widget() {
let cpuTemps = []; let cpuTemps = [];
const items = objValue[cpuKey]; const items = objValue[cpuKey];
const itemKeys = Object.keys(items).filter(item => { const itemKeys = Object.keys(items).filter(item => {
if ('$CPU_TEMP_TARGET' == 'Core') {
// In Core mode: only show individual cores/CCDs, exclude overall CPU temp
return String(item).includes(cpuItemPrefix) || String(item).startsWith('Tccd'); return String(item).includes(cpuItemPrefix) || String(item).startsWith('Tccd');
} else {
// In Package mode: show overall CPU temp and package-level readings
return String(item).includes(cpuItemPrefix) || String(item) === 'CPU Core Temp';
}
}); });
itemKeys.forEach((coreKey) => { itemKeys.forEach((coreKey) => {
@ -864,7 +875,7 @@ generate_cpu_widget() {
let tempStr = ''; let tempStr = '';
// Enhanced parsing for AMD Tccd temperatures // Enhanced parsing for AMD temperatures
if (coreKey.startsWith('Tccd')) { if (coreKey.startsWith('Tccd')) {
let tempIndex = coreKey.match(/Tccd(\d+)/); let tempIndex = coreKey.match(/Tccd(\d+)/);
if (tempIndex !== null && tempIndex.length > 1) { if (tempIndex !== null && tempIndex.length > 1) {
@ -874,6 +885,10 @@ generate_cpu_widget() {
tempStr = `${cpuTempCaption}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`; tempStr = `${cpuTempCaption}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
} }
} }
// Handle CPU Core Temp (single overall temperature)
else if (coreKey === 'CPU Core Temp') {
tempStr = `${cpuTempCaption}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
}
// Enhanced parsing for Intel cores (P-Core, E-Core, regular Core) // Enhanced parsing for Intel cores (P-Core, E-Core, regular Core)
else { else {
let tempIndex = coreKey.match(/(?:P\s+Core|E\s+Core|Core)\s*(\d+)/); let tempIndex = coreKey.match(/(?:P\s+Core|E\s+Core|Core)\s*(\d+)/);