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.Text.RegularExpressions;
-using System.ComponentModel;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using HamBook.Radios.Generic;
-using static HamBook.Radios.Yaesu.FT_891.Constants;
 using RJCP.IO.Ports;
-using System.Text.RegularExpressions;
+using static HamBook.Radios.Yaesu.FT_891.Constants;
-using System.Threading;
-using System.Diagnostics;
 namespace HamBook.Radios.Yaesu.FT_891.CAT
+{
     [Radio("Yaesu FT-891")]
-    public class MT : Generic.CAT.MT
+    public class Mt : Generic.CAT.Mt
     {
-        private readonly Regex readRegex;
-        public override CatLength CatLength => new CatLength { Set = 41, Read = 6, Answer = 41};
+        private readonly Regex _readRegex;
-        public MT(SerialPortStream serialPort) : base(serialPort)
+        public Mt(SerialPortStream serialPort) : base(serialPort)
+        {
             /// MTP9U026965000+0000004100001AAAAAAAAAAAA;
+            ///                       ^---- fixed: 0 in manual, but responds 1; looks like a radio bug
+            _readRegex = new Regex(
-            ///                       ^---- fixed: 0 in manual, but responds 1; looks like a radio bug
+                $"^{Name}(?<currentLocation>[0-9PLU]{{3}})(?<frequency>[0-9]{{9}})(?<clarifierDirection>[\\+\\-]{{1}})(?<clarifierOffset>[0-9]{{4}})(?<clar>[01]{{1}})0(?<mode>[123456789ABCD]{{1}})[0-9]{{1}}(?<ctcss>[012]{{1}})00(?<phase>[012]{{1}})(?<tag>[01]{{1}})(?<text>[\x20-\x7E]{{0,12}}){Eot}$",
+                RegexOptions.Compiled);
+        }
             readRegex = new Regex($"^{Name}(?<currentLocation>[0-9PLU]{{3}})(?<frequency>[0-9]{{9}})(?<clarifierDirection>[\\+\\-]{{1}})(?<clarifierOffset>[0-9]{{4}})(?<clar>[01]{{1}})0(?<mode>[123456789ABCD]{{1}})[0-9]{{1}}(?<ctcss>[012]{{1}})00(?<phase>[012]{{1}})(?<tag>[01]{{1}})(?<text>[\x20-\x7E]{{0,12}}){Constants.EOT}$", RegexOptions.Compiled);
         public override CatLength CatLength => new CatLength { Set = 41, Read = 6, Answer = 41 };
         public override Generic.MemoryChannel Read(string location)
+        {
-            SerialPort.Write($"{Name}{location}{Constants.EOT}");
-            var buffer = new byte[CatLength.Answer];
+            SerialPort.Write($"{Name}{location}{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)
                 throw new UnexpectedRadioResponseException(Name, buffer);
+            var answer = Encoding.GetString(buffer);
             var answer = Constants.Encoding.GetString(buffer);
+            return Parse(answer);
             return Parse(answer);
         public override async Task<Generic.MemoryChannel> ReadAsync(string location,
-        public override async Task<Generic.MemoryChannel> ReadAsync(string location, CancellationToken cancellationToken)
             CancellationToken cancellationToken)
-            var payload = Constants.Encoding.GetBytes($"{Name}{location}{Constants.EOT}");
-            await SerialPort.WriteAsync(payload, 0, payload.Length);
+        {
-            var buffer = new byte[CatLength.Answer];
+            var payload = Encoding.GetBytes($"{Name}{location}{Eot}");
-            if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer) != CatLength.Answer)
+            await SerialPort.WriteAsync(payload, 0, payload.Length);
             var buffer = new byte[CatLength.Answer];
-                throw new UnexpectedRadioResponseException(Name, buffer);
+            if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer) != CatLength.Answer)
-            }
+                throw new UnexpectedRadioResponseException(Name, buffer);
-            var answer = Constants.Encoding.GetString(buffer);
+            var answer = Encoding.GetString(buffer);
             return Parse(answer);
+        }
         public override bool Set(Generic.MemoryChannel channel)
+        {
-            var payload = Constants.Encoding.GetBytes(Compose(new MemoryChannel(channel)));
+            var payload = Encoding.GetBytes(Compose(new MemoryChannel(channel)));
             SerialPort.Write(payload, 0, payload.Length);
             return Read(channel.CurrentLocation).Equals(channel);
+        }
-        }
         public override async Task<bool> SetAsync(Generic.MemoryChannel channel, CancellationToken cancellationToken)
         public override async Task<bool> SetAsync(Generic.MemoryChannel channel, CancellationToken cancellationToken)
             var compose = Compose(new MemoryChannel(channel));
-            var compose = Compose(new MemoryChannel(channel));
-            var payload = Constants.Encoding.GetBytes(compose);
+            var payload = Encoding.GetBytes(compose);
-            await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
-            var result = await ReadAsync(channel.CurrentLocation, cancellationToken);
+            await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
-            return result.Equals(channel);
+            var result = await ReadAsync(channel.CurrentLocation, cancellationToken);
                 MemoryRadioMode = new MemoryRadioMode(radioMode),
                 Ctcss = new Ctcss(ctcss),
                 Phase = new Phase(phase),
                 Tag = tag,
                 Text = text
             };
             return memoryChannel;
+        }
         public override void Write(Generic.MemoryChannel channel)
+        {
-            var payload = Constants.Encoding.GetBytes(Compose(new MemoryChannel(channel)));
+            var payload = Encoding.GetBytes(Compose(new MemoryChannel(channel)));
             SerialPort.Write(payload, 0, payload.Length);
+        }
         public override async Task WriteAsync(Generic.MemoryChannel channel, CancellationToken cancellationToken)
+        {
             var compose = Compose(new MemoryChannel(channel));
-            var payload = Constants.Encoding.GetBytes(compose);
+            var payload = Encoding.GetBytes(compose);