Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

提交ShortCacheReader字节序问题以及ModbusRTU写命令功能 #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

提交ShortCacheReader字节序问题以及ModbusRTU写命令功能 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9779597
修改读取时的字节序
Apr 13, 2019
cca238e
提交ModbusRTU 写单个线圈和写多个寄存器的地址解析
Apr 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SCADA/Program/DataService/CacheReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public ItemData<int> ReadInt32(DeviceAddress address)
}
else
{
result = (_cache[startIndex + 1] << 16) | ((ushort)_cache[startIndex]);
result = (_cache[startIndex] << 16) | ((ushort)_cache[startIndex + 1]);
}
return new ItemData<int>(result, 0, QUALITIES.QUALITY_GOOD);
}
Expand Down
27 changes: 27 additions & 0 deletions SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,17 @@ public DeviceAddress GetDeviceAddress(string address)
dv.Bit--;
}
break;
case '5':
{
dv.DBNumber = Modbus.fctWriteSingleCoil;
int st;
int.TryParse(address.Substring(1), out st);
dv.Bit = (byte)(st % 16);
st /= 16;
dv.Start = st;
dv.Bit--;
}
break;
case '1':
{
dv.DBNumber = Modbus.fctReadDiscreteInputs;
Expand Down Expand Up @@ -457,6 +468,22 @@ public DeviceAddress GetDeviceAddress(string address)
dv.ByteOrder = ByteOrder.BigEndian;
}
break;
case 'F':
{
int index = address.IndexOf('.');
dv.DBNumber = Modbus.fctWriteMultipleRegister;
if (index > 0)
{
dv.Start = int.Parse(address.Substring(1, index - 1));
dv.Bit = byte.Parse(address.Substring(index + 1));
}
else
dv.Start = int.Parse(address.Substring(1));
dv.Start--;
dv.Bit--;
dv.ByteOrder = ByteOrder.BigEndian;
}
break;
}
return dv;
}
Expand Down