nikzori/gidrolock-configurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixed and optimized port data processing

Browse Source
This commit is contained in:
nikzori
2025-03-27 12:57:40 +03:00
parent 3a3fd60a00
commit 3d4a97b4e9
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gidrolock Modbus Configurator.csproj
View File

@@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{47A399D3-30C1-4EF4-9E94-F3518919A59C}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>Gidrolock_Modbus_Configurator</RootNamespace>
<RootNamespace>Gidrolock_Modbus_Scanner</RootNamespace>
<AssemblyName>Gidrolock Modbus Configurator</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>

45
Modbus.cs
View File

@@ -14,7 +14,7 @@ namespace Gidrolock_Modbus_Scanner
public static class Modbus
{
public static SerialPort port = new SerialPort();
public static event EventHandler<ModbusResponseEventArgs> ResponseReceived = delegate { };
public static void Init()
@@ -276,38 +276,34 @@ namespace Gidrolock_Modbus_Scanner
static int count = 0;
static void PortDataReceived(object sender, EventArgs e)
{
//reset values on every event call;
buffer = new byte[255];
offset = 0;
try
{
//reset values on every event call;
buffer = new byte[255];
offset = 0;
try
stopwatch.Restart();
while (stopwatch.ElapsedMilliseconds < 20)
{
stopwatch.Restart();
while (stopwatch.ElapsedMilliseconds < 20)
if (port.BytesToRead > 0)
{
if (port.BytesToRead > 0)
{
stopwatch.Restart();
count = port.BytesToRead;
port.Read(buffer, offset, port.BytesToRead);
offset += count;
}
stopwatch.Restart();
count = port.BytesToRead;
port.Read(buffer, offset, port.BytesToRead);
offset += count;
}
// assume that the message ended
}
// assume that the message ended
List<byte> message = new List<byte>();
for (int i = 0; i < offset; i++)
{
message.Add(buffer[i]);
}
if (message.Count == 0)
return;
List<byte> message = new List<byte>();
for (int i = 0; i < offset; i++)
{
message.Add(buffer[i]);
}
if (message.Count == 0)
return;
Console.WriteLine("Incoming message: " + ByteArrayToString(message.ToArray(), false));
Console.WriteLine("Incoming message: " + ByteArrayToString(message.ToArray(), false));
/*
if (!CheckResponse(message.ToArray()))
{
@@ -342,7 +338,6 @@ namespace Gidrolock_Modbus_Scanner
}
}
public class ModbusResponseEventArgs : EventArgs
{
public byte[] Message { get; set; }
@@ -362,7 +357,7 @@ namespace Gidrolock_Modbus_Scanner
}
//Console.WriteLine("Read data: " + Modbus.ByteArrayToString(Data, false));
}
else Data = new byte[1] {0x0F};
else Data = new byte[1] { 0x0F };
}
}

4
Properties/Resources.Designer.cs generated
View File

@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Gidrolock_Modbus_Configurator.Properties {
namespace Gidrolock_Modbus_Scanner.Properties {
using System;
@@ -39,7 +39,7 @@ namespace Gidrolock_Modbus_Configurator.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gidrolock_Modbus_Configurator.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gidrolock_Modbus_Scanner.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

2
Properties/Settings.Designer.cs generated
View File

@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Gidrolock_Modbus_Configurator.Properties {
namespace Gidrolock_Modbus_Scanner.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]