updated transmit method

DerekGn · Jan 25, 2021 · 64ec2fa · 64ec2fa
1 parent 6de9817
commit 64ec2fa
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/RfmOTA/RfmOTA/Ota/OtaService.cs b/RfmOTA/RfmOTA/Ota/OtaService.cs
@@ -300,7 +300,7 @@ private void SendRequest(IList<byte> request, [CallerMemberName] string memberNa
             {
                 sw.Start();
 
-                _rfmUsb.Transmit(request, 1000);
+                _rfmUsb.Transmit(request);
             }
             finally
             {

diff --git a/RfmOta/RfmOta/Rfm/IRfmUsb.cs b/RfmOta/RfmOta/Rfm/IRfmUsb.cs
@@ -56,7 +56,7 @@ internal interface IRfmUsb : IDisposable
         /// </summary>
         /// <param name="data">The data to transmit</param>
         /// <param name="timeout">The timeout in milliseconds to wait for a response</param>
-        void Transmit(IList<byte> data, int timeout);
+        void Transmit(IList<byte> data);
         void SetDioMapping(Dio dio, DioMapping mapping);
     }
 }
diff --git a/RfmOta/RfmOta/Rfm/RfmUsb.cs b/RfmOta/RfmOta/Rfm/RfmUsb.cs
@@ -179,9 +179,29 @@ public IList<byte> TransmitReceive(IList<byte> data, int timeout)
             } while (true);
         }
         ///<inheritdoc/>
-        public void Transmit(IList<byte> data, int timeout)
+        public void Transmit(IList<byte> data)
         {
-            SendCommand($"e-tx {BitConverter.ToString(data.ToArray()).Replace("-", string.Empty)} {timeout}");
+            int retries = RetryCount;
+
+            do
+            {
+                var response = SendCommand($"e-tx {BitConverter.ToString(data.ToArray()).Replace("-", string.Empty)}");
+
+                if (response.Contains("TX") || response.Contains("RX"))
+                {
+                    if (retries == 0)
+                    {
+                        throw new RfmUsbTransmitException($"Packet transmission failed: [{response}]");
+                    }
+
+                    retries--;
+                }
+                else
+                {
+                    break;
+                }
+
+            } while (true);
         }
         ///<inheritdoc/>
         public void SetDioMapping(Dio dio, DioMapping mapping)