HamBook – Diff between revs 11 and 34

Subversion Repositories:

?pathlinks?

Rev 11 – Rev 46 – Go to most recent revision – Details – Blame – Last modification – View Log

 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using static HamBook.Radios.Yaesu.FT_891.Constants;
 using RJCP.IO.Ports;
 using System.Threading;
+using System.Diagnostics;
 namespace HamBook.Radios.Yaesu.FT_891.CAT
+{
     [Radio("Yaesu FT-891")]
             readRegex = new Regex($"^{Name}(?<state>[01]){Generic.Constants.EOT}$", RegexOptions.Compiled);
+        }
         public override async Task<bool> SetAsync(PowerState state, CancellationToken cancellationToken)
-        {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+        {
-            var id = new ID(SerialPort);
-            try
-            {
+            SerialPort.Write(new byte[1] { 0 }, 0, 1);
-                await id.ReadAsync(cancellationToken);
-            }
-            catch
-            {
+            SerialPort.Read(new byte[2] { 0, 0 }, 0, 2);
             var taskCompletionSource = new TaskCompletionSource<bool>();
 #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
             return await ReadAsync(cancellationToken) == state;
+        }
         public override async Task<PowerState> ReadAsync(CancellationToken cancellationToken)
         {
+            SerialPort.Write(new byte[1] { 0 }, 0, 1);
-            var taskCompletionSource = new TaskCompletionSource<int>();
-            var id = new ID(SerialPort);
-            try
+            SerialPort.Read(new byte[2] { 0, 0 }, 0, 2);
-            {
-                await id.ReadAsync(cancellationToken);
-            }
-            catch
-            {
             var taskCompletionSource = new TaskCompletionSource<int>();
 #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
                 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
                 var buffer = new byte[CatLength.Answer];
                 if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer)
+                {
+                    taskCompletionSource.TrySetResult(-1);
                     throw new UnexpectedRadioResponseException(Name, buffer);
+                }
                 var answer = Constants.Encoding.GetString(buffer);
                 var match = readRegex.Match(answer);
                 if (!match.Success)
+                {
+                    taskCompletionSource.TrySetResult(-1);
                     throw new UnmatchedRadioResponseException(Name, answer);
+                }