Added state/type selection of I/O

web_interface/src/wui/main.js

@@ -769,8 +769,11 @@ function settingsGET(){
     $('managerIP4').value = data.managerIP4;
     $('managerIP5').value = data.managerIP5;
     $('di1').value = +data.di1;
+    $('di1ns').value = data.di1ns;
     $('ro1').value = +data.ro1;
+    $('ro1t').value = data.ro1t;
     $('ro2').value = +data.ro2;
+    $('ro2t').value = data.ro2t;
     // Network params
     $('ipaddr').value   = data.ipaddr;
     $('gw').value       = data.gw;
@@ -782,7 +785,7 @@ function settingsGET(){
     $('rs_pwd').value       = data.rs_pwd;
     $('rs_key').value       = data.rs_key;
     $('rs_enabled').checked = data.rs_enabled;
-    $('swauth').checked       = data.swauth;
+    $('swauth').checked     = data.swauth;
     // DateTime
     if (data.ntpservip != $('ntpservip').options[0].value &&
         data.ntpservip != $('ntpservip').options[1].value &&

web_interface/src/wui/settings.cgi

@@ -20,8 +20,11 @@ JSON = {
   "tempcomp_k_cycle":4,
   "batsym":False,
   "di1":2,
+  "di1ns":1,
   "ro1":1,
+  "ro1t":1,
   "ro2":3,
+  "ro2t":0,
   "rs_enabled":1,
   "rs_server":"127.0.0.1",
   "rs_port":"1227",

web_interface/src/wui/settings.html

@@ -103,12 +103,19 @@
         <thead>
           <tr>
             <th>Контакт</th>
+            <th>Норм. состояние</th>
             <th>Действие</th>
           </tr>
         </thead>
         <tbody>
           <tr>
             <td>1</td>
+            <td>
+              <select name="di1ns" id="di1ns" class="form-control">
+                <option value="0">Разомкнут</option>
+                <option value="1">Замкнут</option>
+              </select>
+            </td>
             <td>
               <select name="di1" id="di1" class="form-control">
                 <option value="1">Вкл ИБП</option>
@@ -125,12 +132,19 @@
         <thead>
           <tr>
             <th>Контакт</th>
+            <th>Тип</th>
             <th>Источник</th>
           </tr>
         </thead>
         <tbody>
           <tr>
             <td>1</td>
+            <td>
+              <select name="ro1t" id="ro1t" class="form-control">
+                <option value="0">NC</option>
+                <option value="1">NO</option>
+              </select>
+            </td>
             <td>
               <select name="ro1" id="ro1" class="form-control">
                 <option value="1">Критическая авария</option>
@@ -141,6 +155,12 @@
           </tr>
           <tr>
             <td>2</td>
+            <td>
+              <select name="ro2t" id="ro2t" class="form-control">
+                <option value="0">NC</option>
+                <option value="1">NO</option>
+              </select>
+            </td>
             <td>
               <select name="ro2" id="ro2" class="form-control">
                 <option value="1">Критическая авария</option>