node-red-contrib-symi-modbus 2.6.8 → 2.6.9

package/examples/basic-flow.json

@@ -1,26 +1,38 @@
 [
+    {
+        "id": "modbus_server_config_1",
+        "type": "modbus-server-config",
+        "name": "Modbus服务器（TCP）",
+        "connectionType": "tcp",
+        "tcpHost": "192.168.1.100",
+        "tcpPort": "502"
+    },
+    {
+        "id": "serial_port_config_1",
+        "type": "serial-port-config",
+        "name": "RS-485串口",
+        "connectionType": "serial",
+        "serialPort": "/dev/ttyUSB0",
+        "baudRate": "9600",
+        "dataBits": "8",
+        "parity": "none",
+        "stopBits": "1"
+    },
     {
         "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",
+        "serverConfig": "modbus_server_config_1",
+        "slaves": [
+            {
+                "address": 10,
+                "coilStart": 0,
+                "coilEnd": 31,
+                "pollInterval": 300
+            }
+        ],
         "enableMqtt": false,
-        "mqttBroker": "mqtt://localhost:1883",
-        "mqttUsername": "",
-        "mqttPassword": "",
-        "mqttBaseTopic": "modbus/relay",
+        "mqttConfig": "",
         "x": 320,
         "y": 140,
         "wires": [["debug_1"]]
@@ -123,14 +135,14 @@
         "id": "switch_node_1",
         "type": "modbus-slave-switch",
         "name": "面板1按键1（开关模式）",
-        "serialPortConfig": "",
+        "serialPortConfig": "serial_port_config_1",
         "mqttServer": "",
         "switchBrand": "symi",
         "buttonType": "switch",
         "switchId": "1",
         "buttonNumber": "1",
         "targetSlaveAddress": "10",
-        "targetCoilNumber": "1",
+        "targetCoilNumber": "0",
         "x": 340,
         "y": 300,
         "wires": [["debug_2"]]
@@ -193,14 +205,14 @@
         "id": "switch_node_2",
         "type": "modbus-slave-switch",
         "name": "面板1按键2（场景模式）",
-        "serialPortConfig": "",
+        "serialPortConfig": "serial_port_config_1",
         "mqttServer": "",
         "switchBrand": "symi",
         "buttonType": "scene",
         "switchId": "1",
         "buttonNumber": "2",
         "targetSlaveAddress": "10",
-        "targetCoilNumber": "2",
+        "targetCoilNumber": "1",
         "x": 340,
         "y": 360,
         "wires": [["debug_3"]]

package/nodes/custom-protocol.html

@@ -0,0 +1,276 @@
+<script type="text/javascript">
+    RED.nodes.registerType('custom-protocol', {
+        category: 'SYMI-MODBUS',
+        color: '#FF9800',
+        defaults: {
+            name: {value: "自定义协议"},
+            deviceType: {value: "switch", required: true},
+            serialConfig: {value: "", type: "serial-port-config", required: true},
+            openCmd: {value: ""},
+            closeCmd: {value: ""},
+            pauseCmd: {value: ""}
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-code",
+        label: function() {
+            var typeNames = {
+                'switch': '开关',
+                'curtain': '窗帘',
+                'other': '其他'
+            };
+            var typeName = typeNames[this.deviceType] || '自定义';
+            return this.name || (typeName + "协议");
+        },
+        oneditprepare: function() {
+            var node = this;
+
+            // 设备类型切换
+            $("#node-input-deviceType").on("change", function() {
+                var deviceType = $(this).val();
+                if (deviceType === "curtain") {
+                    $("#pause-cmd-row").show();
+                } else {
+                    $("#pause-cmd-row").hide();
+                }
+            });
+
+            // 初始化显示
+            if (node.deviceType === "curtain") {
+                $("#pause-cmd-row").show();
+            } else {
+                $("#pause-cmd-row").hide();
+            }
+
+            // 16进制输入验证和格式化
+            function validateHexInput(input) {
+                var value = $(input).val().trim();
+                // 移除所有非16进制字符
+                value = value.replace(/[^0-9A-Fa-f\s]/g, '');
+                // 自动添加空格分隔
+                value = value.replace(/\s+/g, '').match(/.{1,2}/g);
+                if (value) {
+                    value = value.join(' ').toUpperCase();
+                    // 限制48字节
+                    var bytes = value.split(' ');
+                    if (bytes.length > 48) {
+                        bytes = bytes.slice(0, 48);
+                        value = bytes.join(' ');
+                        RED.notify('指令长度已限制为48字节', 'warning');
+                    }
+                } else {
+                    value = '';
+                }
+                $(input).val(value);
+                return value;
+            }
+
+            // 绑定输入验证
+            $("#node-input-openCmd, #node-input-closeCmd, #node-input-pauseCmd").on("blur", function() {
+                validateHexInput(this);
+            });
+
+            // 测试按钮功能
+            function sendTestCommand(hexString, cmdName) {
+                if (!hexString || hexString.trim() === '') {
+                    RED.notify('请先输入16进制指令', 'warning');
+                    return;
+                }
+
+                var serialConfig = $("#node-input-serialConfig").val();
+                if (!serialConfig) {
+                    RED.notify('请先选择串口配置', 'warning');
+                    return;
+                }
+
+                // 发送测试命令
+                $.ajax({
+                    url: '/custom-protocol/test',
+                    method: 'POST',
+                    contentType: 'application/json',
+                    data: JSON.stringify({
+                        serialConfig: serialConfig,
+                        hexString: hexString,
+                        cmdName: cmdName
+                    }),
+                    success: function(result) {
+                        if (result.success) {
+                            RED.notify(cmdName + '指令已发送: ' + hexString, 'success');
+                        } else {
+                            RED.notify('发送失败: ' + result.error, 'error');
+                        }
+                    },
+                    error: function(err) {
+                        RED.notify('发送失败: ' + err.statusText, 'error');
+                    }
+                });
+            }
+
+            // 绑定测试按钮
+            $("#btn-test-open").on("click", function() {
+                var hexString = validateHexInput("#node-input-openCmd");
+                sendTestCommand(hexString, '打开');
+            });
+
+            $("#btn-test-close").on("click", function() {
+                var hexString = validateHexInput("#node-input-closeCmd");
+                sendTestCommand(hexString, '关闭');
+            });
+
+            $("#btn-test-pause").on("click", function() {
+                var hexString = validateHexInput("#node-input-pauseCmd");
+                sendTestCommand(hexString, '暂停');
+            });
+        },
+        oneditsave: function() {
+            // 保存前验证和格式化
+            validateHexInput("#node-input-openCmd");
+            validateHexInput("#node-input-closeCmd");
+            if (this.deviceType === "curtain") {
+                validateHexInput("#node-input-pauseCmd");
+            }
+        }
+    });
+
+    // 辅助函数
+    function validateHexInput(selector) {
+        var input = $(selector);
+        var value = input.val().trim();
+        value = value.replace(/[^0-9A-Fa-f\s]/g, '');
+        value = value.replace(/\s+/g, '').match(/.{1,2}/g);
+        if (value) {
+            value = value.join(' ').toUpperCase();
+            var bytes = value.split(' ');
+            if (bytes.length > 48) {
+                bytes = bytes.slice(0, 48);
+                value = bytes.join(' ');
+            }
+        } else {
+            value = '';
+        }
+        input.val(value);
+        return value;
+    }
+</script>
+
+<script type="text/html" data-template-name="custom-protocol">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> 节点名称</label>
+        <input type="text" id="node-input-name" placeholder="自定义协议">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-deviceType"><i class="fa fa-cog"></i> 设备类型</label>
+        <select id="node-input-deviceType" style="width: 70%;">
+            <option value="switch">开关（打开/关闭）</option>
+            <option value="curtain">窗帘（打开/关闭/暂停循环）</option>
+            <option value="other">其他（打开/关闭）</option>
+        </select>
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-serialConfig"><i class="fa fa-plug"></i> 串口配置</label>
+        <input type="text" id="node-input-serialConfig" style="width: 70%;">
+    </div>
+
+    <div class="form-row">
+        <label style="width: 100%; font-weight: bold; margin-top: 15px; margin-bottom: 10px;">
+            <i class="fa fa-code"></i> 16进制指令配置（最多48字节）
+        </label>
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-openCmd"><i class="fa fa-arrow-up"></i> 打开指令</label>
+        <input type="text" id="node-input-openCmd" placeholder="例如: 01 05 00 00 FF 00 8C 3A" style="width: 50%;">
+        <button type="button" id="btn-test-open" class="red-ui-button" style="margin-left: 5px;">
+            <i class="fa fa-play"></i> 测试
+        </button>
+        <div style="font-size: 11px; color: #999; margin-top: 5px; margin-left: 105px;">
+            输入16进制码，空格分隔，自动格式化
+        </div>
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-closeCmd"><i class="fa fa-arrow-down"></i> 关闭指令</label>
+        <input type="text" id="node-input-closeCmd" placeholder="例如: 01 05 00 00 00 00 CD CA" style="width: 50%;">
+        <button type="button" id="btn-test-close" class="red-ui-button" style="margin-left: 5px;">
+            <i class="fa fa-play"></i> 测试
+        </button>
+    </div>
+
+    <div class="form-row" id="pause-cmd-row" style="display: none;">
+        <label for="node-input-pauseCmd"><i class="fa fa-pause"></i> 暂停指令</label>
+        <input type="text" id="node-input-pauseCmd" placeholder="例如: 01 05 00 01 FF 00 DD FA" style="width: 50%;">
+        <button type="button" id="btn-test-pause" class="red-ui-button" style="margin-left: 5px;">
+            <i class="fa fa-play"></i> 测试
+        </button>
+        <div style="font-size: 11px; color: #999; margin-top: 5px; margin-left: 105px;">
+            仅窗帘模式需要配置
+        </div>
+    </div>
+
+    <div class="form-row" style="margin-top: 20px;">
+        <div style="padding: 10px; background: #f0f8ff; border-left: 4px solid #2196F3; border-radius: 4px;">
+            <strong>使用说明：</strong><br>
+            <ul style="margin: 5px 0; padding-left: 20px; font-size: 12px;">
+                <li><strong>开关/其他模式</strong>: true发送打开指令，false发送关闭指令</li>
+                <li><strong>窗帘模式</strong>: true/false交替触发，循环发送打开→关闭→暂停→打开...</li>
+                <li>16进制码自动格式化为大写，空格分隔</li>
+                <li>点击"测试"按钮可直接发送到串口总线验证</li>
+                <li>配置自动持久化保存</li>
+            </ul>
+        </div>
+    </div>
+</script>
+
+<script type="text/html" data-help-name="custom-protocol">
+    <p>自定义协议节点，用于控制非标准Modbus协议的485设备。</p>
+    
+    <h3>功能特性</h3>
+    <ul>
+        <li>支持三种设备类型：开关、窗帘、其他</li>
+        <li>窗帘模式支持打开/关闭/暂停循环控制</li>
+        <li>16进制指令配置，最多48字节</li>
+        <li>配置界面可直接测试发送指令</li>
+        <li>配置持久化保存</li>
+    </ul>
+    
+    <h3>设备类型说明</h3>
+    <dl>
+        <dt>开关模式</dt>
+        <dd>接收true发送打开指令，接收false发送关闭指令</dd>
+        
+        <dt>窗帘模式</dt>
+        <dd>true/false交替触发，循环发送：打开→关闭→暂停→打开...</dd>
+        
+        <dt>其他模式</dt>
+        <dd>与开关模式相同，接收true/false发送对应指令</dd>
+    </dl>
+    
+    <h3>输入消息</h3>
+    <p>从从站开关节点接收：</p>
+    <pre>msg.payload = true/false</pre>
+    
+    <h3>输出消息</h3>
+    <p>输出Buffer格式的16进制数据，可连线到debug节点发送到串口：</p>
+    <pre>msg.payload = Buffer</pre>
+    
+    <h3>使用示例</h3>
+    <ol>
+        <li>配置串口节点</li>
+        <li>选择设备类型（开关/窗帘/其他）</li>
+        <li>输入16进制指令（空格分隔）</li>
+        <li>点击"测试"按钮验证指令是否正确</li>
+        <li>连线：从站开关 → 自定义协议 → debug节点</li>
+        <li>部署流程，触发从站开关即可发送自定义指令</li>
+    </ol>
+    
+    <h3>注意事项</h3>
+    <ul>
+        <li>16进制指令最多48字节</li>
+        <li>窗帘模式需要配置三个指令（打开、关闭、暂停）</li>
+        <li>测试功能需要先选择串口配置</li>
+        <li>输出需要连线到debug节点才能发送到串口</li>
+    </ul>
+</script>
+

package/nodes/custom-protocol.js

@@ -0,0 +1,240 @@
+module.exports = function(RED) {
+    "use strict";
+
+    function CustomProtocolNode(config) {
+        RED.nodes.createNode(this, config);
+        var node = this;
+
+        // 配置
+        node.config = {
+            name: config.name || "自定义协议",
+            deviceType: config.deviceType || "switch",
+            serialConfig: config.serialConfig,
+            openCmd: config.openCmd || "",
+            closeCmd: config.closeCmd || "",
+            pauseCmd: config.pauseCmd || ""
+        };
+
+        // 窗帘模式的状态索引（0=打开, 1=关闭, 2=暂停）
+        node.curtainStateIndex = 0;
+
+        // 获取串口配置节点
+        var serialNode = RED.nodes.getNode(node.config.serialConfig);
+        if (!serialNode) {
+            node.error('未找到串口配置节点');
+            node.status({fill: "red", shape: "ring", text: "未配置串口"});
+            return;
+        }
+
+        // 16进制字符串转Buffer
+        function hexStringToBuffer(hexString) {
+            if (!hexString || hexString.trim() === '') {
+                return null;
+            }
+            
+            try {
+                // 移除空格和非16进制字符
+                var hex = hexString.replace(/\s+/g, '').replace(/[^0-9A-Fa-f]/g, '');
+                
+                // 确保是偶数长度
+                if (hex.length % 2 !== 0) {
+                    node.warn('16进制字符串长度必须为偶数: ' + hexString);
+                    return null;
+                }
+                
+                // 限制48字节
+                if (hex.length > 96) {
+                    hex = hex.substring(0, 96);
+                    node.warn('指令长度超过48字节，已截断');
+                }
+                
+                // 转换为Buffer
+                var buffer = Buffer.from(hex, 'hex');
+                return buffer;
+            } catch (err) {
+                node.error('16进制字符串转换失败: ' + err.message);
+                return null;
+            }
+        }
+
+        // 发送指令到串口
+        function sendCommand(buffer, cmdName) {
+            if (!buffer) {
+                node.warn('指令为空，跳过发送');
+                return;
+            }
+
+            // 直接通过串口配置节点发送数据
+            if (!serialNode || !serialNode.connection) {
+                node.error('串口连接未建立');
+                node.status({fill: "red", shape: "ring", text: "连接未建立"});
+                return;
+            }
+
+            // 检查连接状态
+            var isConnected = false;
+            if (serialNode.connectionType === 'tcp') {
+                isConnected = serialNode.connection && !serialNode.connection.destroyed;
+            } else {
+                isConnected = serialNode.connection && serialNode.connection.isOpen;
+            }
+
+            if (!isConnected) {
+                node.error('串口/TCP连接未打开');
+                node.status({fill: "red", shape: "ring", text: "连接未打开"});
+                return;
+            }
+
+            // 使用串口配置节点的write方法（带队列机制）
+            serialNode.write(buffer, function(err) {
+                if (err) {
+                    node.error('发送失败: ' + err.message);
+                    node.status({fill: "red", shape: "ring", text: "发送失败"});
+                } else {
+                    node.log(cmdName + '指令已发送: ' + buffer.toString('hex').toUpperCase());
+                    node.status({fill: "green", shape: "dot", text: cmdName + " (" + buffer.length + "字节)"});
+
+                    // 3秒后清除状态
+                    setTimeout(function() {
+                        node.status({fill: "blue", shape: "ring", text: "就绪"});
+                    }, 3000);
+                }
+            });
+        }
+
+        // 处理输入消息
+        node.on('input', function(msg) {
+            var value = msg.payload;
+
+            // 只接受布尔值
+            if (typeof value !== 'boolean') {
+                node.warn('输入必须为true/false，当前类型: ' + typeof value);
+                return;
+            }
+
+            if (node.config.deviceType === 'curtain') {
+                // 窗帘模式：无论收到true还是false，都触发下一个指令
+                // 适配有状态开关（true/false交替）和无状态开关（只发true或false）
+                // 循环顺序：打开 → 暂停 → 关闭 → 暂停 → 打开...
+                var commands = [
+                    {name: '打开', hex: node.config.openCmd},
+                    {name: '暂停', hex: node.config.pauseCmd},
+                    {name: '关闭', hex: node.config.closeCmd},
+                    {name: '暂停', hex: node.config.pauseCmd}
+                ];
+
+                // 获取当前指令
+                var currentCmd = commands[node.curtainStateIndex];
+                if (!currentCmd || !currentCmd.hex) {
+                    node.warn('窗帘模式缺少' + currentCmd.name + '指令配置');
+                    return;
+                }
+
+                // 转换并发送
+                var buffer = hexStringToBuffer(currentCmd.hex);
+                if (buffer) {
+                    sendCommand(buffer, currentCmd.name);
+
+                    // 移动到下一个状态（无论收到true还是false）
+                    node.curtainStateIndex = (node.curtainStateIndex + 1) % 4;
+                }
+            } else {
+                // 开关/其他模式：true发送打开，false发送关闭
+                var cmdName = value ? '打开' : '关闭';
+                var hexString = value ? node.config.openCmd : node.config.closeCmd;
+
+                if (!hexString) {
+                    node.warn(cmdName + '指令未配置');
+                    return;
+                }
+
+                var buffer = hexStringToBuffer(hexString);
+                if (buffer) {
+                    sendCommand(buffer, cmdName);
+                }
+            }
+        });
+
+        // 初始状态
+        var typeNames = {
+            'switch': '开关',
+            'curtain': '窗帘',
+            'other': '其他'
+        };
+        var typeName = typeNames[node.config.deviceType] || '自定义';
+        node.status({fill: "blue", shape: "ring", text: typeName + "模式就绪"});
+
+        // 清理
+        node.on('close', function() {
+            node.status({});
+        });
+    }
+
+    RED.nodes.registerType("custom-protocol", CustomProtocolNode);
+
+    // HTTP API：测试发送指令
+    RED.httpAdmin.post('/custom-protocol/test', function(req, res) {
+        var serialConfigId = req.body.serialConfig;
+        var hexString = req.body.hexString;
+        var cmdName = req.body.cmdName;
+
+        if (!serialConfigId || !hexString) {
+            res.status(400).json({success: false, error: '参数错误'});
+            return;
+        }
+
+        // 获取串口配置节点
+        var serialNode = RED.nodes.getNode(serialConfigId);
+        if (!serialNode) {
+            res.status(404).json({success: false, error: '未找到串口配置节点'});
+            return;
+        }
+
+        try {
+            // 转换16进制字符串为Buffer
+            var hex = hexString.replace(/\s+/g, '').replace(/[^0-9A-Fa-f]/g, '');
+            if (hex.length % 2 !== 0) {
+                res.status(400).json({success: false, error: '16进制字符串长度必须为偶数'});
+                return;
+            }
+            if (hex.length > 96) {
+                hex = hex.substring(0, 96);
+            }
+            var buffer = Buffer.from(hex, 'hex');
+
+            // 检查连接状态
+            if (!serialNode.connection) {
+                res.status(503).json({success: false, error: '连接未建立'});
+                return;
+            }
+
+            var isConnected = false;
+            if (serialNode.connectionType === 'tcp') {
+                isConnected = !serialNode.connection.destroyed;
+            } else {
+                isConnected = serialNode.connection.isOpen;
+            }
+
+            if (!isConnected) {
+                res.status(503).json({success: false, error: '连接未打开'});
+                return;
+            }
+
+            // 使用串口配置节点的write方法（带队列机制）
+            serialNode.write(buffer, function(err) {
+                if (err) {
+                    res.json({success: false, error: err.message});
+                } else {
+                    res.json({
+                        success: true,
+                        message: cmdName + '指令已发送',
+                        bytes: buffer.length
+                    });
+                }
+            });
+        } catch (err) {
+            res.status(500).json({success: false, error: err.message});
+        }
+    });
+};
+