From 36304e1fd0f277e909de91882ac74f79c0ec2d93 Mon Sep 17 00:00:00 2001
From: nikzori <kzr.niki@gmail.com>
Date: Wed, 19 Mar 2025 15:27:37 +0300
Subject: [PATCH] fixed port buffer offset and count not being set to 0

---
 Datasheet.cs |  9 +++++++++
 Modbus.cs    | 11 +++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Datasheet.cs b/Datasheet.cs
index 7b69de3..b8d64a0 100644
--- a/Datasheet.cs
+++ b/Datasheet.cs
@@ -207,6 +207,7 @@ namespace Gidrolock_Modbus_Scanner
                     }
                 }
 
+                Console.WriteLine("Polling for radio status");
                 res = await PollEntry(device.radioStatus);
                 if (res)
                 {
@@ -242,6 +243,7 @@ namespace Gidrolock_Modbus_Scanner
             catch (Exception err) { MessageBox.Show(err.Message); }
         }
 
+        //Опрос всех записей
         async Task<bool> PollEntry(Entry entry)
         {
             bool res = false;
@@ -266,6 +268,7 @@ namespace Gidrolock_Modbus_Scanner
             return res;
         }
 
+        // Задать новый Slave ID для устройства
         private async void buttonSetID_Click(object sender, EventArgs e)
         {
             byte newID = (byte)nudModbusID.Value; // should prevent assigning wrong ID if UpDown is fiddled with in the middle of request 
@@ -286,6 +289,7 @@ namespace Gidrolock_Modbus_Scanner
                 modbusID = newID;
         }
 
+        // Кран
         private async void buttonValve_Click(object sender, EventArgs e)
         {
             ushort value = isValveClosed ? (ushort)0 : (ushort)0xFF00;
@@ -310,6 +314,7 @@ namespace Gidrolock_Modbus_Scanner
             }
         }
 
+        // Авария
         private async void buttonAlarm_Click(object sender, EventArgs e)
         {
             ushort value = alarmStatus ? (ushort)0 : (ushort)0xFF00;
@@ -334,6 +339,7 @@ namespace Gidrolock_Modbus_Scanner
             }
         }
 
+        // Режим уборки
         private async void buttonCleaning_Click(object sender, EventArgs e)
         {
             ushort value = cleaningStatus ? (ushort)0 : (ushort)0xFF00;
@@ -358,6 +364,7 @@ namespace Gidrolock_Modbus_Scanner
             }
         }
 
+        // Задать скорость передачи данных для устройства
         private async void buttonSetSpeed_Click(object sender, EventArgs e)
         {
             try
@@ -392,6 +399,7 @@ namespace Gidrolock_Modbus_Scanner
             catch (Exception ex) { MessageBox.Show(ex.Message); }
         }
 
+        // Выбор файла прошивки
         private void BrowseFirmware_Click(object sender, EventArgs e)
         {
             try
@@ -407,6 +415,7 @@ namespace Gidrolock_Modbus_Scanner
             firmwarePathLabel.Invoke(new MethodInvoker(delegate { firmwarePathLabel.Text = firmwarePath; }));
         }
 
+        // Запись прошивки
         private async void WriteFirmware_Click(object sender, EventArgs e)
         {
             if (firmwarePath is null || firmwarePath.Length == 0)
diff --git a/Modbus.cs b/Modbus.cs
index e7d6952..ebc8044 100644
--- a/Modbus.cs
+++ b/Modbus.cs
@@ -270,25 +270,28 @@ namespace Gidrolock_Modbus_Scanner
         */
 
         static Stopwatch stopwatch = new Stopwatch();
+
         static byte[] buffer = new byte[255];
         static int offset = 0;
         static int count = 0;
         static void PortDataReceived(object sender, EventArgs e)
-        {          
+        {
+            
             try
             {
                 stopwatch.Restart();
-                while (stopwatch.ElapsedMilliseconds < 10)
+                while (stopwatch.ElapsedMilliseconds < 20)
                 {
                     if (port.BytesToRead > 0)
                     {
                         stopwatch.Restart();
-                        count = offset;
+                        count = port.BytesToRead;
                         port.Read(buffer, offset, port.BytesToRead);
                         offset += count;
                     }
                 }
                 // assume that the message ended
+                offset = 0;
                 List <byte> message = new List <byte>();
                 int endOfMessage = buffer.Length - 1;
                 for (int i = buffer.Length-1; i >= 0; i--)
@@ -337,8 +340,8 @@ namespace Gidrolock_Modbus_Scanner
             {
                 MessageBox.Show(err.Message, "Modbus message reception error");
             }
+
             port.DiscardInBuffer();
-            
         }
 
     }