Browse Source

1.修正PLCGroup的items排序按照地址排序,避免当tagid的排序与地址排序不一致時数据解析的问题

2.modbus bool型地址解析问题
pull/22/head
Kevin 8 years ago
parent
commit
4a46a8b3fb
  1. BIN
      SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide
  2. BIN
      SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm
  3. BIN
      SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal
  4. 2
      SCADA/Program/BatchCoreService/ProjectInstaller.Designer.cs
  5. 2
      SCADA/Program/BatchCoreService/ProjectInstaller.resx
  6. 4
      SCADA/Program/DataService/PLCGroup.cs
  7. 4
      SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
  8. 4
      SCADA/Program/ModbusDriver/ModbusTCPDriver.cs

BIN
SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide

Binary file not shown.

BIN
SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm

Binary file not shown.

BIN
SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal

Binary file not shown.

2
SCADA/Program/BatchCoreService/ProjectInstaller.Designer.cs

@ -42,7 +42,7 @@
this.serviceInstaller1.Description = "数据服务"; this.serviceInstaller1.Description = "数据服务";
this.serviceInstaller1.ServiceName = "BatchCoreService"; this.serviceInstaller1.ServiceName = "BatchCoreService";
this.serviceInstaller1.ServicesDependedOn = new string[] { this.serviceInstaller1.ServicesDependedOn = new string[] {
"MSSQL$SQLEXPRESS"}; "HaoSQL2008"};
this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic; this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
// //
// ProjectInstaller // ProjectInstaller

2
SCADA/Program/BatchCoreService/ProjectInstaller.resx

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="serviceProcessInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="serviceProcessInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value> <value>17, 55</value>
</metadata> </metadata>
<metadata name="serviceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="serviceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>196, 17</value> <value>196, 17</value>

4
SCADA/Program/DataService/PLCGroup.cs

@ -191,7 +191,7 @@ namespace DataService
} }
} }
_items.TrimExcess(); _items.TrimExcess();
_items.Sort(); _items.Sort((x, y) => x.Address.CompareTo(y.Address));
UpdatePDUArea(); UpdatePDUArea();
return true; return true;
} }
@ -210,7 +210,7 @@ namespace DataService
} }
} }
_items.TrimExcess(); _items.TrimExcess();
_items.Sort(); _items.Sort((x, y) => x.Address.CompareTo(y.Address));
UpdatePDUArea(); UpdatePDUArea();
return true; return true;
} }

4
SCADA/Program/ModbusDriver/ModbusRTUDriver.cs

@ -408,10 +408,10 @@ namespace ModbusDriver
dv.DBNumber = Modbus.fctReadCoil; dv.DBNumber = Modbus.fctReadCoil;
int st; int st;
int.TryParse(address, out st); int.TryParse(address, out st);
st--;
dv.Bit = (byte)(st % 16); dv.Bit = (byte)(st % 16);
st /= 16; st /= 16;
dv.Start = st; dv.Start = st;
dv.Bit--;
} }
break; break;
case '1': case '1':
@ -419,10 +419,10 @@ namespace ModbusDriver
dv.DBNumber = Modbus.fctReadDiscreteInputs; dv.DBNumber = Modbus.fctReadDiscreteInputs;
int st; int st;
int.TryParse(address.Substring(1), out st); int.TryParse(address.Substring(1), out st);
st--;
dv.Bit = (byte)(st % 16); dv.Bit = (byte)(st % 16);
st /= 16; st /= 16;
dv.Start = st; dv.Start = st;
dv.Bit--;
} }
break; break;
case '4': case '4':

4
SCADA/Program/ModbusDriver/ModbusTCPDriver.cs

@ -46,11 +46,11 @@ namespace ModbusDriver
dv.DBNumber = Modbus.fctReadCoil; dv.DBNumber = Modbus.fctReadCoil;
int st; int st;
int.TryParse(address, out st); int.TryParse(address, out st);
st--;
//dv.Start = (st / 16) * 16;//??????????????????? //dv.Start = (st / 16) * 16;//???????????????????
dv.Bit = (byte)(st % 16); dv.Bit = (byte)(st % 16);
st /= 16; st /= 16;
dv.Start = st; dv.Start = st;
dv.Bit--;
} }
break; break;
case '1': case '1':
@ -58,11 +58,11 @@ namespace ModbusDriver
dv.DBNumber = Modbus.fctReadDiscreteInputs; dv.DBNumber = Modbus.fctReadDiscreteInputs;
int st; int st;
int.TryParse(address.Substring(1), out st); int.TryParse(address.Substring(1), out st);
st--;
//dv.Start = (st / 16) * 16;//??????????????????? //dv.Start = (st / 16) * 16;//???????????????????
dv.Bit = (byte)(st % 16); dv.Bit = (byte)(st % 16);
st /= 16; st /= 16;
dv.Start = st; dv.Start = st;
dv.Bit--;
} }
break; break;
case '4': case '4':

Loading…
Cancel
Save