diff --git a/emhttp/plugins/dynamix/include/SmartInfo.php b/emhttp/plugins/dynamix/include/SmartInfo.php index 4e75eb6ac..7628fd840 100644 --- a/emhttp/plugins/dynamix/include/SmartInfo.php +++ b/emhttp/plugins/dynamix/include/SmartInfo.php @@ -58,10 +58,10 @@ case "attributes": $level = get_value($disk,'smLevel',1); $events = explode('|',get_value($disk,'smEvents',$numbers)); extract(parse_plugin_cfg('dynamix',true)); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : 0; - $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme > 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : 0; - $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme > 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : -1; + $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme => 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : -1; + $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme => 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); $top = $_POST['top'] ?? 120; $empty = true; exec("smartctl -n standby -A $type ".escapeshellarg("/dev/$port"),$output); diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2 index 606d4823a..1a1fa8d9d 100755 --- a/emhttp/plugins/dynamix/nchan/update_2 +++ b/emhttp/plugins/dynamix/nchan/update_2 @@ -159,11 +159,11 @@ function device_temp(&$disk, &$red, &$orange) { global $display; $spin = strpos(_var($disk,'color'),'blink')===false; $temp = _var($disk,'temp','*'); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : 0; - $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme > 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : 0; - $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme > 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); - $top = $display['top'] ?? 120; + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : -1; + $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme => 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : -1; + $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme => 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); + $top = $display['top'] ?? 120; $heat = false; $color = 'green'; if (exceed($temp,$max,$top)) { $heat = 'fire'; $color = 'red'; $red++; diff --git a/emhttp/plugins/dynamix/scripts/monitor b/emhttp/plugins/dynamix/scripts/monitor index 5562e0243..8ed8efbbc 100755 --- a/emhttp/plugins/dynamix/scripts/monitor +++ b/emhttp/plugins/dynamix/scripts/monitor @@ -47,10 +47,10 @@ function check_temp(&$disk,$text,$info) { $name = _var($disk,'name'); $named = no_tilde($name); $temp = _var($disk,'temp','*'); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : 0; - $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme > 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : 0; - $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme > 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : -1; + $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme => 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : -1; + $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme => 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false); $item = 'temp'; $last = $saved[$item][$named] ?? 0; diff --git a/emhttp/plugins/dynamix/scripts/statuscheck b/emhttp/plugins/dynamix/scripts/statuscheck index dfa0ee9f4..e54fd7b18 100755 --- a/emhttp/plugins/dynamix/scripts/statuscheck +++ b/emhttp/plugins/dynamix/scripts/statuscheck @@ -94,10 +94,10 @@ function my_clock($time) { function my_array(&$disk) { global $data,$display,$error0,$error1,$error2,$error3; $name = _var($disk,'name'); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : 0; - $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme > 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); - $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : 0; - $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme > 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['cctemp'] : -1; + $max = _var($disk,'maxTemp',-1)>=0 ? $disk['maxTemp'] : ($nvme => 0 ? $nvme : (_var($display,'max',-1)>=0 ? $display['max'] : 0)); + $nvme = _var($disk,'transport')=='nvme' ? get_nvme_powerstate(_var($disk,'device'))['wctemp'] : -1; + $hot = _var($disk,'hotTemp',-1)>=0 ? $disk['hotTemp'] : ($nvme => 0 ? $nvme : (_var($display,'hot',-1)>=0 ? $display['hot'] : 0)); if (strpos(_var($disk,'status'),'_NP')!==false) return false; $temp = _var($disk,'temp'); if ($max>0 && $temp>=$max) {