v5.0.0

locale/ru.json

@@ -10,9 +10,9 @@
     "bo64":"Порядок байтов для 8-байтовых значений",
     "unitid":"Unit ID (адрес устройства на шине)",
     "desc":"Тип устройства",
-    "address":"Адрес регистра в таблице (dec or hex)",
+    "address":"Адрес регистра (dec or hex)",
     "vartype":"Тип переменной",
-    "fcr":"Функции Modbus",
+    "fcr":"Функция Modbus",
     "offset":"Смещение",
     "gr":"Группировать при чтении",
     "usek":"Преобразование значения",

modbus.ih

@@ -2,5 +2,5 @@
     "id":"modbus",
     "description":"Modbus Master plugin for IH",
     "cross":true,
-	"version":"0.0.19"
+	"version":"5.0.0"
 }

v5/channelform.json

@@ -0,0 +1,191 @@
+{
+  "grid": [
+    { "id": "p2", "xs": 4, "class": "main", "table": "devhard" },
+    { "id": "p3", "xs": 8, "class": "main", "table": "devhard" },
+
+    { "id": "p9", "xs": 12, "class": "main", "table": "onechannelrtTable" }
+  ],
+  "spacing": 4,
+
+  "p2": [
+    { "prop": "chan", "title": "$Channel", "type": "input" },
+    {
+      "prop": "unitid",
+      "title": "$unitid",
+      "type": "input",
+      "default": 1
+    },
+
+    {
+      "prop": "address",
+      "title": "$address",
+      "type": "input",
+      "default": "0x0000"
+    },
+
+    {
+      "prop": "vartype",
+      "title": "$vartype",
+      "type": "droplist",
+      "data": [
+        {
+          "id": "bool",
+          "title": "BOOL"
+        },
+
+        {
+          "id": "int8",
+          "title": "INT8, 1 байт"
+        },
+
+        {
+          "id": "uint8",
+          "title": "UINT8, 1 байт"
+        },
+
+        {
+          "id": "int16",
+          "title": "INT16, 2 байта"
+        },
+
+        {
+          "id": "uint16",
+          "title": "UINT16, 2 байта"
+        },
+
+        {
+          "id": "int32",
+          "title": "INT32, 4 байта"
+        },
+
+        {
+          "id": "uint32",
+          "title": "UINT32, 4 байта"
+        },
+
+        {
+          "id": "int64",
+          "title": "INT64, 8 байт"
+        },
+
+        {
+          "id": "uint64",
+          "title": "UINT64, 8 байт"
+        },
+
+        {
+          "id": "float",
+          "title": "FLOAT, 4 байта"
+        },
+
+        {
+          "id": "double",
+          "title": "DOUBLE, 8 байт"
+        }
+      ],
+
+      "default": "int16"
+    },
+    {
+      "prop": "usek",
+      "title": "$usek",
+      "type": "cb",
+      "default": 0,
+      "hide": "data.p2.vartype.id == 'bool'"
+    },
+    {
+      "prop": "ks0",
+      "title": "$ks0",
+      "type": "input",
+      "hide": "!data.p2.usek || data.p2.vartype.id == 'bool'"
+    },
+    {
+      "prop": "ks",
+      "title": "$ks",
+      "type": "input",
+      "hide": "!data.p2.usek || data.p2.vartype.id == 'bool'"
+    },
+    {
+      "prop": "kh0",
+      "title": "$kh0",
+      "type": "input",
+      "hide": "!data.p2.usek || data.p2.vartype.id == 'bool'"
+    },
+    {
+      "prop": "kh",
+      "title": "$kh",
+      "type": "input",
+      "hide": "!data.p2.usek || data.p2.vartype.id == 'bool'"
+    }
+  ],
+  "p3": [
+    { "prop": "r", "title": "$Read", "type": "cb" },
+    {
+      "prop": "fcr",
+      "title": "$fcr",
+      "type": "droplist",
+      "hide": "!data.p3.r",
+      "data": [
+        {
+          "id": "1",
+          "title": "FC1 - Read Coil"
+        },
+
+        {
+          "id": "2",
+          "title": "FC2 - Read Discrete Input"
+        },
+        {
+          "id": "3",
+          "title": "FC3 - Read Holding Register"
+        },
+        {
+          "id": "4",
+          "title": "FC4 - Read Input Register"
+        }
+      ],
+
+      "default": "3"
+    },
+    { "prop": "inv", "title": "$Devhard_Inv", "type": "cb", "hide": "!data.p3.r || data.p2.vartype.id != 'bool'" },
+    { "prop": "calc", "title": "$Devhard_Calc", "type": "input", "hide": "!data.p3.r || data.p3.inv" },
+
+    {
+      "prop": "gr",
+      "title": "$gr",
+      "type": "cb",
+      "hide": "!data.p3.r",
+      "default": 1
+    },
+
+    { "prop": "w", "title": "$Write", "type": "cb" },
+
+    { "prop": "inv_out", "title": "$Devhard_Out", "type": "cb", "hide": "!data.p3.w || data.p2.vartype.id != 'bool'" },
+    { "prop": "calc_out", "title": "$Devhard_Calc_Out", "type": "input", "hide": "!data.p3.w || data.p3.inv_out" },
+    {
+      "prop": "writeButton",
+      "title": "$doWrite",
+      "type": "button",
+      "command": "writetochannel",
+      "param": "write",
+      "hide": "!data.p3.w"
+    },
+    {
+      "prop": "show_fcw_fc5",
+      "title": " FC5 - Write Single Coil",
+      "type": "header",
+      "hide": "!data.p3.w || data.p2.vartype.id != 'bool'"
+    },
+    {
+      "prop": "show_fcw_fc6",
+      "title": " FC6 - Write Single Register",
+      "type": "header",
+      "hide": "!data.p3.w || data.p2.vartype.id == 'bool'"
+    }
+  ],
+
+  "p9": [
+    { "prop": "realtime_chan_str", "title": "Канал", "type": "text" },
+    { "prop": "realtime_dev_str", "title": "Устройство", "type": "text" }
+  ]
+}

