OP task #739 | add battery params for 6703-rt

web_interface/src/wui-3-rt/main.js

@@ -852,6 +852,7 @@ function settingsGET(){
     $('di1').value = +data.di1;
     $('ro1').value = +data.ro1;
     $('ro2').value = +data.ro2;
+    $('ups_max_power').value = data.ups_max_power;
     // Network params
     $('ipaddr').value   = data.ipaddr;
     $('gw').value       = data.gw;
@@ -879,6 +880,12 @@ function settingsGET(){
       'decimals':2,
       'step':0.01
     });
+    ups_batcap = new SpinBox('ups_batcap', {
+      'value': data.ups_batcap,
+      'name':'ups_batcap',
+      'minimum':1,
+      'maximum':200
+    });
     temp_hist     = new SpinBox('temp_hist', {
       'name':'temp_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': data.temp_hist
     });

web_interface/src/wui-3-rt/settings.cgi

@@ -13,7 +13,6 @@ JSON = {
   "managerIP5":"0.0.0.0",
   "batvoltage_min":42,
   "batvoltage_min_hist":0.25,
-  "batcap":7,
   "batcharge_volt":2.275,
   "tempcomp":False,
   "temp_high": 45,
@@ -24,6 +23,8 @@ JSON = {
   "bat_cap_deviation": 20,
   "ups_cell_min": 0.5,
   "ups_cell_max": 1.5,
+  "ups_batcap":7,
+  "ups_max_power":6,
   "loadvolt_high": 65,
   "loadvolt_hist": 0.5,
   "mainvolt_low": 112,

web_interface/src/wui-3-rt/settings.html

@@ -183,6 +183,21 @@
       <div class="col span_1_of_2">
         <span id="ups_cell_max"></span>
       </div>
+      <label for="ups_batcap" class="col span_1_of_2">Емкость батареи (А·ч)</label>
+      <div class="col span_1_of_2">
+        <span id="ups_batcap"></span>
+      </div>
+      <label for="ups_max_power" class="col span_1_of_2"> Полная мощность ИБП (кВА)</label>
+      <div class="col span_1_of_2">
+        <select name="ups_max_power" id="ups_max_power" class="form-control">
+          <option value="1">1,0 кВА</option>
+          <option value="1.5">1,5 кВА</option>
+          <option value="2">2 кВА</option>
+          <option value="3">3 кВА</option>
+          <option value="6">6 кВА</option>
+          <option value="10">10 кВА</option>
+        </select>
+      </div>
     </div>
   </div>
 </div>
@@ -439,6 +454,7 @@ DYN_WEB.Tabs.setup({
 var ntpservipValue;
 var ups_cell_min      = new SpinBox('ups_cell_min', {'name':'ups_cell_min','minimum':0,'maximum':3,'step':0.01});
 var ups_cell_max      = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum':0,'maximum':3,'step':0.01});
+var ups_batcap        = new SpinBox('ups_batcap', {'name':'ups_batcap','minimum':1,'maximum':200});
 var temp_hist         = new SpinBox('temp_hist', {'name':'temp_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var loadvolt_hist     = new SpinBox('loadvolt_hist', {'name':'loadvolt_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var test_time         = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});