node-red-contrib-symi-modbus 2.5.2 → 2.5.3

package/examples/basic-flow.json

@@ -0,0 +1,198 @@
+[
+    {
+        "id": "modbus_master_1",
+        "type": "modbus-master",
+        "name": "Modbus主站",
+        "connectionType": "tcp",
+        "tcpHost": "127.0.0.1",
+        "tcpPort": "502",
+        "serialPort": "COM1",
+        "serialBaudRate": "9600",
+        "serialDataBits": "8",
+        "serialStopBits": "1",
+        "serialParity": "none",
+        "slaveStartAddress": "10",
+        "slaveCount": "1",
+        "coilStart": "0",
+        "coilEnd": "31",
+        "pollInterval": "100",
+        "enableMqtt": false,
+        "mqttBroker": "mqtt://localhost:1883",
+        "mqttUsername": "",
+        "mqttPassword": "",
+        "mqttBaseTopic": "modbus/relay",
+        "x": 320,
+        "y": 140,
+        "wires": [["debug_1"]]
+    },
+    {
+        "id": "debug_1",
+        "type": "debug",
+        "name": "轮询输出",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "x": 520,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "inject_start",
+        "type": "inject",
+        "name": "启动轮询",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": true,
+        "onceDelay": "1",
+        "topic": "",
+        "payload": "{\"cmd\":\"start\"}",
+        "payloadType": "json",
+        "x": 130,
+        "y": 100,
+        "wires": [["modbus_master_1"]]
+    },
+    {
+        "id": "inject_stop",
+        "type": "inject",
+        "name": "停止轮询",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": "0.1",
+        "topic": "",
+        "payload": "{\"cmd\":\"stop\"}",
+        "payloadType": "json",
+        "x": 130,
+        "y": 140,
+        "wires": [["modbus_master_1"]]
+    },
+    {
+        "id": "inject_write_coil",
+        "type": "inject",
+        "name": "打开线圈0",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": "0.1",
+        "topic": "",
+        "payload": "{\"cmd\":\"writeCoil\",\"slave\":10,\"coil\":0,\"value\":true}",
+        "payloadType": "json",
+        "x": 130,
+        "y": 180,
+        "wires": [["modbus_master_1"]]
+    },
+    {
+        "id": "inject_write_coil_off",
+        "type": "inject",
+        "name": "关闭线圈0",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": "0.1",
+        "topic": "",
+        "payload": "{\"cmd\":\"writeCoil\",\"slave\":10,\"coil\":0,\"value\":false}",
+        "payloadType": "json",
+        "x": 130,
+        "y": 220,
+        "wires": [["modbus_master_1"]]
+    },
+    {
+        "id": "switch_node_1",
+        "type": "modbus-slave-switch",
+        "name": "面板1按键1",
+        "connectionType": "shared",
+        "masterNode": "modbus_master_1",
+        "rs485Config": "",
+        "switchId": "1",
+        "buttonNumber": "1",
+        "targetSlaveAddress": "10",
+        "targetCoilNumber": "0",
+        "enableMqtt": false,
+        "mqttBroker": "",
+        "mqttUsername": "",
+        "mqttPassword": "",
+        "mqttBaseTopic": "homeassistant",
+        "haDeviceName": "面板1按键1",
+        "x": 320,
+        "y": 300,
+        "wires": [["debug_2"]]
+    },
+    {
+        "id": "debug_2",
+        "type": "debug",
+        "name": "开关状态",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "x": 520,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "inject_switch_on",
+        "type": "inject",
+        "name": "开关ON",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": "0.1",
+        "topic": "",
+        "payload": "true",
+        "payloadType": "bool",
+        "x": 130,
+        "y": 280,
+        "wires": [["switch_node_1"]]
+    },
+    {
+        "id": "inject_switch_off",
+        "type": "inject",
+        "name": "开关OFF",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": "0.1",
+        "topic": "",
+        "payload": "false",
+        "payloadType": "bool",
+        "x": 130,
+        "y": 320,
+        "wires": [["switch_node_1"]]
+    }
+]
+

package/nodes/modbus-master.html

