added new battest icon and fix hadler

web_interface/src/wui/index.html

@@ -52,10 +52,6 @@
           <td>Текущий режим</td>
           <td ><span id="pmode"></span></td>
         </tr>
-<!--         <tr class="">
-          <td>Текущее состояние</td>
-          <td ><span id="pstate"></span></td>
-        </tr> -->
         <tr class="hidden">
           <td>Индикация аварийных ситуаций</td>
           <td><span id="alarm"></span></td>
@@ -73,10 +69,6 @@
           <td>Внутренняя температура</td>
           <td ><span id="inner_temp"></span></td>
         </tr>
-        <tr class="hidden">
-          <td>Текущее состояние</td>
-          <td ><span id="bstate"></span></td>
-        </tr>
         <tr>
           <td>Оставшееся время работы</td>
           <td ><span id="bat_time_left"></span></td>

web_interface/src/wui/main.js

@@ -488,11 +488,13 @@ function paramsRefresh() {
     $('pwr').innerHTML           = parseFloat(data.pwr) + ' %';
     $('pmode').innerHTML         = ups_bypass ? 'Шунтирование (Bypass)' : 'Буферизация (Boost or Buck)';
     // pstate = ('(') + (bat_test ? 'Норма' : 'Режим ожидания') + (ups_alarm ? ' | Авария ' : '') + (ups_shutdown ? ' | Выключение' : '') + (')');
-    bat_test ? pstate.push('normal') : pstate.push('clock');
-    ups_alarm ? pstate.push('exclamination') : null;
-    ups_shutdown ? pstate.push('shutdown') : '';
+    ups_alarm ? pstate.push('exclamination') : pstate.push('normal');
+    ups_standby ? pstate.push('clock') : null;
+    ups_shutdown ? pstate.push('shutdown') : null;
 
-    bat_low ? bstate.push('batteryLow') : bstate.push('normal');
+    bat_alarm ? bstate.push('exclamination') : bstate.push('normal');
+    bat_low ? bstate.push('batteryLow') : null;
+    bat_test ? bstate.push('batTest') : null;
     // console.log(pstate);
     setIcons('pstate_icons', pstate);
     setIcons('bstate_icons', bstate);
@@ -503,7 +505,6 @@ function paramsRefresh() {
     $('bat_cap').innerHTML       = parseFloat(data.bat_cap) + ' %';
     $('inner_temp').innerHTML    = parseFloat(data.inner_temp) + ' °C';
     $('bat_time_left').innerHTML = parseFloat(data.bat_time_left) + ' мин';
-    $('bstate').innerHTML        = bat_alarm;
     // State
     // $('alarm').innerHTML         = data.alarm;
     // General
@@ -1449,5 +1450,9 @@ var Icons = {
   batteryLow: {
     icn: '<svg width="30" height="20" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1920 576q53 0 90.5 37.5t37.5 90.5v384q0 53-37.5 90.5t-90.5 37.5v160q0 66-47 113t-113 47h-1856q-66 0-113-47t-47-113v-960q0-66 47-113t113-47h1856q66 0 113 47t47 113v160zm0 512v-384h-128v-288q0-14-9-23t-23-9h-1856q-14 0-23 9t-9 23v960q0 14 9 23t23 9h1856q14 0 23-9t9-23v-288h128z" fill="'+ ALARM_RED +'"/></svg>',
     title: 'Низкий уровень заряда'
+  },
+  batTest: {
+    icn: '<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1024 1408h640v-128h-640v128zm-384-512h1024v-128h-1024v128zm640-512h384v-128h-384v128zm512 832v256q0 26-19 45t-45 19h-1664q-26 0-45-19t-19-45v-256q0-26 19-45t45-19h1664q26 0 45 19t19 45zm0-512v256q0 26-19 45t-45 19h-1664q-26 0-45-19t-19-45v-256q0-26 19-45t45-19h1664q26 0 45 19t19 45zm0-512v256q0 26-19 45t-45 19h-1664q-26 0-45-19t-19-45v-256q0-26 19-45t45-19h1664q26 0 45 19t19 45z" fill="'+ ALARM_YELLOW +'"/></svg>',
+    title: 'Тестирование'
   }
 };