UPS display enhancements

This commit is contained in:
bergware
2022-09-17 11:22:45 +02:00
parent 8b5d6775ed
commit 2a4c7dd240
2 changed files with 5 additions and 5 deletions
@@ -67,7 +67,7 @@ if (file_exists("/var/run/apcupsd.pid")) {
$status[5] = "$load %";
break;
case 'OUTPUTV':
$output = strtok($val,' ');
$output = intval(strtok($val,' '));
$status[6] = "$output V";
break;
case 'NOMINV':
@@ -76,7 +76,7 @@ if (file_exists("/var/run/apcupsd.pid")) {
$maxv = $volt * 1.1;
break;
case 'LINEFREQ':
$freq = $val;
$freq = intval(strtok($val,' '));
break;
}
if ($i%2==0) $result[] = "<tr>";
@@ -86,7 +86,7 @@ if (file_exists("/var/run/apcupsd.pid")) {
if (count($rows)%2==1) $result[] = "<td></td><td></td></tr>";
if ($power && isset($load)) $status[5] = ($load<90 ? "<td $green>" : "<td $red>").intval($power*$load/100)." W (".$status[5].")</td>";
elseif (isset($load)) $status[5] = ($load<90 ? "<td $green>" : "<td $red>").$status[5]."</td>";
$status[6] = $output ? (($output<$minv||$output>$maxv ? "<td $red>" : "<td $green>").$status[6].($freq ? " / $freq" : "")."</td>") : $status[6];
$status[6] = $output ? (($output<$minv||$output>$maxv ? "<td $red>" : "<td $green>").$status[6].($freq ? " / $freq Hz" : "")."</td>") : $status[6];
}
if (!$rows) $result[] = "<tr><td colspan='4' style='text-align:center'>"._('No information available')."</td></tr>";
+2 -2
View File
@@ -104,7 +104,7 @@ while (true) {
$status[5] = "$load %";
break;
case 'OUTPUTV':
$output = $val;
$output = intval($val);
$status[6] = "$output V";
break;
case 'NOMINV':
@@ -113,7 +113,7 @@ while (true) {
$maxv = $volt * 1.1;
break;
case 'LINEFREQ':
$freq = $val;
$freq = intval($val);
break;
}
}