HamBook – Diff between revs 46 and 54

Subversion Repositories:

?pathlinks?

Rev 46 – Details – Blame – Last modification – View Log

-using HamBook.Radios.Generic;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO.Ports;
-using System.Linq;
-using System.Reflection;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using static HamBook.Radios.Yaesu.FT_891.Constants;
+using HamBook.Radios.Generic;
 using RJCP.IO.Ports;
+using static HamBook.Radios.Yaesu.FT_891.Constants;
 namespace HamBook.Radios.Yaesu.FT_891.CAT
+{
     [Radio("Yaesu FT-891")]
-    public class AI : Generic.CAT.AI
+    public class Ai : Generic.CAT.Ai
     {
-        private readonly Regex readRegex;
-        public override CatLength CatLength => new CatLength { Set = 4, Read = 3, Answer = 4 };
+        private readonly Regex _readRegex;
-        public AI(SerialPortStream serialPort) : base(serialPort)
+        public Ai(SerialPortStream serialPort) : base(serialPort)
+        {
+            _readRegex = new Regex($"^{Name}(?<state>[01]){Eot}$", RegexOptions.Compiled);
+        }
             readRegex = new Regex($"^{Name}(?<state>[01]){Constants.EOT}$", RegexOptions.Compiled);
         public override CatLength CatLength => new CatLength { Set = 4, Read = 3, Answer = 4 };
         public override InformationState Read()
+        {
-            SerialPort.Write($"{Name}{Constants.EOT}");
-            var buffer = new byte[CatLength.Answer];
+            SerialPort.Write($"{Name}{Eot}");
-            if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer)
-            {
+            var buffer = new byte[CatLength.Answer];
-                throw new UnexpectedRadioResponseException(Name, buffer);
+            if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer)
-            }
-            var answer = Constants.Encoding.GetString(buffer);
+                throw new UnexpectedRadioResponseException(Name, buffer);
-            var match = readRegex.Match(answer);
             if (!match.Success)
             var answer = Encoding.GetString(buffer);
-                throw new UnmatchedRadioResponseException(Name, answer);
+            var match = _readRegex.Match(answer);
+            if (!match.Success) throw new UnmatchedRadioResponseException(Name, answer);
             var state = (InformationState)int.Parse(match.Result("${state}"));
             var state = (InformationState)int.Parse(match.Result("${state}"));
+            return state;
             return state;
         public override async Task<InformationState> ReadAsync(CancellationToken cancellationToken)
-        {
             var payload = Constants.Encoding.GetBytes($"{Name}{Constants.EOT}");
-            await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
-            var buffer = new byte[CatLength.Answer];
+            var payload = Encoding.GetBytes($"{Name}{Eot}");
-            if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer)
+            await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
-            {
-                throw new UnexpectedRadioResponseException(Name, buffer);
-            }
+            var buffer = new byte[CatLength.Answer];
-            var answer = Constants.Encoding.GetString(buffer);
+            if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer)
-            var match = readRegex.Match(answer);
+                throw new UnexpectedRadioResponseException(Name, buffer);
             if (!match.Success)
             var answer = Encoding.GetString(buffer);
-                throw new UnmatchedRadioResponseException(Name, answer);
+            var match = _readRegex.Match(answer);
-            }
+            if (!match.Success) throw new UnmatchedRadioResponseException(Name, answer);
             var state = (InformationState)int.Parse(match.Result("${state}"));
+            return state;
             return state;
+        public override bool Set(InformationState state)
         public override bool Set(InformationState state)
             SerialPort.Write($"{Name}{(int)state}{Eot}");
-            SerialPort.Write($"{Name}{(int)state}{Constants.EOT}");
+            return Read() == state;
             return Read() == state;
         public override async Task<bool> SetAsync(InformationState state, CancellationToken cancellationToken)
-        {
-            var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Constants.EOT}");
-            await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
+        {
-            return await ReadAsync(cancellationToken) == state;
             var payload = Encoding.GetBytes($"{Name}{(int)state}{Eot}");
             await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
-        public override Information Parse(string input)
+            return await ReadAsync(cancellationToken) == state;
+        }
             return information;
+        }
         public override void Write(InformationState state)
         {
-            SerialPort.Write($"{Name}{(int)state}{Constants.EOT}");
+            SerialPort.Write($"{Name}{(int)state}{Eot}");
+        }
         public override async Task WriteAsync(InformationState state, CancellationToken cancellationToken)
+        {
-            var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Constants.EOT}");
+            var payload = Encoding.GetBytes($"{Name}{(int)state}{Eot}");
             await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
+        }