IModbus and Modbus modification : Supports receiving telegrams from multiple devices.

This commit is contained in:
Milan Hanajik
2016-10-18 17:27:08 +02:00
parent b608fb77b9
commit 93e8328940
2 changed files with 56 additions and 29 deletions
@@ -1,12 +1,31 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.GenericDevices
{
public interface IModbus : IComponent
{
/// <summary>
/// Send an arbitrary modbus message.
/// When the message length is N, however only bytes 1..N-2 have to be set.
/// The last two message bytes (CRC) may be uninitialized or zero.
/// They are calculated inside this function as required by Modbus specification.
/// </summary>
/// <param name="message">Message incl CRC fields, CRC bytes dont have to be set</param>
void SendMessage(byte[] message);
/// <summary>
/// Send a structured modbus message.
/// </summary>
/// <param name="modbusAddress">Device address (1..255) or 0 = broadcast</param>
/// <param name="function">Function (0..127)</param>
/// <param name="dataAddress">Address of data to be transferred (0..65535)</param>
/// <param name="dataCount">Count of data bytes to be transferred (0..65535)</param>
void SendMessage(byte modbusAddress, byte function, ushort dataAddress, ushort dataCount);
Queue<byte[]>[] ReceivedTelegrams { get; }
}
}
@@ -1,14 +1,15 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO.Ports;
using System.Text;
using System.Threading;
using log4net;
using Config.Entities;
using log4net;
using TBF.BenchControl.Generic;
using TBF.Boxes;
@@ -26,8 +27,12 @@ namespace TBF.BenchControl.Modbus.Common
/// Private fields
SerialPort serialPort;
Thread workerThread;
bool stopWorkerThread;
public Queue<byte[]>[] ReceivedTelegrams
{
get { return receivedTelegrams; }
}
Queue<byte[]>[] receivedTelegrams;
public Modbus()
{
@@ -40,6 +45,12 @@ namespace TBF.BenchControl.Modbus.Common
public Modbus(Generic.IComponentCfg cfg)
: base(cfg)
{
receivedTelegrams = new Queue<byte[]>[256];
for (int i = 0; i < receivedTelegrams.Length; i++)
{
receivedTelegrams[i] = new Queue<byte[]>();
}
serialPort = null;
modbusCommonCfg = cfg as ModbusCfg;
log.Debug(this.ToString());
@@ -82,8 +93,11 @@ namespace TBF.BenchControl.Modbus.Common
if (modbusCommonCfg.DebugLevel == DebugMode.Simulate) return;
Telegram.UpdateTelegramCRC(message);
log.Debug(Telegram.LogTelegram("Sending message ", message));
serialPort.Write(message, 0, message.Length);
Debug.WriteLine(Telegram.LogTelegram("Sending message ", message));
log.Debug(Telegram.LogTelegram("Sending message ", message));
}
@@ -111,27 +125,10 @@ namespace TBF.BenchControl.Modbus.Common
};
Telegram.UpdateTelegramCRC(message);
log.Debug(Telegram.LogTelegram("Sending message ", message));
serialPort.Write(message, 0, message.Length);
}
void Worker()
{
while (!stopWorkerThread)
{
Thread.Sleep(250);
if (stopWorkerThread) break;
int nrBytes = serialPort.BytesToRead;
if (nrBytes > 0)
{
char[] buffer = new char[nrBytes];
serialPort.Read(buffer, 0, nrBytes);
string s = Telegram.LogTelegram("Received: ", new string(buffer));
/// ODO: Add handler
//OnQuidoReceived(this, new QuidoReceivedEventArgs(s));
}
}
Debug.WriteLine(Telegram.LogTelegram("Sending message ", message));
log.Debug(Telegram.LogTelegram("Sending message ", message));
}
@@ -141,11 +138,22 @@ namespace TBF.BenchControl.Modbus.Common
int nrBytes = serialPort.BytesToRead;
if (nrBytes > 0)
{
char[] buffer = new char[nrBytes];
byte[] buffer = new byte[nrBytes];
serialPort.Read(buffer, 0, nrBytes);
string s = Telegram.LogTelegram("Received: ", new string(buffer));
/// ODO: Add handler
//OnQuidoReceived(this, new QuidoReceivedEventArgs(s));
string s = Telegram.LogTelegram("Received: ", buffer);
Debug.WriteLine(s);
if (nrBytes >=3)
{
int deviceAddress = buffer[0];
int function = buffer[1];
int bytesCount = buffer[2];
if (nrBytes == bytesCount + 5 && Telegram.VerifyTelegramCRC(buffer))
{
receivedTelegrams[deviceAddress].Enqueue(buffer);
Debug.WriteLine("Valid telegram received: ReceivedTelegrams[{0}].Count = {1}", deviceAddress, receivedTelegrams[deviceAddress].Count);
}
}
}
}