From 125af2981b98a85aacacb1bdff074efccf9ac42d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 18 Sep 2022 11:22:04 +0200
Subject: [PATCH] UPS display enhancements

---
 plugins/dynamix.apcupsd/include/UPSstatus.php | 2 +-
 plugins/dynamix/nchan/ups_status              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix.apcupsd/include/UPSstatus.php b/plugins/dynamix.apcupsd/include/UPSstatus.php
index 3db3a6ed8..30f59a62b 100644
--- a/plugins/dynamix.apcupsd/include/UPSstatus.php
+++ b/plugins/dynamix.apcupsd/include/UPSstatus.php
@@ -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>").round($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 $green>" : "<td $red>").$status[6].($freq ? " ~ $freq Hz" : "")."</td>") : $status[6];
+  $status[6] = $output ? (($minv<$output && $output<$maxv ? "<td $green>" : "<td $red>").$status[6].($freq ? " ~ $freq Hz" : "")."</td>") : $status[6];
 }
 if (!$rows) $result[] = "<tr><td colspan='4' style='text-align:center'>"._('No information available')."</td></tr>";
 
diff --git a/plugins/dynamix/nchan/ups_status b/plugins/dynamix/nchan/ups_status
index f3fcffe19..f7e8301b9 100755
--- a/plugins/dynamix/nchan/ups_status
+++ b/plugins/dynamix/nchan/ups_status
@@ -119,7 +119,7 @@ while (true) {
     }
     if ($power && isset($load)) $status[5] = ($load<90 ? "<span>" : "<span $red>").round($power*$load/100)." W (".$status[5].")</span>";
     elseif (isset($load)) $status[5] = ($load<90 ? "<span>" : "<span $red>").$status[5]."</span>";
-    $status[6] = $output ? (($output>$minv&&$output<$maxv ? "<span $green>" : "<span $red>").$status[6].($freq ? " ~ $freq Hz" : "")."</span>") : $status[6];
+    $status[6] = $output ? (($minv<$output && $output<$maxv ? "<span $green>" : "<span $red>").$status[6].($freq ? " ~ $freq Hz" : "")."</span>") : $status[6];
   }
   publish('apcups',implode(';', $status));
   sleep(3);