HamBook – Diff between revs 43 and 46

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 43 Rev 46
Line 23... Line 23...
23   23  
Line 24... Line 24...
24 public override CatLength CatLength => new CatLength { Set = 4, Read = 3, Answer = 4 }; 24 public override CatLength CatLength => new CatLength { Set = 4, Read = 3, Answer = 4 };
25   25  
26 public AI(SerialPortStream serialPort) : base(serialPort) 26 public AI(SerialPortStream serialPort) : base(serialPort)
27 { 27 {
Line 28... Line 28...
28 readRegex = new Regex($"^{Name}(?<state>[01]){Generic.Constants.EOT}$", RegexOptions.Compiled); 28 readRegex = new Regex($"^{Name}(?<state>[01]){Constants.EOT}$", RegexOptions.Compiled);
29 } 29 }
30   30  
31 public override InformationState Read() 31 public override InformationState Read()
32 { 32 {
33 SerialPort.Write($"{Name}{Generic.Constants.EOT}"); 33 SerialPort.Write($"{Name}{Constants.EOT}");
34 var buffer = new byte[CatLength.Answer]; 34 var buffer = new byte[CatLength.Answer];
35 if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer) 35 if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer)
Line 47... Line 47...
47   47  
48 return state; 48 return state;
49 } 49 }
50 public override async Task<InformationState> ReadAsync(CancellationToken cancellationToken) 50 public override async Task<InformationState> ReadAsync(CancellationToken cancellationToken)
51 { 51 {
52 var payload = Constants.Encoding.GetBytes($"{Name}{Generic.Constants.EOT}"); 52 var payload = Constants.Encoding.GetBytes($"{Name}{Constants.EOT}");
53 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken); 53 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
54 var buffer = new byte[CatLength.Answer]; 54 var buffer = new byte[CatLength.Answer];
55 if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer) 55 if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer)
56 { 56 {
Line 68... Line 68...
68 return state; 68 return state;
69 } 69 }
Line 70... Line 70...
70   70  
71 public override bool Set(InformationState state) 71 public override bool Set(InformationState state)
72 { 72 {
73 SerialPort.Write($"{Name}{(int)state}{Generic.Constants.EOT}"); 73 SerialPort.Write($"{Name}{(int)state}{Constants.EOT}");
74 return Read() == state; 74 return Read() == state;
75 } 75 }
76 public override async Task<bool> SetAsync(InformationState state, CancellationToken cancellationToken) 76 public override async Task<bool> SetAsync(InformationState state, CancellationToken cancellationToken)
77 { 77 {
78 var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Generic.Constants.EOT}"); 78 var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Constants.EOT}");
79 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken); 79 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
80 return await ReadAsync(cancellationToken) == state; 80 return await ReadAsync(cancellationToken) == state;
Line 81... Line 81...
81 } 81 }
Line 94... Line 94...
94 var clarifierDirection = char.Parse(match.Result("${clarifierDirection}")); 94 var clarifierDirection = char.Parse(match.Result("${clarifierDirection}"));
95 var clarifierOffset = int.Parse(match.Result("${clarifierOffset}")); 95 var clarifierOffset = int.Parse(match.Result("${clarifierOffset}"));
96 var clar = int.Parse(match.Result("${clar}")) == 0 ? false : true; 96 var clar = int.Parse(match.Result("${clar}")) == 0 ? false : true;
97 var radioMode = char.Parse(match.Result("${mode}")); 97 var radioMode = char.Parse(match.Result("${mode}"));
98 var storage = match.Result("${storage}"); 98 var storage = match.Result("${storage}");
99 var ctcssMode = match.Result("${ctcssMode}"); 99 var ctcss = int.Parse(match.Result("${ctcssMode}"));
100 var phase = match.Result("${phase}"); 100 var phase = int.Parse(match.Result("${phase}"));
Line 101... Line 101...
101   101  
102 var information = new Information 102 var information = new Information
103 { 103 {
104 RadioBank = radioBank, 104 RadioBank = radioBank,
105 Frequency = frequency, 105 Frequency = frequency,
106 ClarifierDirection = clarifierDirection, 106 ClarifierDirection = clarifierDirection,
107 ClarifierOffset = clarifierOffset, 107 ClarifierOffset = clarifierOffset,
108 Clar = clar, 108 Clar = clar,
109 RadioMode = new RadioMode(radioMode), 109 RadioMode = new RadioMode(radioMode),
110 Storage = storage, 110 Storage = storage,
111 CtcssMode = ctcssMode, 111 Ctcss = new Ctcss(ctcss),
112 Phase = phase 112 Phase = new Phase(phase)
Line 113... Line 113...
113 }; 113 };
114   114  
Line 115... Line 115...
115 return information; 115 return information;
116 } 116 }
117   117  
118 public override void Write(InformationState state) 118 public override void Write(InformationState state)
Line 119... Line 119...
119 { 119 {
120 SerialPort.Write($"{Name}{(int)state}{Generic.Constants.EOT}"); 120 SerialPort.Write($"{Name}{(int)state}{Constants.EOT}");
121 } 121 }
Line 122... Line 122...
122   122  
123 public override async Task WriteAsync(InformationState state, CancellationToken cancellationToken) 123 public override async Task WriteAsync(InformationState state, CancellationToken cancellationToken)
124 { 124 {
125 var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Generic.Constants.EOT}"); 125 var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Constants.EOT}");