HamBook – Diff between revs 9 and 11

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 9 Rev 11
Line 32... Line 32...
32 { 32 {
33 SerialPort.Write($"{Name}{Generic.Constants.EOT}"); 33 SerialPort.Write($"{Name}{Generic.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)
36 { 36 {
37 throw new ArgumentException(); 37 throw new UnexpectedRadioResponseException(Name, buffer);
38 } 38 }
Line 39... Line 39...
39   39  
40 var answer = Encoding.ASCII.GetString(buffer); 40 var answer = Constants.Encoding.GetString(buffer);
41 var match = readRegex.Match(answer); 41 var match = readRegex.Match(answer);
42 if (!match.Success) 42 if (!match.Success)
43 { 43 {
44 throw new ArgumentException(); 44 throw new UnmatchedRadioResponseException(Name, answer);
45 } 45 }
Line 46... Line 46...
46 var state = (InformationState)int.Parse(match.Result("${state}")); 46 var state = (InformationState)int.Parse(match.Result("${state}"));
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 = Encoding.ASCII.GetBytes($"{Name}{Generic.Constants.EOT}"); 52 var payload = Constants.Encoding.GetBytes($"{Name}{Generic.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 57... Line 57...
57 throw new ArgumentException(); 57 throw new UnexpectedRadioResponseException(Name, buffer);
58 } 58 }
59   59  
60 var answer = Encoding.ASCII.GetString(buffer); 60 var answer = Constants.Encoding.GetString(buffer);
61 var match = readRegex.Match(answer); 61 var match = readRegex.Match(answer);
62 if (!match.Success) 62 if (!match.Success)
Line 63... Line 63...
63 { 63 {
64 throw new ArgumentException(); 64 throw new UnmatchedRadioResponseException(Name, answer);
65 } 65 }
Line 73... Line 73...
73 SerialPort.Write($"{Name}{(int)state}{Generic.Constants.EOT}"); 73 SerialPort.Write($"{Name}{(int)state}{Generic.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 = Encoding.ASCII.GetBytes($"{Name}{(int)state}{Generic.Constants.EOT}"); 78 var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Generic.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;
81 } 81 }
Line 82... Line 82...
82   82  
Line 120... Line 120...
120 SerialPort.Write($"{Name}{(int)state}{Generic.Constants.EOT}"); 120 SerialPort.Write($"{Name}{(int)state}{Generic.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 {
Line 125... Line 125...
125 var payload = Encoding.ASCII.GetBytes($"{Name}{(int)state}{Generic.Constants.EOT}"); 125 var payload = Constants.Encoding.GetBytes($"{Name}{(int)state}{Generic.Constants.EOT}");
126   126  
127 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken); 127 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
128 } 128 }