node-red-contrib-symi-mesh 1.7.1 → 1.7.2

package/lib/device-manager.js

@@ -76,10 +76,41 @@ class DeviceInfo {
         this.lastSeen = Date.now();
         
         switch (attrType) {
+            case 0x01:
             case 0x02:
-                // TYPE_ON_OFF - 开关状态（仅用于开关、灯光、温控器）
-                // 窗帘(type=5)不使用0x02，忽略此消息避免误操作
-                if (this.deviceType !== 5) {
+            case 0x03:
+            case 0x04:
+                // 特殊协议：attrType直接表示风速值（无参数）
+                // 53 80 06 03 E3 01 01 35 - 高风(01)
+                // 53 80 06 03 E3 01 02 36 - 中风(02)  
+                // 53 80 06 03 E3 01 03 37 - 低风(03)
+                // 53 80 06 03 E3 01 04 30 - 自动(04)
+                if (this.deviceType === 10 && parameters.length === 0) {
+                    const oldFanMode = this.state.fanMode;
+                    this.state.fanMode = attrType;
+                    if (oldFanMode !== this.state.fanMode && this.manager) {
+                        this.manager.emit('device-state-changed', {
+                            device: this,
+                            state: { fanMode: this.state.fanMode, acFanSpeed: this.state.fanMode },
+                            attrType: 0x1C,
+                            parameters: [],
+                            subOpcode: 0x06,
+                            isUserControl: true,
+                            isSceneExecution: false
+                        });
+                    }
+                    return; // 已处理，直接返回
+                }
+                // 非温控器设备，继续处理其他逻辑
+                if (attrType === 0x03 && parameters.length > 0) {
+                    this.state.brightness = parameters[0];
+                    this.state.switch = parameters[0] > 0;
+                }
+                if (attrType === 0x04 && parameters.length > 0) {
+                    this.state.colorTemp = parameters[0];
+                }
+                // 0x02用于开关状态，如果是温控器且无参数已在上面处理为风速
+                if (attrType === 0x02 && parameters.length > 0 && this.deviceType !== 5) {
                     this.handleSwitchState(parameters);
                 }
                 break;
@@ -92,15 +123,6 @@ class DeviceInfo {
                     this.handleSwitchState(parameters);
                 }
                 break;
-            case 0x03:
-                if (parameters.length > 0) {
-                    this.state.brightness = parameters[0];
-                    this.state.switch = parameters[0] > 0;
-                }
-                break;
-            case 0x04:
-                if (parameters.length > 0) this.state.colorTemp = parameters[0];
-                break;
             case 0x05:
                 // CURT_RUN_STATUS - 窗帘运行状态
                 // 【兼容两种协议】：
@@ -109,6 +131,8 @@ class DeviceInfo {
                 // 通过status=0(仅米家)和status=3(仅小程序)来区分协议类型
                 if (parameters.length > 0) {
                     const status = parameters[0];
+                    const oldStatus = this.state.curtainStatus;
+                    const oldAction = this.state.curtainAction;
                     this.state.curtainStatus = status;
                     
                     // 检测协议类型：status=0只在米家出现，status=3只在小程序出现
@@ -133,6 +157,19 @@ class DeviceInfo {
                             this.state.curtainAction = 'closing';
                         }
                     }
+                    
+                    // 触发状态变化事件
+                    if ((oldStatus !== this.state.curtainStatus || oldAction !== this.state.curtainAction) && this.manager) {
+                        this.manager.emit('device-state-changed', {
+                            device: this,
+                            state: { curtainStatus: this.state.curtainStatus, curtainAction: this.state.curtainAction },
+                            attrType: attrType,
+                            parameters: parameters,
+                            subOpcode: 0x06,
+                            isUserControl: true,
+                            isSceneExecution: false
+                        });
+                    }
                 }
                 break;
             case 0x06:
@@ -202,12 +239,16 @@ class DeviceInfo {
                 if (parameters.length > 0) {
                     const oldFanMode = this.state.fanMode;
                     this.state.fanMode = parameters[0];
-                    // 触发状态变化事件
-                    if (oldFanMode !== this.state.fanMode) {
-                        this.emit('stateChange', {
+                    // 触发状态变化事件（通过DeviceManager）
+                    if (oldFanMode !== this.state.fanMode && this.manager) {
+                        this.manager.emit('device-state-changed', {
                             device: this,
-                            state: { fanMode: this.state.fanMode },
-                            attrType: attrType
+                            state: { fanMode: this.state.fanMode, acFanSpeed: this.state.fanMode },
+                            attrType: attrType,
+                            parameters: [],
+                            subOpcode: 0x06,
+                            isUserControl: true,
+                            isSceneExecution: false
                         });
                     }
                 }
@@ -399,40 +440,25 @@ class DeviceInfo {
         if (this.channels === 1) {
             // 单路开关
             const value = parameters[0];
-            console.log(`[DeviceManager] handleSwitchState: deviceType=${this.deviceType}, channels=${this.channels}, value=${value}, name=${this.name}`);
-            // 温控器设备：0x02消息可能是开关或风速
+            // 温控器设备：0x02消息的值含义
+            // 0x01=关, 0x02=开 (开关控制)
+            // 但某些协议中 1-4 表示风速（需要通过 attrType=0x1C 来区分）
+            // 这里只处理开关控制，风速控制由 0x1C 消息处理
             if (this.deviceType === 10) {
-                console.log(`[DeviceManager] 温控器设备，检查风速: value=${value}`);
-                // 如果值是1-4，是风速控制
-                if (value >= 1 && value <= 4) {
-                    const oldFanMode = this.state.fanMode;
-                    this.state.fanMode = value;
-                    console.log(`[DeviceManager] 风速变化: ${oldFanMode} -> ${this.state.fanMode}`);
-                    // 总是触发事件，即使值没变
-                    console.log(`[DeviceManager] 触发fanMode事件`);
-                    // 注意：这里不能直接emit，因为这是DeviceInfo实例，不是DeviceManager
-                    // 需要通过DeviceManager来触发事件
-                    if (this.manager) {
-                        this.manager.emit('device-state-changed', {
-                            device: this,
-                            state: { fanMode: this.state.fanMode },
-                            attrType: 0x1C
-                        });
-                    }
-                } else {
-                    // 否则是开关控制
-                    console.log(`[DeviceManager] 开关控制: value=${value}`);
-                    const oldSwitch = this.state.switch;
-                    this.state.switch = value === 0x02;
-                    // 触发开关状态变化事件
-                    if (oldSwitch !== this.state.switch && this.manager) {
-                        console.log(`[DeviceManager] 触发switch事件: ${oldSwitch} -> ${this.state.switch}`);
-                        this.manager.emit('device-state-changed', {
-                            device: this,
-                            state: { switch: this.state.switch },
-                            attrType: 0x02
-                        });
-                    }
+                // 温控器开关：0x01=关, 0x02=开
+                const oldSwitch = this.state.switch;
+                this.state.switch = value === 0x02;
+                // 触发开关状态变化事件
+                if (oldSwitch !== this.state.switch && this.manager) {
+                    this.manager.emit('device-state-changed', {
+                        device: this,
+                        state: { switch: this.state.switch, acSwitch: this.state.switch },
+                        attrType: 0x02,
+                        parameters: [],
+                        subOpcode: 0x06,
+                        isUserControl: true,
+                        isSceneExecution: false
+                    });
                 }
             } else {
                 this.state.switch = value === 0x02;
@@ -500,6 +526,25 @@ class DeviceInfo {
         // 存储变化的按键信息，供外部使用
         this.lastChangedButtons = changedButtons;
 
+        // 触发状态变化事件（多路开关）
+        // 注意：这个事件会被symi-gateway.js转发给symi-485-bridge.js
+        if (changedButtons.length > 0 && this.manager) {
+            const changedState = {};
+            for (const btn of changedButtons) {
+                changedState[`switch_${btn.button}`] = btn.newState;
+            }
+            // 使用与symi-gateway.js相同的事件格式
+            this.manager.emit('device-state-changed', {
+                device: this,
+                state: changedState,
+                attrType: 0x02,
+                parameters: [],
+                subOpcode: 0x06,
+                isUserControl: true,
+                isSceneExecution: false
+            });
+        }
+
         return changedButtons;
     }
 
@@ -584,7 +629,7 @@ class DeviceManager extends EventEmitter {
             const addrMap = this.context.get(`symi_addr_map_${this.gatewayId}`) || {};
             
             Object.entries(saved).forEach(([mac, data]) => {
-                const device = new DeviceInfo(data);
+                const device = new DeviceInfo(data, this);  // 传递manager引用
                 // 恢复三合一标记
                 if (data.isThreeInOne) {
                     device.isThreeInOne = true;

package/nodes/rs485-debug.html

@@ -11,7 +11,8 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: 'serial.svg',
+        icon: 'font-awesome/fa-bug',
+        align: 'left',
         paletteLabel: 'RS485调试',
         label: function() {
             return this.name || 'RS485调试';