chnge mainfoult_out to mainvolt_in

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

@@ -862,8 +862,8 @@ function settingsGET(){
     fillTempRange('temp_high', 40, 80);
     fillTempRange('temp_low', -40, 0);
     fillTempRange('loadvolt_high', 60, 120);
-    fillTempRange('mainvolt_low', 110, 200);
-    fillTempRange('mainvolt_high', 220, 250);
+    fillTempRange('mainvolt_in_low', 110, 200);
+    fillTempRange('mainvolt_in_high', 220, 250);
     $('temp_high').value = data.temp_high;
     $('temp_low').value = data.temp_low;
     ups_cell_min = new SpinBox('ups_cell_min', {
@@ -895,10 +895,10 @@ function settingsGET(){
     loadvolt_hist = new SpinBox('loadvolt_hist', {
       'name':'loadvolt_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': data.loadvolt_hist
     });
-    $('mainvolt_low').value = data.mainvolt_low;
-    $('mainvolt_high').value = data.mainvolt_high;
-    mainvolt_hist = new SpinBox('mainvolt_hist', {
-      'name':'mainvolt_hist','minimum':10,'maximum':30,'step':1, 'value': data.mainvolt_hist
+    $('mainvolt_in_low').value = data.mainvolt_in_low;
+    $('mainvolt_in_high').value = data.mainvolt_in_high;
+    mainvolt_in_hist = new SpinBox('mainvolt_in_hist', {
+      'name':'mainvolt_in_hist','minimum':10,'maximum':30,'step':1, 'value': data.mainvolt_in_hist
     });
     // RADIUS params
     $('rs_server').value    = data.rs_server;

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

@@ -27,9 +27,9 @@ JSON = {
   "ups_max_power":2,
   "loadvolt_high": 65,
   "loadvolt_hist": 0.5,
-  "mainvolt_low": 112,
-  "mainvolt_high": 120,
-  "mainvolt_hist": 12,
+  "mainvolt_in_low": 112,
+  "mainvolt_in_high": 120,
+  "mainvolt_in_hist": 12,
   "tempcomp_k_buf":3,
   "tempcomp_k_cycle":4,
   "batsym":False,

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

@@ -147,11 +147,10 @@
             <td>
               <select name="ro1" id="ro1" class="form-control">
                 <option value="1">Наличие сети</option>
-                <option value="2">Авария вх. напряжения</option>
-                <option value="3">Авария АКБ</option>
-                <option value="4">Разряд АКБ</option>
-                <option value="5">Отключение АКБ</option>
-                <option value="6">SNMP SET</option>
+                <option value="2">Авария АКБ</option>
+                <option value="3">Разряд АКБ</option>
+                <option value="4">Отключение АКБ</option>
+                <option value="5">SNMP SET</option>
               </select>
             </td>
           </tr>
@@ -160,11 +159,10 @@
             <td>
               <select name="ro2" id="ro2" class="form-control">
                 <option value="1">Наличие сети</option>
-                <option value="2">Авария вх. напряжения</option>
-                <option value="3">Авария АКБ</option>
-                <option value="4">Разряд АКБ</option>
-                <option value="5">Отключение АКБ</option>
-                <option value="6">SNMP SET</option>
+                <option value="2">Авария АКБ</option>
+                <option value="3">Разряд АКБ</option>
+                <option value="4">Отключение АКБ</option>
+                <option value="5">SNMP SET</option>
               </select>
             </td>
           </tr>
@@ -267,23 +265,23 @@
       </div>
     </div>
     <div class="col span_1_of_2">
-      <h4 class="col span_2_of_2">Выходное напряжение (В)</h4>
+      <h4 class="col span_2_of_2">Входное напряжение (В)</h4>
       <div class="col span_1_of_3">
-        <label for="mainvolt_low" class="col span_2_of_2">Нижняя граница</label>
+        <label for="mainvolt_in_low" class="col span_2_of_2">Нижняя граница</label>
         <div class="col span_2_of_2">
-          <select  class="form-control" name="mainvolt_low" id="mainvolt_low"></select>
+          <select  class="form-control" name="mainvolt_in_low" id="mainvolt_in_low"></select>
         </div>
       </div>
       <div class="col span_1_of_3">
-      <label for="mainvolt_high" class="col span_2_of_2">Верхняя граница</label>
+      <label for="mainvolt_in_high" class="col span_2_of_2">Верхняя граница</label>
       <div class="col span_2_of_2">
-        <select  class="form-control" name="mainvolt_high" id="mainvolt_high"></select>
+        <select  class="form-control" name="mainvolt_in_high" id="mainvolt_in_high"></select>
       </div>
       </div>
       <div class="col span_1_of_3">
-        <label for="mainvolt_hist" class="col span_2_of_2">Гистерезис</label>
+        <label for="mainvolt_in_hist" class="col span_2_of_2">Гистерезис</label>
         <div class="col span_2_of_2">
-          <span id="mainvolt_hist"></span>
+          <span id="mainvolt_in_hist"></span>
         </div>
       </div>
     </div>
@@ -480,7 +478,7 @@ var ups_cell_max      = new SpinBox('ups_cell_max', {'name':'ups_cell_max','mini
 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 mainvolt_hist     = new SpinBox('mainvolt_hist', {'name':'mainvolt_hist','minimum':10,'maximum':30,'step':1});
+var mainvolt_in_hist  = new SpinBox('mainvolt_in_hist', {'name':'mainvolt_in_hist','minimum':10,'maximum':30,'step':1});
 var test_time         = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});
 settingsGET();
 // $('dev-update').onclick = function(){