HamBook – Diff between revs 46 and 54

Subversion Repositories:

?pathlinks?

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

-using System;
-using System.Collections.Generic;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static HamBook.Radios.Yaesu.FT_891.Constants;
-using RJCP.IO.Ports;
 using System.Text.RegularExpressions;
 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 BY : Generic.CAT.BY
+    public class By : Generic.CAT.By
     {
-        private readonly Regex readRegex;
-        public override CatLength CatLength => new CatLength { Read = 3, Answer = 5 };
+        private readonly Regex _readRegex;
-        public BY(SerialPortStream serialPort) : base(serialPort)
+        public By(SerialPortStream serialPort) : base(serialPort)
+        {
+            _readRegex = new Regex($"^{Name}(?<state>[01])0{Eot}$", RegexOptions.Compiled);
+        }
             readRegex = new Regex($"^{Name}(?<state>[01])0{Constants.EOT}$", RegexOptions.Compiled);
         public override CatLength CatLength => new CatLength { Read = 3, Answer = 5 };
-        public override BusyState Parse(string input)
-        {
-            var match = readRegex.Match(input);
+        public override BusyState Parse(string input)
-            if(!match.Success)
+        {
-                throw new UnmatchedRadioResponseException(Name, input);
+            var match = _readRegex.Match(input);
             if (!match.Success) throw new UnmatchedRadioResponseException(Name, input);
             return (BusyState)int.Parse(match.Result("${state}"));
+        }
-        public override BusyState Read()
         public override BusyState Read()
-            SerialPort.Write($"{Name}{Constants.EOT}");
-            var buffer = new byte[CatLength.Answer];
+        {
-            if(SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer)
+            SerialPort.Write($"{Name}{Eot}");
-            {
-                throw new UnexpectedRadioResponseException(Name, buffer);
-            }
+            var buffer = new byte[CatLength.Answer];
-            var answer = Constants.Encoding.GetString(buffer);
+            if (SerialPort.Read(buffer, 0, CatLength.Answer) != 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);