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

267
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"
@ -775,146 +775,161 @@ generate_cpu_widget() {
cat <<'EOF' | envsubst '$CPU_ITEMS_PER_ROW $CPU_TEMP_TARGET $HELPERCTORPARAMS' > "$1" cat <<'EOF' | envsubst '$CPU_ITEMS_PER_ROW $CPU_TEMP_TARGET $HELPERCTORPARAMS' > "$1"
{ {
itemId: 'thermalCpu', itemId: 'thermalCpu',
colspan: 2, colspan: 2,
printBar: false, printBar: false,
title: gettext('CPU Thermal State'), title: gettext('CPU Thermal State'),
iconCls: 'fa fa-fw fa-thermometer-half', iconCls: 'fa fa-fw fa-thermometer-half',
textField: 'sensorsOutput', textField: 'sensorsOutput',
renderer: function(value){ renderer: function(value){
// sensors configuration // sensors configuration
const cpuTempHelper = Ext.create('PVE.mod.TempHelper', $HELPERCTORPARAMS); const cpuTempHelper = Ext.create('PVE.mod.TempHelper', $HELPERCTORPARAMS);
// display configuration // display configuration
const itemsPerRow = $CPU_ITEMS_PER_ROW; const itemsPerRow = $CPU_ITEMS_PER_ROW;
// --- // ---
let objValue; let objValue;
try { try {
objValue = JSON.parse(value) || {}; objValue = JSON.parse(value) || {};
} catch(e) { } catch(e) {
objValue = {}; objValue = {};
} }
const cpuKeysI = Object.keys(objValue).filter(item => String(item).startsWith('coretemp-isa-')).sort(); const cpuKeysI = Object.keys(objValue).filter(item => String(item).startsWith('coretemp-isa-')).sort();
const cpuKeysA = Object.keys(objValue).filter(item => String(item).startsWith('k10temp-pci-')).sort(); const cpuKeysA = Object.keys(objValue).filter(item => String(item).startsWith('k10temp-pci-')).sort();
const bINTEL = cpuKeysI.length > 0 ? true : false; const bINTEL = cpuKeysI.length > 0 ? true : false;
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;
cpuKeysA.forEach((cpuKey, cpuIndex) => { let bCpuCoreTemp = false;
let items = objValue[cpuKey]; cpuKeysA.forEach((cpuKey, cpuIndex) => {
bTccd = Object.keys(items).findIndex(item => { return String(item).startsWith('Tccd'); }) >= 0; let items = objValue[cpuKey];
bTctl = Object.keys(items).findIndex(item => { return String(item).startsWith('Tctl'); }) >= 0; bTccd = Object.keys(items).findIndex(item => { return String(item).startsWith('Tccd'); }) >= 0;
bTdie = Object.keys(items).findIndex(item => { return String(item).startsWith('Tdie'); }) >= 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;
if (bTccd && bTctl && '$CPU_TEMP_TARGET' == 'Core') { bCpuCoreTemp = Object.keys(items).findIndex(item => { return String(item) === 'CPU Core Temp'; }) >= 0;
AMDPackagePrefix = 'Tccd'; });
AMDPackageCaption = 'Ccd'; if (bTccd && '$CPU_TEMP_TARGET' == 'Core') {
} else if (bTdie) { AMDPackagePrefix = 'Tccd';
AMDPackagePrefix = 'Tdie'; AMDPackageCaption = 'CCD';
AMDPackageCaption = 'Die'; } else if (bCpuCoreTemp && '$CPU_TEMP_TARGET' == 'Package') {
} else if (bTctl) { AMDPackagePrefix = 'CPU Core Temp';
AMDPackagePrefix = 'Tctl'; AMDPackageCaption = 'CPU';
AMDPackageCaption = 'Ctl'; } else if (bTdie) {
} else { AMDPackagePrefix = 'Tdie';
AMDPackagePrefix = 'temp'; AMDPackageCaption = 'Die';
AMDPackageCaption = 'Temp'; } else if (bTctl) {
} AMDPackagePrefix = 'Tctl';
} AMDPackageCaption = 'Die';
} else {
AMDPackagePrefix = 'temp';
AMDPackageCaption = 'Temp';
}
}
const cpuKeys = bINTEL ? cpuKeysI : cpuKeysA; const cpuKeys = bINTEL ? cpuKeysI : cpuKeysA;
const cpuItemPrefix = bINTEL ? INTELPackagePrefix : AMDPackagePrefix; const cpuItemPrefix = bINTEL ? INTELPackagePrefix : AMDPackagePrefix;
const cpuTempCaption = bINTEL ? INTELPackageCaption : AMDPackageCaption; const cpuTempCaption = bINTEL ? INTELPackageCaption : AMDPackageCaption;
const formatTemp = bINTEL ? '0' : '0.0'; const formatTemp = bINTEL ? '0' : '0.0';
const cpuCount = cpuKeys.length; const cpuCount = cpuKeys.length;
let temps = []; let temps = [];
cpuKeys.forEach((cpuKey, cpuIndex) => { cpuKeys.forEach((cpuKey, cpuIndex) => {
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 => {
return String(item).includes(cpuItemPrefix) || String(item).startsWith('Tccd'); 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');
} 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) => {
try { try {
let tempVal = NaN, tempMax = NaN, tempCrit = NaN; let tempVal = NaN, tempMax = NaN, tempCrit = NaN;
Object.keys(items[coreKey]).forEach((secondLevelKey) => { Object.keys(items[coreKey]).forEach((secondLevelKey) => {
if (secondLevelKey.endsWith('_input')) { if (secondLevelKey.endsWith('_input')) {
tempVal = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey])); tempVal = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
} else if (secondLevelKey.endsWith('_max')) { } else if (secondLevelKey.endsWith('_max')) {
tempMax = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey])); tempMax = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
} else if (secondLevelKey.endsWith('_crit')) { } else if (secondLevelKey.endsWith('_crit')) {
tempCrit = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey])); tempCrit = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
} }
}); });
if (!isNaN(tempVal)) { if (!isNaN(tempVal)) {
let tempStyle = ''; let tempStyle = '';
if (!isNaN(tempMax) && tempVal >= tempMax) { if (!isNaN(tempMax) && tempVal >= tempMax) {
tempStyle = 'color: #FFC300; font-weight: bold;'; tempStyle = 'color: #FFC300; font-weight: bold;';
} }
if (!isNaN(tempCrit) && tempVal >= tempCrit) { if (!isNaN(tempCrit) && tempVal >= tempCrit) {
tempStyle = 'color: red; font-weight: bold;'; tempStyle = 'color: red; font-weight: bold;';
} }
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) {
tempIndex = tempIndex[1]; tempIndex = tempIndex[1];
tempStr = `${cpuTempCaption}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`; tempStr = `${cpuTempCaption}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
} else { } else {
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>`;
} }
} }
// Enhanced parsing for Intel cores (P-Core, E-Core, regular Core) // Handle CPU Core Temp (single overall temperature)
else { else if (coreKey === 'CPU Core Temp') {
let tempIndex = coreKey.match(/(?:P\s+Core|E\s+Core|Core)\s*(\d+)/); tempStr = `${cpuTempCaption}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
if (tempIndex !== null && tempIndex.length > 1) { }
tempIndex = tempIndex[1]; // Enhanced parsing for Intel cores (P-Core, E-Core, regular Core)
let coreType = coreKey.startsWith('P Core') ? 'P Core' : else {
coreKey.startsWith('E Core') ? 'E Core' : let tempIndex = coreKey.match(/(?:P\s+Core|E\s+Core|Core)\s*(\d+)/);
cpuTempCaption; if (tempIndex !== null && tempIndex.length > 1) {
tempStr = `${coreType}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`; tempIndex = tempIndex[1];
} else { let coreType = coreKey.startsWith('P Core') ? 'P Core' :
// fallback for CPUs which do not have a core index coreKey.startsWith('E Core') ? 'E Core' :
let coreType = coreKey.startsWith('P Core') ? 'P Core' : cpuTempCaption;
coreKey.startsWith('E Core') ? 'E Core' : tempStr = `${coreType}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
cpuTempCaption; } else {
tempStr = `${coreType}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`; // fallback for CPUs which do not have a core index
} let coreType = coreKey.startsWith('P Core') ? 'P Core' :
} coreKey.startsWith('E Core') ? 'E Core' :
cpuTempCaption;
tempStr = `${coreType}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
}
}
cpuTemps.push(tempStr); cpuTemps.push(tempStr);
} }
} catch (e) { /*_*/ } } catch (e) { /*_*/ }
}); });
if(cpuTemps.length > 0) { if(cpuTemps.length > 0) {
temps.push(cpuTemps); temps.push(cpuTemps);
} }
}); });
let result = ''; let result = '';
temps.forEach((cpuTemps, cpuIndex) => { temps.forEach((cpuTemps, cpuIndex) => {
const strCoreTemps = cpuTemps.map((strTemp, index, arr) => { const strCoreTemps = cpuTemps.map((strTemp, index, arr) => {
return strTemp + (index + 1 < arr.length ? (itemsPerRow > 0 && (index + 1) % itemsPerRow === 0 ? '<br>' : '&nbsp;| ') : ''); return strTemp + (index + 1 < arr.length ? (itemsPerRow > 0 && (index + 1) % itemsPerRow === 0 ? '<br>' : '&nbsp;| ') : '');
}) })
if(strCoreTemps.length > 0) { if(strCoreTemps.length > 0) {
result += (cpuCount > 1 ? `CPU ${cpuIndex+1}: ` : '') + strCoreTemps.join('') + (cpuIndex < cpuCount ? '<br>' : ''); result += (cpuCount > 1 ? `CPU ${cpuIndex+1}: ` : '') + strCoreTemps.join('') + (cpuIndex < cpuCount ? '<br>' : '');
} }
}); });
return '<div style="text-align: left; margin-left: 28px;">' + (result.length > 0 ? result : 'N/A') + '</div>'; return '<div style="text-align: left; margin-left: 28px;">' + (result.length > 0 ? result : 'N/A') + '</div>';
} }
}, },
EOF EOF
) )
#endregion cpu widget heredoc #endregion cpu widget heredoc