HamBook – Diff between revs 46 and 54

Subversion Repositories:

?pathlinks?

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

-using HamBook.Radios.Generic;
 using System;
-using System.IO.Ports;
 using System.Text.RegularExpressions;
+using HamBook.Radios.Generic;
 using RJCP.IO.Ports;
-using System.Text;
 namespace HamBook.Radios.Yaesu.FT_891.CAT
+{
     [Radio("Yaesu FT-891")]
-    public class RI : Generic.CAT.RI
+    public class Ri : Generic.CAT.Ri
     {
-        private readonly Regex readRegex;
-        public override CatLength CatLength => new CatLength { Answer = 5, Read = 4 };
+        private readonly Regex _readRegex;
-        public RI(SerialPortStream serialPort) : base(serialPort)
+        public Ri(SerialPortStream serialPort) : base(serialPort)
+        {
             _readRegex = new Regex($"^{Name}(?<type>[03AB]{{1}})(?<state>[01]{{1}}){Constants.Eot}$",
+                RegexOptions.Compiled);
+        }
             readRegex = new Regex($"^{Name}(?<type>[03AB]{{1}})(?<state>[01]{{1}}){Constants.EOT}$", RegexOptions.Compiled);
         public override CatLength CatLength => new CatLength { Answer = 5, Read = 4 };
         public override bool Read(RadioInformationType type)
+        {
-            SerialPort.Write($"{Name}{P1(type)}{Constants.EOT}");
-            var buffer = new byte[CatLength.Answer];
+            SerialPort.Write($"{Name}{P1(type)}{Constants.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)
-            {
-                throw new UnmatchedRadioResponseException(Name, answer);
-            }
+            var answer = Constants.Encoding.GetString(buffer);
-            var information = P1(char.Parse(match.Result("${type}")));
+            var match = _readRegex.Match(answer);
             if (!match.Success) throw new UnmatchedRadioResponseException(Name, answer);
             if(information != type)
                 default:
                     throw new ArgumentException();
+            }
+        }
+    }
 }