v5/formPluginChannelsTable.json

@@ -0,0 +1,35 @@
+{
+  "grid": [
+    { "id": "p1", "xs": 12, "class": "main", "table":"unitchannelsTable", "height":"fill" }
+  ],
+  "spacing": 10,
+  "breadcrumbs": { "tree": "plugins" },
+
+  "p1": [
+    { "prop": "header", "title": "Каналы", "type": "header", "size":"h6"  },
+    {
+      "title": "Channels",
+      "type": "table",
+      "prop": "unitchannelsTable",
+      "popupenable":false,
+      "columns": [
+
+        { "prop": "chan", "title": "Канал",  "type": "link", "command":"forward",  "width": 150 },
+        { "prop": "unitid","title": "Unit ID","type": "input", "width": 64},
+        { "prop": "address","title": "$address","type": "input", "width": 120},
+        { "prop": "vartype", "title": "$vartype",  "type": "text", "width": 100 },
+        { "prop": "r", "title": "$Read",  "type": "cb", "width": 64 },
+        { "prop": "fcr", "title": "$fcr",  "type": "text", "width": 64 },
+        { "prop": "gr", "title": "$gr",  "type": "cb", "width": 64, "hide":"!data.r"  },
+        { "prop": "w", "title": "$Write",  "type": "cb", "width": 64 },
+        { "prop": "did", "title": "$Device",  "type": "link", "command":"forward", "width": 200  },
+        { "prop": "prop", "title": "$DeviceProperty", "type": "text",  "width": 100 },
+        { "prop": "realtime_chan_val", "title": "Канал: значение", "type": "text",  "width": 64 },
+        { "prop": "realtime_chan_ts", "title": "Канал: время", "type": "text",  "width": 150 },
+        { "prop": "realtime_dev_val", "title": "Устройство: значение", "type": "text",  "width": 64 },
+        { "prop": "realtime_dev_ts", "title": "Устройство: время", "type": "text",  "width": 150 },
+        { "prop": "realtime_dev_err", "title": "Устройство: ошибка", "type": "text",  "width": 150 }
+      ]
+    }
+  ]
+}