rc1: fixed write timeouts

Datasheet.cs

@@ -18,7 +18,7 @@ namespace Gidrolock_Modbus_Scanner
         byte modbusID;
         Device device;
 
-        ModbusResponseEventArgs latestMessage;
+        public static ModbusResponseEventArgs latestMessage;
 
         SerialPort port = Modbus.port;
         bool isPolling = false;
@@ -34,9 +34,7 @@ namespace Gidrolock_Modbus_Scanner
         List<WirelessSensor> wirelessSensors;
         public static string firmwarePath;
 
-        static int timeout = 1000;
         Stopwatch stopwatch = new Stopwatch();
-
         Thread fileThread = new Thread((ThreadStart)delegate
         {
             OpenFileDialog ofd = new OpenFileDialog();
@@ -117,44 +115,49 @@ namespace Gidrolock_Modbus_Scanner
 
         private async void buttonPoll_Click(object sender, EventArgs e)
         {
+            if (isPolling)
+                return;
             // hardcoded for now, probably easier to keep it like this in the future
             try
             {
-                bool res = await PollEntry(device.firmware);
+                await Task.Run(() =>
+                {
+
+                    bool res = PollEntry(device.firmware);
                     Console.WriteLine("Polling for alarm status, poll success: " + res);
                     if (res)
                     {
-                    labelFirmware.Text = App.ByteArrayToUnicode(latestMessage.Data);
+                        this.Invoke(new MethodInvoker(delegate { labelFirmware.Text = App.ByteArrayToUnicode(latestMessage.Data); }));
                     }
 
                     if (device.hasBattery)
                     {
-                    res = await PollEntry(device.batteryCharge);
+                        res = PollEntry(device.batteryCharge);
                         if (res)
                         {
-                        labelBattery.Text = latestMessage.Data.Last().ToString();
+                            this.Invoke(new MethodInvoker(delegate { labelBattery.Text = latestMessage.Data.Last().ToString(); }));
                         }
                     }
 
-                res = await PollEntry(device.valveStatus);
+                    res = PollEntry(device.valveStatus);
                     Console.WriteLine("Polling for valve status, poll success: " + res);
                     if (res)
                     {
                         if (latestMessage.Data.Last() > 0)
                         {
                             isValveClosed = true;
-                        labelValve.Text = "Закрыт";
-                        buttonValve.Text = "Открыть";
+                            this.Invoke(new MethodInvoker(delegate { labelValve.Text = "Закрыт"; }));
+                            this.Invoke(new MethodInvoker(delegate { buttonValve.Text = "Открыть"; }));
                         }
                         else
                         {
                             isValveClosed = false;
-                        labelValve.Text = "Открыт";
-                        buttonValve.Text = "Закрыть";
+                            this.Invoke(new MethodInvoker(delegate { labelValve.Text = "Открыт"; }));
+                            this.Invoke(new MethodInvoker(delegate { buttonValve.Text = "Закрыть"; }));
                         }
                     }
 
-                res = await PollEntry(device.alarmStatus);
+                    res = PollEntry(device.alarmStatus);
                     Console.WriteLine("Polling for alarm status, poll success: " + res);
                     if (res)
                     {
@@ -163,38 +166,53 @@ namespace Gidrolock_Modbus_Scanner
                         if (latestMessage.Data.Last() > 0)
                         {
                             alarmStatus = true;
-                        buttonAlarm.Text = "Выключить";
-                        labelAlarm.Text = "Протечка!";
+                            this.Invoke(new MethodInvoker(delegate { buttonAlarm.Text = "Выключить"; }));
+                            this.Invoke(new MethodInvoker(delegate { labelAlarm.Text = "Протечка!"; }));
                         }
                         else
                         {
                             alarmStatus = false;
-                        buttonAlarm.Text = "Авария";
-                        labelAlarm.Text = "нет";
+                            this.Invoke(new MethodInvoker(delegate { buttonAlarm.Text = "Авария"; }));
+                            this.Invoke(new MethodInvoker(delegate { labelAlarm.Text = "нет"; }));
                         }
                     }
 
                     if (device.hasCleaningMode)
                     {
-                    res = await PollEntry(device.cleaningMode);
+                        res = PollEntry(device.cleaningMode);
                         if (res)
                         {
                             if (latestMessage.Data.Last() > 0)
                             {
                                 cleaningStatus = true;
-                            buttonCleaning.Text = "Выключить";
-                            labelCleaning.Text = "вкл";
+                                this.Invoke(new MethodInvoker(delegate { buttonCleaning.Text = "Выключить"; }));
+                                this.Invoke(new MethodInvoker(delegate { labelCleaning.Text = "вкл"; }));
                             }
                             else
                             {
                                 cleaningStatus = false;
-                            buttonCleaning.Text = "Включить";
-                            labelCleaning.Text = "выкл";
+                                this.Invoke(new MethodInvoker(delegate { buttonCleaning.Text = "Включить"; }));
+                                this.Invoke(new MethodInvoker(delegate { labelCleaning.Text = "выкл"; }));
                             }
                         }
                     }
 
-                res = await PollEntry(device.sensorAlarm);
+                    if (device.wiredLineBreak != null || device.wiredLineBreak.Count > 0)
+                    {
+                        for (int i = 0; i < device.wiredLineBreak.Count; i++)
+                        {
+                            res = PollEntry(device.wiredLineBreak[i]);
+                            if (res)
+                            {
+                                bool value = latestMessage.Data[0] > 0x00 ? true : false;
+                                WiredSensor snsr = sensorPanel.Controls[i] as WiredSensor;
+                                snsr.Invoke(new MethodInvoker(delegate { snsr.labelBreak.Text = value ? "Обрыв!" : "ОК"; }));
+
+                            }
+                        }
+                    }
+
+                    res = PollEntry(device.sensorAlarm);
                     if (res)
                     {
                         BitArray bArray = new BitArray(latestMessage.Data);
@@ -203,12 +221,12 @@ namespace Gidrolock_Modbus_Scanner
                         for (int i = 0; i < sensorPanel.Controls.Count; i++)
                         {
                             Sensor snsr = sensorPanel.Controls[i] as Sensor;
-                        snsr.labelLeak.Text = bools[i] ? "Протечка!" : "нет";
+                            snsr.Invoke(new MethodInvoker(delegate { snsr.labelLeak.Text = bools[i] ? "Протечка!" : "нет"; }));
                         }
                     }
 
                     Console.WriteLine("Polling for radio status");
-                res = await PollEntry(device.radioStatus);
+                    res = PollEntry(device.radioStatus);
                     if (res)
                     {
                         List<byte> values = new List<byte>(latestMessage.Data.Length / 2);
@@ -235,26 +253,27 @@ namespace Gidrolock_Modbus_Scanner
                                     txt = "потеря";
                                     break;
                             }
-                        snsr.labelStatus.Text = txt;
+                            snsr.Invoke(new MethodInvoker(delegate { snsr.labelStatus.Text = txt; }));
                         }
                     }
-
+                });
             }
             catch (Exception err) { MessageBox.Show(err.Message); }
         }
 
