diff --git a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide index f81afa1..961cabc 100644 Binary files a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide and b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide differ diff --git a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm new file mode 100644 index 0000000..a6165f5 Binary files /dev/null and b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm differ diff --git a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal new file mode 100644 index 0000000..6dc6b82 Binary files /dev/null and b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal differ diff --git a/SCADA/Program/BatchCoreService/ProjectInstaller.Designer.cs b/SCADA/Program/BatchCoreService/ProjectInstaller.Designer.cs index eb821b3..6fee665 100644 --- a/SCADA/Program/BatchCoreService/ProjectInstaller.Designer.cs +++ b/SCADA/Program/BatchCoreService/ProjectInstaller.Designer.cs @@ -42,7 +42,7 @@ this.serviceInstaller1.Description = "数据服务"; this.serviceInstaller1.ServiceName = "BatchCoreService"; this.serviceInstaller1.ServicesDependedOn = new string[] { - "MSSQL$SQLEXPRESS"}; + "HaoSQL2008"}; this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic; // // ProjectInstaller diff --git a/SCADA/Program/BatchCoreService/ProjectInstaller.resx b/SCADA/Program/BatchCoreService/ProjectInstaller.resx index 235f1b0..ee77145 100644 --- a/SCADA/Program/BatchCoreService/ProjectInstaller.resx +++ b/SCADA/Program/BatchCoreService/ProjectInstaller.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 56 + 17, 55 196, 17 diff --git a/SCADA/Program/DataService/PLCGroup.cs b/SCADA/Program/DataService/PLCGroup.cs index 67c3ea5..cda6f21 100644 --- a/SCADA/Program/DataService/PLCGroup.cs +++ b/SCADA/Program/DataService/PLCGroup.cs @@ -191,7 +191,7 @@ namespace DataService } } _items.TrimExcess(); - _items.Sort(); + _items.Sort((x, y) => x.Address.CompareTo(y.Address)); UpdatePDUArea(); return true; } @@ -210,7 +210,7 @@ namespace DataService } } _items.TrimExcess(); - _items.Sort(); + _items.Sort((x, y) => x.Address.CompareTo(y.Address)); UpdatePDUArea(); return true; } diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs index 86f807e..c60e6ca 100644 --- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs @@ -408,10 +408,10 @@ namespace ModbusDriver dv.DBNumber = Modbus.fctReadCoil; int st; int.TryParse(address, out st); + st--; dv.Bit = (byte)(st % 16); st /= 16; dv.Start = st; - dv.Bit--; } break; case '1': @@ -419,10 +419,10 @@ namespace ModbusDriver dv.DBNumber = Modbus.fctReadDiscreteInputs; int st; int.TryParse(address.Substring(1), out st); + st--; dv.Bit = (byte)(st % 16); st /= 16; dv.Start = st; - dv.Bit--; } break; case '4': diff --git a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs index e6564cd..22bfec6 100644 --- a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs @@ -46,11 +46,11 @@ namespace ModbusDriver dv.DBNumber = Modbus.fctReadCoil; int st; int.TryParse(address, out st); + st--; //dv.Start = (st / 16) * 16;//??????????????????? dv.Bit = (byte)(st % 16); st /= 16; dv.Start = st; - dv.Bit--; } break; case '1': @@ -58,11 +58,11 @@ namespace ModbusDriver dv.DBNumber = Modbus.fctReadDiscreteInputs; int st; int.TryParse(address.Substring(1), out st); + st--; //dv.Start = (st / 16) * 16;//??????????????????? dv.Bit = (byte)(st % 16); st /= 16; dv.Start = st; - dv.Bit--; } break; case '4':