Parcourir la source

handle new alarm bit

Avetisyan Karen il y a 2 ans
Parent
commit
e8717794fb

BIN
web_interface/dist/wui-11/main.js


BIN
web_interface/dist/wui-9/main.js


+ 6 - 6
web_interface/src/wui-11/main.js

@@ -544,7 +544,7 @@ function paramsRefresh() {
     var pstate = [];
     var bstate = [];
     var ups_bypass = Alarm(alrm, 5),
-      ups_alarm    = Alarm(alrm, 4) || Alarm(alrm, 7) || Alarm(ma, 8),
+      ups_alarm    = Alarm(alrm, 4) || Alarm(alrm, 7) || Alarm(ma, 8) || Alarm(ma, 9),
       ups_standby  = Alarm(alrm, 3),
       ups_shutdown = Alarm(alrm, 1),
       bat_low      = Alarm(alrm, 6),
@@ -552,25 +552,25 @@ function paramsRefresh() {
       // bat_exp      = Alarm(ma, 6);
     // PPS
     $('AC').innerHTML         = parseFloat(data.AC) + ' В';
-    $('AC').style.color       = Alarm(alrm, 7) || Alarm(ma, 8) ? ALARM_RED : ALARM_GREEN;
+    $('AC').style.color       = Alarm(alrm, 7) || Alarm(ma, 8) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('DC').innerHTML         = parseFloat(data.DC) + ' В';
     $('DC').style.color       = Alarm(ma, 7) ? ALARM_RED : ALARM_GREEN;
 
     $('in_cur').innerHTML    = parseFloat(data.in_cur) + ' А';
-    $('in_cur').style.color  = Alarm(alrm, 7) || Alarm(ma, 8) ? ALARM_RED : ALARM_GREEN;
+    $('in_cur').style.color  = Alarm(alrm, 7) || Alarm(ma, 8) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('out_cur').innerHTML   = parseFloat(data.out_cur) + ' А';
     $('out_cur').style.color = Alarm(ma, 7) ? ALARM_RED : ALARM_GREEN;
 
     $('in_freq').innerHTML    = parseFloat(data.in_freq) + ' Гц';
-    $('in_freq').style.color  = Alarm(alrm, 7) || Alarm(ma, 8) ? ALARM_RED : ALARM_GREEN;
+    $('in_freq').style.color  = Alarm(alrm, 7) || Alarm(ma, 8) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('out_freq').innerHTML   = parseFloat(data.out_freq) + ' Гц';
-    $('out_freq').style.color = Alarm(ma, 7) ? ALARM_RED : ALARM_GREEN;
+    $('out_freq').style.color = Alarm(ma, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('pwr').innerHTML        = parseFloat(data.pwr) + ' %';
-    $('pwr').style.color      = Alarm(ma, 0) ? ALARM_RED : ALARM_GREEN;
+    $('pwr').style.color      = Alarm(ma, 0) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('pmode').innerHTML      = data.pmode;
 

+ 8 - 8
web_interface/src/wui-9/main.js

@@ -540,7 +540,7 @@ function paramsRefresh() {
     var pstate = [];
     var bstate = [];
     var ups_bypass = Alarm(alrm, 5),
-      ups_alarm    = Alarm(alrm, 4) || Alarm(alrm, 7),
+      ups_alarm    = Alarm(alrm, 4) || Alarm(alrm, 7) || Alarm(ma, 9),
       ups_standby  = Alarm(alrm, 3),
       ups_shutdown = Alarm(alrm, 1),
       bat_low      = Alarm(alrm, 6),
@@ -548,25 +548,25 @@ function paramsRefresh() {
       bat_exp      = Alarm(ma, 6);
     // PPS
     $('AC').innerHTML         = parseFloat(data.AC) + ' В';
-    $('AC').style.color       = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
+    $('AC').style.color       = Alarm(alrm, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('DC').innerHTML         = parseFloat(data.DC) + ' В';
-    $('DC').style.color       = Alarm(ma, 7) ? ALARM_RED : ALARM_GREEN;
+    $('DC').style.color       = Alarm(ma, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('in_cur').innerHTML    = parseFloat(data.in_cur) + ' А';
-    $('in_cur').style.color  = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
+    $('in_cur').style.color  = Alarm(alrm, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('out_cur').innerHTML   = parseFloat(data.out_cur) + ' А';
-    $('out_cur').style.color = Alarm(ma, 7) ? ALARM_RED : ALARM_GREEN;
+    $('out_cur').style.color = Alarm(ma, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('in_freq').innerHTML    = parseFloat(data.in_freq) + ' Гц';
-    $('in_freq').style.color  = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
+    $('in_freq').style.color  = Alarm(alrm, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('out_freq').innerHTML   = parseFloat(data.out_freq) + ' Гц';
-    $('out_freq').style.color = Alarm(ma, 7) ? ALARM_RED : ALARM_GREEN;
+    $('out_freq').style.color = Alarm(ma, 7) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     $('pwr').innerHTML        = parseFloat(data.pwr) + ' %';
-    $('pwr').style.color      = Alarm(ma, 0) ? ALARM_RED : ALARM_GREEN;
+    $('pwr').style.color      = Alarm(ma, 0) || Alarm(ma, 9) ? ALARM_RED : ALARM_GREEN;
 
     // $('pmode').innerHTML      = ups_bypass ? 'Bypass' : 'Boost or Buck';
     $('pmode').innerHTML      = data.pmode;