Browse Source

fix bug

Fix a bug on timestamp in itag
master
Gavin 6 years ago
parent
commit
9ada3407da
  1. BIN
      SCADA/Program/.vs/DataExchange/v16/.suo
  2. 16
      SCADA/Program/DataService/ITag.cs
  3. BIN
      SCADA/dll/DataService.dll

BIN
SCADA/Program/.vs/DataExchange/v16/.suo

Binary file not shown.

16
SCADA/Program/DataService/ITag.cs

@ -211,7 +211,7 @@ namespace DataService
temp = Convert.ToBoolean(value); temp = Convert.ToBoolean(value);
else if (!Boolean.TryParse(str, out temp)) else if (!Boolean.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteBit(_plcAddress, temp); return _group.WriteBit(_plcAddress, temp);
} }
@ -280,7 +280,7 @@ namespace DataService
temp = Convert.ToByte(value); temp = Convert.ToByte(value);
else if (!Byte.TryParse(str, out temp)) else if (!Byte.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteBits(_plcAddress, temp); return _group.WriteBits(_plcAddress, temp);
} }
@ -349,7 +349,7 @@ namespace DataService
temp = Convert.ToInt16(value); temp = Convert.ToInt16(value);
else if (!short.TryParse(str, out temp)) else if (!short.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteInt16(_plcAddress, temp); return _group.WriteInt16(_plcAddress, temp);
} }
@ -418,7 +418,7 @@ namespace DataService
temp = Convert.ToUInt16(value); temp = Convert.ToUInt16(value);
else if (!ushort.TryParse(str, out temp)) else if (!ushort.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteUInt16(_plcAddress, temp); return _group.WriteUInt16(_plcAddress, temp);
} }
@ -486,7 +486,7 @@ namespace DataService
temp = Convert.ToInt32(value); temp = Convert.ToInt32(value);
else if (!int.TryParse(str, out temp)) else if (!int.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteInt32(_plcAddress, temp); return _group.WriteInt32(_plcAddress, temp);
} }
@ -554,7 +554,7 @@ namespace DataService
temp = Convert.ToUInt32(value); temp = Convert.ToUInt32(value);
else if (!uint.TryParse(str, out temp)) else if (!uint.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteUInt32(_plcAddress, temp); return _group.WriteUInt32(_plcAddress, temp);
} }
@ -623,7 +623,7 @@ namespace DataService
temp = Convert.ToSingle(value); temp = Convert.ToSingle(value);
else if (!float.TryParse(str, out temp)) else if (!float.TryParse(str, out temp))
return -1; return -1;
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteFloat(_plcAddress, temp); return _group.WriteFloat(_plcAddress, temp);
} }
@ -699,7 +699,7 @@ namespace DataService
{ {
if (value == null) return -1; if (value == null) return -1;
var str = (value is String) ? (String)value : value.ToString(); var str = (value is String) ? (String)value : value.ToString();
_timeStamp = DateTime.Now; //_timeStamp = DateTime.Now;
return _group.WriteString(_plcAddress, str); return _group.WriteString(_plcAddress, str);
} }

BIN
SCADA/dll/DataService.dll

Binary file not shown.
Loading…
Cancel
Save