HamBook – Diff between revs 1 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 1 Rev 3
Line 1... Line 1...
1 using HamBook.Radios.Generic; 1 using HamBook.Radios.Generic;
-   2 using HamBook.Radios.Generic.CAT;
2 using System; 3 using System;
3 using System.Collections.Generic; 4 using System.Collections.Generic;
4 using System.IO.Ports; 5 using System.IO.Ports;
5 using System.Linq; 6 using System.Linq;
6 using System.Text; 7 using System.Text;
Line 9... Line 10...
9 using static HamBook.Radios.Yaesu.FT_891.Constants; 10 using static HamBook.Radios.Yaesu.FT_891.Constants;
Line 10... Line 11...
10   11  
11 namespace HamBook.Radios.Yaesu.FT_891 12 namespace HamBook.Radios.Yaesu.FT_891
12 { 13 {
13 [Radio("Yaesu FT-891")] 14 [Radio("Yaesu FT-891")]
14 public class SC : Generic.SC 15 public class SC : HamBook.Radios.Generic.CAT.SC
15 { 16 {
Line 16... Line 17...
16 private static readonly Regex readRegex = new Regex(@"^SC(?<state>[0,1,2])$", RegexOptions.Compiled); 17 private static readonly Regex readRegex = new Regex(@"^SC(?<state>[0,1,2])$", RegexOptions.Compiled);
17   18  
18 public SC(SerialPort serialPort) : base(serialPort) 19 public SC(SerialPort serialPort) : base(serialPort)
Line 19... Line 20...
19 { 20 {
20 } 21 }
21   22  
22 public override ScanState Read() 23 public override ScanState Read()
23 { 24 {
24 SerialPort.Write($"{Name}{EOT}"); 25 SerialPort.Write($"{Name}{Generic.Constants.EOT}");
25 var result = SerialPort.ReadTo(EOT); 26 var result = SerialPort.ReadTo(Generic.Constants.EOT);
26 var match = readRegex.Match(result); 27 var match = readRegex.Match(result);
27 var state = char.Parse(match.Result("${state}")); 28 var state = char.Parse(match.Result("${state}"));
Line 41... Line 42...
41 public override void Set(ScanState state) 42 public override void Set(ScanState state)
42 { 43 {
43 switch(state) 44 switch(state)
44 { 45 {
45 case ScanState.OFF: 46 case ScanState.OFF:
46 SerialPort.Write($"{Name}0{EOT}"); 47 SerialPort.Write($"{Name}0{Generic.Constants.EOT}");
47 break; 48 break;
48 case ScanState.UP: 49 case ScanState.UP:
49 SerialPort.Write($"{Name}1{EOT}"); 50 SerialPort.Write($"{Name}1{Generic.Constants.EOT}");
50 break; 51 break;
51 case ScanState.DOWN: 52 case ScanState.DOWN:
52 SerialPort.Write($"{Name}2{EOT}"); 53 SerialPort.Write($"{Name}2{Generic.Constants.EOT}");
53 break; 54 break;
54 } 55 }
55 } 56 }