Ver código fonte

6703 and 6707 bat_cap to bat_rem_cap

Avetisyan Karen 5 anos atrás
pai
commit
9feb0ca882

BIN
web_interface/dist/wui-3/index.html


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


BIN
web_interface/dist/wui-7/index.html


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


+ 1 - 1
web_interface/src/wui-3/getJson.cgi

@@ -23,7 +23,7 @@ JSON = {
   "pwr": 40.0,
   "line_fail": 1,
   "low_battery": 1,
-  "bat_cap": 92.0,
+  "bat_rem_cap": 92.0,
   "inner_temp": 27.0,
   "bat_time_left": 230.0,
   "di1": "1",

+ 2 - 2
web_interface/src/wui-3/index.html

@@ -61,8 +61,8 @@
       <div class="panel-body">
         <table class="table tb-stat">
           <tr>
-            <td>Емкость батареи</td>
-            <td ><span id="bat_cap"></span></td>
+            <td>Оставшаяся емкость батареи</td>
+            <td ><span id="bat_rem_cap"></span></td>
           </tr>
           <tr>
             <td>Внутренняя температура</td>

+ 4 - 4
web_interface/src/wui-3/main.js

@@ -30,7 +30,7 @@ var ac          = $('AC'),
   in_freq       = $('in_freq'),
   out_freq      = $('out_freq'),
   pwr           = $('pwr'),
-  bat_cap       = $('bat_cap'),
+  bat_rem_cap       = $('bat_rem_cap'),
   inner_temp    = $('inner_temp'),
   battimeleft   = $('bat_time_left'),
   // alarm         = $('alarm'),
@@ -45,7 +45,7 @@ function dataFadeIn(){
     in_freq,
     out_freq,
     pwr,
-    bat_cap,
+    bat_rem_cap,
     inner_temp,
     battimeleft,
     sPower,
@@ -508,8 +508,8 @@ 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_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;

+ 1 - 1
web_interface/src/wui-7/getJson.cgi

@@ -23,7 +23,7 @@ JSON = {
   "pwr": 40.0,
   "line_fail": 1,
   "low_battery": 1,
-  "bat_cap": 92.0,
+  "bat_rem_cap": 92.0,
   "inner_temp": 27.0,
   "bat_time_left": 230.0,
   "di1": "1",

+ 2 - 2
web_interface/src/wui-7/index.html

@@ -61,8 +61,8 @@
       <div class="panel-body">
         <table class="table tb-stat">
           <tr>
-            <td>Емкость батареи</td>
-            <td ><span id="bat_cap"></span></td>
+            <td>Оставшаяся емкость батареи</td>
+            <td ><span id="bat_rem_cap"></span></td>
           </tr>
           <tr>
             <td>Внутренняя температура</td>

+ 4 - 4
web_interface/src/wui-7/main.js

@@ -30,7 +30,7 @@ var ac          = $('AC'),
   in_freq       = $('in_freq'),
   out_freq      = $('out_freq'),
   pwr           = $('pwr'),
-  bat_cap       = $('bat_cap'),
+  bat_rem_cap       = $('bat_rem_cap'),
   inner_temp    = $('inner_temp'),
   battimeleft   = $('bat_time_left'),
   // alarm         = $('alarm'),
@@ -45,7 +45,7 @@ function dataFadeIn(){
     in_freq,
     out_freq,
     pwr,
-    bat_cap,
+    bat_rem_cap,
     inner_temp,
     battimeleft,
     sPower,
@@ -489,8 +489,8 @@ 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_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;