HamBook – Diff between revs 7 and 9

Subversion Repositories:

?pathlinks?

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

 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using static HamBook.Radios.Yaesu.FT_891.Constants;
+using RJCP.IO.Ports;
-namespace HamBook.Radios.Yaesu.FT_891
+namespace HamBook.Radios.Yaesu.FT_891.CAT
+{
     [Radio("Yaesu FT-891")]
     public class SC : HamBook.Radios.Generic.CAT.SC
     {
+        private readonly Regex readRegex;
-        private static readonly Regex readRegex = new Regex(@"^SC(?<state>[0,1,2])$", RegexOptions.Compiled);
+        public override CatLength CatLength => new CatLength { Set = 4, Answer = 4, Read = 3 };
+        public SC(SerialPortStream serialPort) : base(serialPort)
         public SC(SerialPort serialPort) : base(serialPort)
             readRegex = new Regex($"^{Name}(?<state>[012]){Generic.Constants.EOT}$", RegexOptions.Compiled);
+        }
+        public override ScanState Read()
+        {
+            SerialPort.Write($"{Name}{Generic.Constants.EOT}");
+            var buffer = new byte[CatLength.Answer];
+            if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer)
+            {
-        public override ScanState Read()
+                throw new ArgumentException();
-        {
+            }
+            var answer = Encoding.ASCII.GetString(buffer);
+            var match = readRegex.Match(answer);
+            if (!match.Success)
             SerialPort.Write($"{Name}{Generic.Constants.EOT}");
-            var result = SerialPort.ReadTo(Generic.Constants.EOT);
+                throw new ArgumentException();
             var match = readRegex.Match(result);
             var state = char.Parse(match.Result("${state}"));
             switch(state)