-        //Опрос всех записей
-        async Task<bool> PollEntry(Entry entry)
+        bool PollEntry(Entry entry)
         {
+            latestMessage = null;
             bool res = false;
             isAwaitingResponse = true;
-            Modbus.ReadRegAsync(modbusID, (FunctionCode)entry.registerType, entry.address, entry.length);
+            isPolling = true;
 
+            Modbus.ReadRegAsync(modbusID, (FunctionCode)entry.registerType, entry.address, entry.length);
             stopwatch.Restart();
 
-            while (isAwaitingResponse)
+            while (isAwaitingResponse && latestMessage == null)
             {
-                if (stopwatch.ElapsedMilliseconds > 1000)
+                if (stopwatch.ElapsedMilliseconds > 5000)
                 {
                     Console.WriteLine("Response timed out.");
                     break;
@@ -265,6 +284,34 @@ namespace Gidrolock_Modbus_Scanner
                 res = true;
 
             Console.WriteLine("Poll attempt finished");
+            isPolling = false;
+            return res;
+        }
+        bool SetEntry(Entry entry, ushort value)
+        {
+            latestMessage = null;
+            bool res = false;
+            isAwaitingResponse = true;
+            isPolling = true;
+            FunctionCode fc = FunctionCode.WriteCoil;
+            if (entry.registerType == RegisterType.Holding)
+                fc = FunctionCode.WriteRegister;
+
+            Modbus.WriteSingleAsync(fc, modbusID, entry.address, value);
+            stopwatch.Restart();
+
+            while (isAwaitingResponse && latestMessage == null)
+            {
+                if (stopwatch.ElapsedMilliseconds > port.ReadTimeout)
+                {
+                    Console.WriteLine("Response timed out.");
+                    break;
+                }   
+            }
+
+            if (latestMessage != null && latestMessage.Status == ModbusStatus.WriteSuccess)
+                res = true;
+            isPolling = false;
             return res;
         }
 
@@ -273,12 +320,13 @@ namespace Gidrolock_Modbus_Scanner
         {
             byte newID = (byte)nudModbusID.Value; // should prevent assigning wrong ID if UpDown is fiddled with in the middle of request 
             isAwaitingResponse = true;
+            latestMessage = null;
             Modbus.WriteSingleAsync(FunctionCode.WriteRegister, modbusID, 128, newID);
 
             stopwatch.Restart();
             while (isAwaitingResponse)
             {
-                if (stopwatch.ElapsedMilliseconds > 1000)
+                if (stopwatch.ElapsedMilliseconds > 10000)
                 {
                     Console.WriteLine("Response timed out.");
                     break;
@@ -291,47 +339,31 @@ namespace Gidrolock_Modbus_Scanner
 
         // Кран
         private async void buttonValve_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                await Task.Run(() =>
                 {
                     ushort value = isValveClosed ? (ushort)0 : (ushort)0xFF00;
-            isAwaitingResponse = true;
-            Modbus.WriteSingleAsync(FunctionCode.WriteCoil, modbusID, device.valveStatus.address, value);
-
-            stopwatch.Restart();
-            while (isAwaitingResponse)
-            {
-                if (stopwatch.ElapsedMilliseconds > 1000)
-                {
-                    Console.WriteLine("Response timed out.");
-                    break;
-                }
-            }
-
-            if (latestMessage != null && latestMessage.Status != ModbusStatus.Error)
+                    if (SetEntry(device.valveStatus, value))
                     {
                         isValveClosed = !isValveClosed;
-                labelValve.Text = isValveClosed ? "Закрыт" : "Открыт";
-                buttonValve.Text = isValveClosed ? "Открыть" : "Закрыть";
+                        labelValve.Invoke(new MethodInvoker(delegate { labelValve.Text = isValveClosed ? "Закрыт" : "Открыт"; }));
+                        buttonValve.Invoke(new MethodInvoker(delegate { buttonValve.Text = isValveClosed ? "Открыть" : "Закрыть"; }));
+                    }
+                });
+            }
+            catch (Exception err)
+            {
+                MessageBox.Show(err.Message, "Valve Set Error");
             }
         }
 
         // Авария
-        private async void buttonAlarm_Click(object sender, EventArgs e)
+        private void buttonAlarm_Click(object sender, EventArgs e)
         {
             ushort value = alarmStatus ? (ushort)0 : (ushort)0xFF00;
-            isAwaitingResponse = true;
-            Modbus.WriteSingleAsync(FunctionCode.WriteCoil, modbusID, device.alarmStatus.address, value);
-
-            stopwatch.Restart();
-            while (isAwaitingResponse)
-            {
-                if (stopwatch.ElapsedMilliseconds > 1000)
-                {
-                    Console.WriteLine("Response timed out.");
-                    break;
-                }
-            }
-
-            if (latestMessage != null && latestMessage.Status != ModbusStatus.Error)
+            if (SetEntry(device.alarmStatus, value))
             {
                 alarmStatus = !alarmStatus;
                 labelAlarm.Text = alarmStatus ? "Протечка!" : "Нет";
@@ -340,23 +372,10 @@ namespace Gidrolock_Modbus_Scanner
         }
 
         // Режим уборки
-        private async void buttonCleaning_Click(object sender, EventArgs e)
+        private void buttonCleaning_Click(object sender, EventArgs e)
         {
             ushort value = cleaningStatus ? (ushort)0 : (ushort)0xFF00;
-            isAwaitingResponse = true;
-            Modbus.WriteSingleAsync(FunctionCode.WriteCoil, modbusID, device.cleaningMode.address, value);
-
-            stopwatch.Restart();
-            while (isAwaitingResponse)
-            {
-                if (stopwatch.ElapsedMilliseconds > 1000)
-                {
-                    Console.WriteLine("Response timed out.");
-                    break;
-                }
-            }
-
-            if (latestMessage != null && latestMessage.Status != ModbusStatus.Error)
+            if (SetEntry(device.cleaningMode, value))
             {
                 cleaningStatus = !cleaningStatus;
                 labelCleaning.Text = cleaningStatus ? "вкл" : "выкл";
@@ -365,35 +384,19 @@ namespace Gidrolock_Modbus_Scanner
         }
 
         // Задать скорость передачи данных для устройства
-        private async void buttonSetSpeed_Click(object sender, EventArgs e)
+        private void buttonSetSpeed_Click(object sender, EventArgs e)
         {
             try
             {
                 string str = cBoxSpeed.Items[cBoxSpeed.SelectedIndex].ToString();
                 str = str.Substring(0, str.Length - 2); //clip off two zeroes at the end
                 ushort newSpeed = (ushort)Int16.Parse(str);
-                //Console.WriteLine("Baudrate: " + newSpeed);
-
-                // send speed value to device
-                // await for response
-                isAwaitingResponse = true;
-                Modbus.WriteSingleAsync(FunctionCode.WriteRegister, modbusID, device.baudRate.address, newSpeed);
-
-                stopwatch.Restart();
-                while (isAwaitingResponse)
+                Console.WriteLine("new speed: " + newSpeed);
+                if (SetEntry(device.baudRate, newSpeed))
                 {
-                    if (stopwatch.ElapsedMilliseconds > 1000)
-                    {
-                        Console.WriteLine("Response timed out.");
-                        break;
-                    }
-                }
-
-                if (latestMessage != null && latestMessage.Status != ModbusStatus.Error)
-                {
-                    port.Close();
-                    port.BaudRate = newSpeed;
-                    port.Open();
+                    //port.Close();
+                    port.BaudRate = newSpeed * 100;
+                    //port.Open();
                 }
             }
             catch (Exception ex) { MessageBox.Show(ex.Message); }
@@ -496,13 +499,14 @@ namespace Gidrolock_Modbus_Scanner
                                 return;
                             }
                             isAwaitingResponse = true;
+                            latestMessage = null;
                             Console.WriteLine("Outgoing firmware message: " + Modbus.ByteArrayToString(message.ToArray()));
                             port.Write(message.ToArray(), 0, message.Count);
                             stopwatch.Restart();
 
                             while (isAwaitingResponse)
                             {
-                                if (stopwatch.ElapsedMilliseconds > 1000)
+                                if (stopwatch.ElapsedMilliseconds > port.ReadTimeout)
                                 {
                                     Console.WriteLine("Response timed out.");
                                     cntr++;

Gidrolock Modbus Configurator.csproj

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

Main.cs

@@ -129,11 +129,12 @@ namespace Gidrolock_Modbus_Scanner
                         if (stopwatch.ElapsedMilliseconds > 1000)
                         {
                             AddLog("Истекло время ожидания ответа от устройства. Повторный запрос...");
-                            isAwaitingResponse = false;
+                            stopwatch.Restart();
                             counter++;
                             if (counter > 3)
                             {
                                 AddLog("Устройство не отвечает. Проверьте соединение с устройством.");
+                                isAwaitingResponse = false;
                                 return;
                             }
                         }
@@ -316,7 +317,11 @@ namespace Gidrolock_Modbus_Scanner
                     d.wiredSensors = 2;
                     d.hasScenarioSensor = true;
                     d.sensorAlarm = new Entry(RegisterType.Discrete, 1343, 24);
-
+                    d.wiredLineBreak = new List<Entry>()
+                    {
+                        new Entry(RegisterType.Discrete, 1205),
+                        new Entry(RegisterType.Discrete, 1207)
+                    };
                     d.radioStatus = new Entry(RegisterType.Input, 1215, 21);
 
                     break;
@@ -338,7 +343,11 @@ namespace Gidrolock_Modbus_Scanner
                     d.wiredSensors = 2;
                     d.hasScenarioSensor = false;
                     d.sensorAlarm = new Entry(RegisterType.Discrete, 1343, 23);
-
+                    d.wiredLineBreak = new List<Entry>()
+                    {
+                        new Entry(RegisterType.Discrete, 1205),
+                        new Entry(RegisterType.Discrete, 1207)
+                    };
                     d.radioStatus = new Entry(RegisterType.Input, 1215, 21);
 
                     break;
@@ -367,6 +376,16 @@ namespace Gidrolock_Modbus_Scanner
                     d.wiredSensors = 7;
                     d.hasScenarioSensor = true;
                     d.sensorAlarm = new Entry(RegisterType.Discrete, 1343, 29);
+                    d.wiredLineBreak = new List<Entry>()
+                    {
+                        new Entry(RegisterType.Discrete, 1025),
+                        new Entry(RegisterType.Discrete, 1026),
+                        new Entry(RegisterType.Discrete, 1027),
+                        new Entry(RegisterType.Discrete, 1028),
+                        new Entry(RegisterType.Discrete, 1029),
+                        new Entry(RegisterType.Discrete, 1030),
+                        new Entry(RegisterType.Discrete, 1031),
+                    };
                     d.radioStatus = new Entry(RegisterType.Input, 1215, 21);
                     break;
                 case DeviceType.Premium:

Modbus.cs

@@ -257,77 +257,84 @@ namespace Gidrolock_Modbus_Scanner
                 return false;
         }
         #endregion
-        /*
-        static byte[] buffer = new byte[255];
-        static int offset = 0;
-        static Thread timer = new Thread(new ThreadStart(() =>
-        {
-            Thread.Sleep(50);
-            offset = 0;
-            buffer = new byte[255];
-            port.DiscardInBuffer();
-        }));
-        */
+
 
         static Stopwatch stopwatch = new Stopwatch();
 
         static byte[] buffer = new byte[255];
         static int offset = 0;
         static int count = 0;
+        static ModbusStatus responseStatus;
+        static bool bytecountFound = false;
+        static int expectedBytes = 0;
         static void PortDataReceived(object sender, EventArgs e)
         {
-
             //reset values on every event call;
             buffer = new byte[255];
             offset = 0;
+            bytecountFound = false;
+            expectedBytes = 0;
+
             try
             {
                 stopwatch.Restart();
-                while (stopwatch.ElapsedMilliseconds < 20)
+                while (stopwatch.ElapsedMilliseconds < port.ReadTimeout)
                 {
+                    if (bytecountFound && offset >= expectedBytes)
+                        break;
                     if (port.BytesToRead > 0)
                     {
                         stopwatch.Restart();
                         count = port.BytesToRead;
-                        port.Read(buffer, offset, port.BytesToRead);
+                        port.Read(buffer, offset, count);
                         offset += count;
-                    }
-                }
-                // assume that the message ended
-
-                List<byte> message = new List<byte>();
-                for (int i = 0; i < offset; i++)
+                        if (offset >= 1)
                         {
-                    message.Add(buffer[i]);
-                }
-                if (message.Count == 0)
-                    return;
-
-                Console.WriteLine("Incoming message: " + ByteArrayToString(message.ToArray(), false));
-                /*
-                if (!CheckResponse(message.ToArray()))
+                            if (buffer[1] < 0x05)
+                                responseStatus = ModbusStatus.ReadSuccess;
+                            else if (buffer[1] < 0x10)
                             {
-                    Console.WriteLine("Bad CRC or not a modbus message!");
-                }
-                */
-                if (message[1] <= 0x04) // read functions
-                {
-                    //Console.WriteLine("It's a read message");
-                    ResponseReceived.Invoke(null, new ModbusResponseEventArgs(message.ToArray(), ModbusStatus.ReadSuccess));
+                                responseStatus = ModbusStatus.WriteSuccess;
+                                expectedBytes = 8;
+                                bytecountFound = true;
                             }
                             else
                             {
-                    if (message[1] <= 0x10) // write functions
+                                responseStatus = ModbusStatus.Error;
+                                expectedBytes = 5;
+                                bytecountFound = true;
+                            }
+                        }
+
+                        if (responseStatus == ModbusStatus.ReadSuccess && !bytecountFound && offset >= 2)
                         {
-                        //Console.WriteLine("It's a write message");
-                        ResponseReceived.Invoke(null, new ModbusResponseEventArgs(message.ToArray(), ModbusStatus.WriteSuccess));
+                            expectedBytes = buffer[2] + 5;
+                            Console.WriteLine("Found data byte count: " + expectedBytes);
+                            bytecountFound = true;
                         }
-                    else // error codes
+                        if (bytecountFound && offset >= expectedBytes) // reached end of message
                         {
-                        //Console.WriteLine("It's an error");
-                        ResponseReceived.Invoke(null, new ModbusResponseEventArgs(message.ToArray(), ModbusStatus.Error));
+                            Console.WriteLine("Reached end of message");
+                            break;
+                        }
+                        stopwatch.Restart();
                     }
                 }
+                // Console.WriteLine("Buffer: " + ByteArrayToString(buffer, false));
+                // assume that the message ended
+                Console.WriteLine("Message reception ended");
+                byte[] message = new byte[expectedBytes];
+                for (int i = 0; i < expectedBytes; i++)
+                    message[i] = buffer[i];
+
+                Console.WriteLine("Incoming message: " + ByteArrayToString(message, false));
+
+                if (!CheckResponse(message))
+                    Console.WriteLine("Bad CRC or not a modbus message!");
+
+                ResponseReceived.Invoke(null, new ModbusResponseEventArgs(message, responseStatus));
+
+
             }
             catch (Exception err)
             {

Properties/AssemblyInfo.cs

@@ -30,6 +30,6 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.9.4.0")]
-[assembly: AssemblyFileVersion("0.9.4.0")]
+[assembly: AssemblyVersion("0.9.5.0")]
+[assembly: AssemblyFileVersion("0.9.5.0")]
 [assembly: NeutralResourcesLanguage("en")]

Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Gidrolock_Modbus_Scanner.Properties {
+namespace Gidrolock_Modbus_Configurator.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace Gidrolock_Modbus_Scanner.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_Scanner.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gidrolock_Modbus_Configurator.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

Properties/Settings.Designer.cs

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