add input voltage alarm settings

web_interface/src/wui-11/main.js

@@ -879,6 +879,8 @@ function settingsGET(){
     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;
     temp_hist     = new SpinBox('temp_hist', {
@@ -893,6 +895,11 @@ function settingsGET(){
     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':5,'maximum':30,'step':1, 'value': data.mainvolt_in_hist
+    });
     // Whitelist
     $('wtl_ip1').value = data.wtl_ip1;
     $('wtl_ip2').value = data.wtl_ip2;
@@ -904,7 +911,7 @@ function settingsGET(){
     $('tn_port').value        = data.tn_port;
     // $('ssh_enabled').checked  = data.ssh_enabled;
     // $('ssh_port').value       = data.ssh_port;
-    $("bat_prod").value       = data.bat_prod;
+    // $("bat_prod").value       = data.bat_prod;
     ups_max_power = new SpinBox('ups_max_power', {
       'value': data.ups_max_power,
       'name':'ups_max_power',

web_interface/src/wui-11/settings.cgi

@@ -35,8 +35,11 @@ JSON = {
   "loadvolt_high": 65,
   "loadvolt_hist": 0.5,
   "mainvolt_low": 112,
-  "mainvolt_high": 120,
+  "mainvolt_high": 220,
   "mainvolt_hist": 12,
+  "mainvolt_in_low": 112,
+  "mainvolt_in_high": 225,
+  "mainvolt_in_hist": 12,
   "ups_cell_min": 1.5,
   "ups_cell_max": 2.3,
   "di1":1,

web_interface/src/wui-11/settings.html

@@ -20,10 +20,10 @@
         <option value="">Выберите пользователя</option>
         <option value="user">user</option>
         <option value="admin">admin</option>
-      </select><br><br>
-      <input id="oldpwd" type="password" class="form-control" placeholder="Текущий пароль" class="login" size="20" maxlength="10" name="oldpass" autocomplete="off"><br><br>
-      <input id="newpwd" type="password" class="form-control" placeholder="Новый пароль" class="login" size="20" maxlength="10" name="newpass" autocomplete="off"><br><br>
-      <input id="newpwdrepeat" type="password" class="form-control" placeholder="Повторить новый пароль" class="login" size="20" maxlength="10" name="newpassRepeat" autocomplete="off"><br><br>
+      </select><br>
+      <input id="oldpwd" type="password" class="form-control" placeholder="Текущий пароль" class="login" size="20" maxlength="10" name="oldpass" autocomplete="off"><br>
+      <input id="newpwd" type="password" class="form-control" placeholder="Новый пароль" class="login" size="20" maxlength="10" name="newpass" autocomplete="off"><br>
+      <input id="newpwdrepeat" type="password" class="form-control" placeholder="Повторить новый пароль" class="login" size="20" maxlength="10" name="newpassRepeat" autocomplete="off"><br>
       <input type="button" id="close-pass-change" class="btn btn-danger-inverted" value="Отмена">
       <input type="submit" class="btn btn-success-inverted" onclick="checkChangePWD(); return false;" value="Отправить">
     </form>
@@ -96,11 +96,11 @@
   <div class="panel-heading">Аккумуляторные батареи</div>
   <div class="panel-body section group">
     <div class="col span_1_of_2">
-      <label for="bat_prod" class="col span_1_of_2">Дата установки</label>
+<!--       <label for="bat_prod" class="col span_1_of_2">Дата установки</label>
       <div class="col span_1_of_2">
         <input type="date" class="form-control" id="bat_prod" name="bat_prod">
       </div>
-<!--       <label for="bat_exp" class="col span_1_of_2">Срок службы (лет)</label>
+      <label for="bat_exp" class="col span_1_of_2">Срок службы (лет)</label>
       <div class="col span_1_of_2">
         <span id="bat_exp"></span>
       </div> -->
@@ -245,6 +245,27 @@
         </div>
       </div>
     </div>
+    <div class="col span_1_of_2">
+      <h4 class="col span_2_of_2">Входное напряжение (В)</h4>
+      <div class="col span_1_of_3">
+        <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_in_low" id="mainvolt_in_low"></select>
+        </div>
+      </div>
+      <div class="col span_1_of_3">
+      <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_in_high" id="mainvolt_in_high"></select>
+      </div>
+      </div>
+      <div class="col span_1_of_3">
+        <label for="mainvolt_in_hist" class="col span_2_of_2">Гистерезис</label>
+        <div class="col span_2_of_2">
+          <span id="mainvolt_in_hist"></span>
+        </div>
+      </div>
+    </div>
     <div class="col span_1_of_2">
       <h4 class="col span_2_of_2">Выходное напряжение (В)</h4>
       <div class="col span_1_of_3">
@@ -409,16 +430,17 @@ DYN_WEB.Tabs.setup({
 });
 var ntpservipValue;
 
-var ups_max_power = new SpinBox('ups_max_power', {'name':'ups_max_power','minimum':400,'maximum':10000,'step':50});
-var ups_cell_min  = new SpinBox('ups_cell_min', {'name':'ups_cell_min','minimum':0,'maximum':3,'step':0.1});
-var ups_cell_max  = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum':0,'maximum':3,'step':0.1});
-// var bat_exp       = new SpinBox('bat_exp', {'name':'bat_exp','minimum':1,'maximum':10,'step':1});
-var bat_cap       = new SpinBox('bat_cap', {'name':'bat_cap','minimum':1,'maximum':200,'step':1});
-var bat_charge    = new SpinBox('bat_charge', {'name':'bat_charge','minimum':12,'maximum':240,'step':12});
-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 test_time     = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});
+var ups_max_power    = new SpinBox('ups_max_power', {'name':'ups_max_power','minimum':400,'maximum':10000,'step':50});
+var ups_cell_min     = new SpinBox('ups_cell_min', {'name':'ups_cell_min','minimum':0,'maximum':3,'step':0.1});
+var ups_cell_max     = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum':0,'maximum':3,'step':0.1});
+// var bat_exp          = new SpinBox('bat_exp', {'name':'bat_exp','minimum':1,'maximum':10,'step':1});
+var bat_cap          = new SpinBox('bat_cap', {'name':'bat_cap','minimum':1,'maximum':200,'step':1});
+var bat_charge       = new SpinBox('bat_charge', {'name':'bat_charge','minimum':12,'maximum':240,'step':12});
+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':5,'maximum':30,'step':1});
+var test_time        = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});
 
 settingsGET();
 // $('dev-update').onclick = function(){