@@ -4,16 +4,7 @@
         color: '#3FADB5',
         defaults: {
             name: {value: "Modbus主站"},
-            connectionType: {value: "tcp"},
-            // TCP配置
-            tcpHost: {value: "127.0.0.1"},
-            tcpPort: {value: 502},
-            // 串口配置
-            serialPort: {value: "COM1"},
-            serialBaudRate: {value: 9600},
-            serialDataBits: {value: 8},
-            serialStopBits: {value: 1},
-            serialParity: {value: "none"},
+            modbusServer: {value: "", type: "modbus-server-config"},
             // 从站配置列表（数组）
             slaves: {value: [{
                 address: 10,
@@ -22,7 +13,7 @@
                 pollInterval: 200
             }]},
             // MQTT配置（引用config节点）
-            enableMqtt: {value: false},
+            enableMqtt: {value: true},
             mqttServer: {value: "", type: "mqtt-server-config"}
         },
         inputs: 1,
@@ -44,6 +35,8 @@
                 }];
             }
             
+            // 移除旧的连接类型切换逻辑（现在使用服务器配置节点）
+            
             // 渲染从站列表
             function renderSlaveList() {
                 var container = $("#slave-list-container");
@@ -172,21 +165,6 @@
             // 初始化渲染
             renderSlaveList();
             
-            // 切换连接类型时显示/隐藏相关配置
-            $("#node-input-connectionType").on("change", function() {
-                var connType = $(this).val();
-                if (connType === "tcp") {
-                    $(".form-row-tcp").show();
-                    $(".form-row-serial").hide();
-                } else {
-                    $(".form-row-tcp").hide();
-                    $(".form-row-serial").show();
-                }
-            });
-            
-            // 初始化显示
-            $("#node-input-connectionType").trigger("change");
-            
             // MQTT开关
             $("#node-input-enableMqtt").on("change", function() {
                 if ($(this).is(":checked")) {
@@ -198,67 +176,6 @@
             
             // 初始化MQTT显示
             $("#node-input-enableMqtt").trigger("change");
-            
-            // 搜索串口按钮
-            $("#btn-search-ports-master").on("click", function() {
-                var btn = $(this);
-                var inputBox = $("#node-input-serialPort");
-                var selectBox = $("#port-list-master");
-                
-                btn.prop("disabled", true).html('<i class="fa fa-spinner fa-spin"></i> 搜索中');
-                
-                $.ajax({
-                    url: 'modbus-master/serialports',
-                    type: 'GET',
-                    success: function(ports) {
-                        selectBox.empty().append('<option value="">-- 选择检测到的串口 --</option>');
-                        
-                        if (ports.length === 0) {
-                            selectBox.append('<option disabled>未找到可用串口</option>');
-                            RED.notify("未找到可用串口，请手动输入串口路径", "warning");
-                        } else if (ports.length === 1 && ports[0].isError) {
-                            // 显示错误提示
-                            selectBox.append('<option disabled>' + ports[0].comName + '</option>');
-                            selectBox.append('<option disabled style="font-size:11px;">' + ports[0].manufacturer + '</option>');
-                            RED.notify(ports[0].manufacturer, "warning");
-                        } else {
-                            var hasValidPort = false;
-                            ports.forEach(function(port) {
-                                if (!port.isError) {
-                                    var label = port.comName;
-                                    if (port.manufacturer && port.manufacturer !== '未知设备') {
-                                        label += ' - ' + port.manufacturer;
-                                    }
-                                    selectBox.append('<option value="' + port.comName + '">' + label + '</option>');
-                                    hasValidPort = true;
-                                }
-                            });
-                            if (hasValidPort) {
-                                // 显示下拉框，隐藏输入框
-                                inputBox.hide();
-                                selectBox.show();
-                            } else {
-                                RED.notify("未检测到可用串口，请手动输入", "warning");
-                            }
-                        }
-                        
-                        btn.prop("disabled", false).html('<i class="fa fa-search"></i> 搜索');
-                    },
-                    error: function() {
-                        RED.notify("搜索串口失败。如运行在Docker容器，需要映射USB设备", "error");
-                        btn.prop("disabled", false).html('<i class="fa fa-search"></i> 搜索');
-                    }
-                });
-            });
-            
-            // 选择串口（下拉选择）
-            $("#port-list-master").on("change", function() {
-                var selectedPort = $(this).val();
-                if (selectedPort) {
-                    $("#node-input-serialPort").val(selectedPort).show();
-                    $(this).hide();
-                }
-            });
         },
         oneditsave: function() {
             // 保存从站配置到节点
@@ -274,99 +191,10 @@
         <input type="text" id="node-input-name" placeholder="Modbus主站">
     </div>
     
-    <!-- 连接配置区域 -->
-    <hr style="margin: 15px 0; border: 0; border-top: 2px solid #e0e0e0;">
-    <div class="form-row">
-        <label style="width: 100%; margin-bottom: 8px;">
-            <i class="fa fa-plug" style="color: #2196f3;"></i> 
-            <span style="font-size: 14px; font-weight: 600; color: #333;">连接配置</span>
-        </label>
-    </div>
-    
+    <!-- Modbus服务器配置 -->
     <div class="form-row">
-        <label for="node-input-connectionType" style="width: 110px;"><i class="fa fa-exchange"></i> 连接类型</label>
-        <select id="node-input-connectionType" style="width: calc(70% - 110px);">
-            <option value="tcp">TCP/IP</option>
-            <option value="serial">串口</option>
-        </select>
-    </div>
-    
-    <!-- TCP配置 -->
-    <div class="form-row form-row-tcp">
-        <label for="node-input-tcpHost" style="width: 110px;"><i class="fa fa-server"></i> TCP主机</label>
-        <input type="text" id="node-input-tcpHost" placeholder="192.168.1.100" style="width: calc(70% - 110px);">
-        <div style="font-size: 11px; color: #888; margin-left: 110px; margin-top: 3px;">
-            Modbus TCP服务器IP地址
-        </div>
-    </div>
-    
-    <div class="form-row form-row-tcp">
-        <label for="node-input-tcpPort" style="width: 110px;"><i class="fa fa-plug"></i> TCP端口</label>
-        <input type="number" id="node-input-tcpPort" placeholder="502" style="width: 100px;">
-        <span style="margin-left: 10px; font-size: 12px; color: #666;">默认 502</span>
-    </div>
-    
-    <!-- 串口配置 -->
-    <div class="form-row form-row-serial">
-        <label for="node-input-serialPort" style="width: 110px;"><i class="fa fa-terminal"></i> 串口</label>
-        <div style="display: inline-block; width: calc(70% - 110px);">
-            <div style="display: flex; gap: 5px; align-items: center;">
-                <input type="text" id="node-input-serialPort" placeholder="COM1, /dev/ttyUSB0, /dev/cu.usbserial-xxx" style="flex: 1; padding: 5px 8px; border: 1px solid #ccc; border-radius: 4px; font-size: 13px;">
-                <select id="port-list-master" style="flex: 1; padding: 5px; font-family: monospace; font-size: 12px; border: 1px solid #ccc; border-radius: 4px; display: none;">
-                    <option value="">-- 选择检测到的串口 --</option>
-                </select>
-                <button type="button" id="btn-search-ports-master" style="padding: 6px 12px; background: #2196f3; color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 12px; white-space: nowrap; transition: background 0.3s;">
-                    <i class="fa fa-search"></i> 搜索
-                </button>
-            </div>
-            <div style="font-size: 11px; color: #555; padding: 8px 10px; background: linear-gradient(135deg, #e8f5e9 0%, #f1f8e9 100%); border-left: 4px solid #4caf50; border-radius: 4px; margin-top: 6px; box-shadow: 0 1px 3px rgba(0,0,0,0.08); line-height: 1.5;">
-                <strong style="color: #2e7d32;">💡 串口说明：</strong><br>
-                <span style="color: #555; font-size: 11px;">
-                • <strong>Windows</strong>: COM1, COM2, COM3...<br>
-                • <strong>Linux</strong>: /dev/ttyUSB0, /dev/ttyS0, /dev/ttyAMA0<br>
-                • <strong>macOS</strong>: <span style="background: #fff3cd; padding: 1px 4px; border-radius: 2px; font-weight: 600;">/dev/cu.*</span> (例如 /dev/cu.usbserial-xxx, /dev/cu.wchusbserial*)<br>
-                • <strong>HassOS</strong>: 插件配置添加设备映射即可<br>
-                • <strong>Docker</strong>: 需映射设备 <code style="background: #c8e6c9; padding: 2px 6px; border-radius: 3px; font-size: 10px;">--device=/dev/ttyUSB0</code> 或 <code style="background: #c8e6c9; padding: 2px 6px; border-radius: 3px; font-size: 10px;">--privileged</code>
-                </span>
-            </div>
-        </div>
-    </div>
-    
-    <div class="form-row form-row-serial">
-        <label for="node-input-serialBaudRate" style="width: 110px;"><i class="fa fa-tachometer"></i> 波特率</label>
-        <select id="node-input-serialBaudRate" style="width: 150px;">
-            <option value="9600">9600</option>
-            <option value="19200">19200</option>
-            <option value="38400">38400</option>
-            <option value="57600">57600</option>
-            <option value="115200">115200</option>
-        </select>
-        <span style="margin-left: 10px; font-size: 11px; color: #888;">8-N-1固定配置</span>
-    </div>
-    
-    <div class="form-row form-row-serial" style="display: none;">
-        <label for="node-input-serialDataBits" style="width: 110px;"><i class="fa fa-database"></i> 数据位</label>
-        <select id="node-input-serialDataBits" style="width: 100px;">
-            <option value="7">7</option>
-            <option value="8" selected>8</option>
-        </select>
-    </div>
-    
-    <div class="form-row form-row-serial" style="display: none;">
-        <label for="node-input-serialStopBits" style="width: 110px;"><i class="fa fa-stop"></i> 停止位</label>
-        <select id="node-input-serialStopBits" style="width: 100px;">
-            <option value="1" selected>1</option>
-            <option value="2">2</option>
-        </select>
-    </div>
-    
-    <div class="form-row form-row-serial" style="display: none;">
-        <label for="node-input-serialParity" style="width: 110px;"><i class="fa fa-check"></i> 校验位</label>
-        <select id="node-input-serialParity" style="width: 100px;">
-            <option value="none" selected>无</option>
-            <option value="even">偶校验</option>
-            <option value="odd">奇校验</option>
-        </select>
+        <label for="node-input-modbusServer"><i class="fa fa-server"></i> Modbus服务器</label>
+        <input type="text" id="node-input-modbusServer" placeholder="选择或添加Modbus服务器">
     </div>
     
     <!-- 从站配置 -->
@@ -377,7 +205,7 @@
             <span style="font-size: 14px; font-weight: 600; color: #333;">从站设备配置</span>
         </label>
         <div style="font-size: 11px; color: #555; padding: 10px 12px; background: linear-gradient(135deg, #e3f2fd 0%, #f0f7ff 100%); border-left: 4px solid #2196f3; border-radius: 4px; margin-bottom: 12px; box-shadow: 0 1px 3px rgba(0,0,0,0.08);">
-            <strong>配置说明：</strong>最多添加10台设备，地址从10开始递增（10=0x0A, 11=0x0B...），推荐轮询间隔≥200ms
+            <strong>配置说明：</strong>最多添加10台设备，地址从10开始递增（10=0x0A, 11=0x0B...），推荐轮询间隔≥1000ms
         </div>
         <div id="slave-list-container" style="width: 100%; margin-top: 10px;">
             <!-- 从站列表将在这里动态生成 -->
@@ -406,12 +234,12 @@
         <label for="node-input-mqttServer" style="width: 110px;"><i class="fa fa-server"></i> MQTT服务器</label>
         <input type="text" id="node-input-mqttServer" placeholder="选择或添加MQTT服务器配置" style="width: calc(70% - 110px);">
         <div style="font-size: 11px; color: #555; padding: 10px 12px; background: linear-gradient(135deg, #fff3cd 0%, #fff8e1 100%); border-left: 4px solid #ff9800; border-radius: 4px; margin-left: 110px; margin-top: 8px; box-shadow: 0 1px 3px rgba(0,0,0,0.08); line-height: 1.6;">
-            <strong style="color: #e65100; font-size: 11px;">🔧 MQTT配置说明：</strong><br>
+            <strong style="color: #e65100; font-size: 11px;">MQTT配置说明：</strong><br>
             <span style="color: #666; font-size: 11px;">
-            • <strong>HassOS</strong>：直接填 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">127.0.0.1:1883</code> 即可（无需任何额外设置）<br>
-            • <strong>局域网IP</strong>：直接填具体IP，如 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">192.168.1.100:1883</code><br>
-            • <strong>本机</strong>：填 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">localhost:1883</code> 或 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">127.0.0.1:1883</code><br>
-            • 支持智能fallback，配置错误也能自动尝试其他地址
+            HassOS：直接填 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">127.0.0.1:1883</code> 即可<br>
+            局域网IP：直接填具体IP，如 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">192.168.1.100:1883</code><br>
+            本机：填 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">localhost:1883</code> 或 <code style="background: #ffe0b2; padding: 2px 6px; border-radius: 3px; font-size: 10px;">127.0.0.1:1883</code><br>
+            支持智能fallback，配置错误也能自动尝试其他地址
             </span>
         </div>
     </div>