OP task #618 | add params

web_interface/src/wui-9/getJson.cgi

@@ -18,12 +18,17 @@ bitmask = A0 + A1 + A2 + A3 + A4 + A5 + A6 + A7
 JSON = {
   "AC": 218.8,
   "DC": 230.4,
+  "in_cur": 48.0,
+  "out_cur": 42.5,
   "in_freq": 50.0,
   "out_freq": 50.0,
   "pwr": 40.0,
   "line_fail": 1,
   "low_battery": 1,
-  "bat_cap": 92.0,
+  "bat_volt": 210,
+  "bat_cap": 1200,
+  "bat_rem_cap": 92.0,
+  "bat_exp": "12.12.2021",
   "inner_temp": 27.0,
   "bat_time_left": 230.0,
   "di1": "1",

web_interface/src/wui-9/index.html

@@ -33,6 +33,14 @@
           <td>Выходное напряжение (VAC)</td>
           <td ><span id="DC"></span></td>
         </tr>
+        <tr>
+          <td>Входная сила тока (А)</td>
+          <td ><span id="in_cur"></span></td>
+        </tr>
+        <tr>
+          <td>Выходная сила тока (А)</td>
+          <td ><span id="out_cur"></span></td>
+        </tr>
         <tr>
           <td>Входная частота</td>
           <td ><span id="in_freq"></span></td>
@@ -64,6 +72,14 @@
             <td>Емкость батареи</td>
             <td ><span id="bat_cap"></span></td>
           </tr>
+          <tr>
+            <td>Напряжение батареи</td>
+            <td ><span id="bat_volt"></span></td>
+          </tr>
+          <tr>
+            <td>Оставшаяся емкость батареи</td>
+            <td ><span id="bat_rem_cap"></span></td>
+          </tr>
           <tr>
             <td>Внутренняя температура</td>
             <td ><span id="inner_temp"></span></td>
@@ -72,6 +88,10 @@
             <td>Оставшееся время работы</td>
             <td ><span id="bat_time_left"></span></td>
           </tr>
+          <tr>
+            <td>Дата следующей замены</td>
+            <td ><span id="bat_exp"></span></td>
+          </tr>
         </table>
       </div>
     </div>

web_interface/src/wui-9/main.js

@@ -27,6 +27,8 @@ function fadeIns(el){
 
 var ac          = $('AC'),
   dc            = $('DC'),
+  in_cur       = $('in_cur'),
+  out_cur      = $('out_cur'),
   in_freq       = $('in_freq'),
   out_freq      = $('out_freq'),
   pwr           = $('pwr'),
@@ -42,6 +44,8 @@ function dataFadeIn(){
   var x = [
     ac,
     dc,
+    in_cur,
+    out_cur,
     in_freq,
     out_freq,
     pwr,
@@ -475,7 +479,8 @@ function paramsRefresh() {
       ups_standby  = Alarm(alrm, 3),
       ups_shutdown = Alarm(alrm, 1),
       bat_low      = Alarm(alrm, 6),
-      bat_test     = Alarm(alrm, 2);
+      bat_test     = Alarm(alrm, 2),
+      bat_exp      = Alarm(alrm, 8);
     // PPS
     $('AC').innerHTML         = parseFloat(data.AC) + ' В';
     $('AC').style.color       = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
@@ -483,6 +488,12 @@ function paramsRefresh() {
     $('DC').innerHTML         = parseFloat(data.DC) + ' В';
     $('DC').style.color       = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
 
+    $('in_cur').innerHTML    = parseFloat(data.in_cur) + ' А';
+    $('in_cur').style.color  = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
+
+    $('out_cur').innerHTML   = parseFloat(data.out_cur) + ' А';
+    $('out_cur').style.color = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
+
     $('in_freq').innerHTML    = parseFloat(data.in_freq) + ' Гц';
     $('in_freq').style.color  = Alarm(alrm, 7) ? ALARM_RED : ALARM_GREEN;
 
@@ -508,15 +519,23 @@ function paramsRefresh() {
     setIcons('bstate_icons', bstate);
 
     // ACB
-    $('bat_cap').innerHTML      = parseFloat(data.bat_cap) + ' %';
-    $('bat_cap').style.color    = bat_low ? ALARM_RED : ALARM_GREEN;
+    $('bat_cap').innerHTML      = parseFloat(data.bat_cap) + ' А·ч';
+
+    $('bat_volt').innerHTML      = parseFloat(data.bat_volt) + ' В';
+    $('bat_volt').style.color    = bat_low ? ALARM_RED : ALARM_GREEN;
+
+    $('bat_rem_cap').innerHTML      = parseFloat(data.bat_rem_cap) + ' %';
+    $('bat_rem_cap').style.color    = bat_low ? ALARM_RED : ALARM_GREEN;
 
     $('inner_temp').innerHTML   = parseFloat(data.inner_temp) + ' °C';
     $('inner_temp').style.color = Alarm(ma, 1) || Alarm(ma, 5) ? ALARM_RED : ALARM_GREEN;
 
-    $('bat_time_left').innerHTML = parseFloat(data.bat_time_left) + ' мин';
+    $('bat_time_left').innerHTML      = parseFloat(data.bat_time_left) + ' мин';
     $('bat_time_left').style.color    = bat_low ? ALARM_RED : ALARM_GREEN;
 
+    $('bat_exp').innerHTML      = data.bat_exp;
+    $('bat_exp').style.color    = bat_exp ? ALARM_RED : ALARM_GREEN;
+
     // checkState();
     window.setCookie('netsettings_changed', data.netsettings_changed);
     window.setCookie('device-error', Alarm(ma, 2));