2020-06-016

wxr

2020-06-16 f6fd8acd7c53c44187e70b4709443318a628f4b5

 HDL_ON/DriverLayer/Control_Bus.cs

@@ -319,14 +319,14 @@
                    //case Command.Remote3thACK:
                    //    receiveFlag = string.Format("{0},", (int)command);
                    //    break;
                    //case Command.ReadDeviceLoopInfoACK:
                    //    if (usefulBytes[0] == 1)
                    //    {
                    //        receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[2]); ;
                    //    }
                    //    else
                    //        receiveFlag += string.Format("{0},{1},{2}", usefulBytes[0], usefulBytes[1], usefulBytes[2]);
                    //    break;
                    case Command.ReadDeviceLoopInfoACK:
                        if (usefulBytes[0] == 1)
                        {
                            receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[2]); ;
                        }
                        else
                            receiveFlag += string.Format("{0},{1},{2}", usefulBytes[0], usefulBytes[1], usefulBytes[2]);
                        break;
                    //case Command.SetDeviceLoopInfoACK:
                    //case Command.InfraredControlACK:
                    //case Command.SetSecurityByPassACK:
@@ -677,12 +677,12 @@
                //case Command.Remote3th:
                //    this.SendFlag = string.Format("{0},", (int)target.Command + 1);
                //    break;
                //case Command.ReadDeviceLoopInfo:
                //    if (target.AddData[0] == 1)//特殊处理灯光类，DMX模块每一个回路不固定小类，根据具体设置来回复
                //        this.sendFlag += string.Format("{0},{1}", target.AddData[0], target.AddData[2]);
                //    else
                //        this.sendFlag += string.Format("{0},{1},{2}", target.AddData[0], target.AddData[1], target.AddData[2]);
                //    break;
                case Command.ReadDeviceLoopInfo:
                    if (target.AddData[0] == 1)//特殊处理灯光类，DMX模块每一个回路不固定小类，根据具体设置来回复
                        this.sendFlag += string.Format("{0},{1}", target.AddData[0], target.AddData[2]);
                    else
                        this.sendFlag += string.Format("{0},{1},{2}", target.AddData[0], target.AddData[1], target.AddData[2]);
                    break;
                //case Command.SetDeviceLoopInfo:
                //case Command.InfraredControl:
                //case Command.SetSecurityByPass: