HamBook – Diff between revs 39 and 46

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 39 Rev 46
Line 21... Line 21...
21   21  
Line 22... Line 22...
22 public override CatLength CatLength => new CatLength { Set = 6, Read = 3, Answer = 6 }; 22 public override CatLength CatLength => new CatLength { Set = 6, Read = 3, Answer = 6 };
23   23  
24 public AC(SerialPortStream serialPort) : base(serialPort) 24 public AC(SerialPortStream serialPort) : base(serialPort)
25 { 25 {
Line 26... Line 26...
26 readRegex = new Regex($"^{Name}00(?<state>[012]){HamBook.Radios.Generic.Constants.EOT}$", RegexOptions.Compiled); 26 readRegex = new Regex($"^{Name}00(?<state>[012]){Constants.EOT}$", RegexOptions.Compiled);
27 } 27 }
28   28  
29 public override TunerState Read() 29 public override TunerState Read()
30 { 30 {
31 SerialPort.Write($"{Name}{Generic.Constants.EOT}"); 31 SerialPort.Write($"{Name}{Constants.EOT}");
32 var buffer = new byte[CatLength.Answer]; 32 var buffer = new byte[CatLength.Answer];
33 if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer) 33 if (SerialPort.Read(buffer, 0, CatLength.Answer) != CatLength.Answer)
Line 44... Line 44...
44 return (TunerState)int.Parse(match.Result("${state}")); 44 return (TunerState)int.Parse(match.Result("${state}"));
45 } 45 }
Line 46... Line 46...
46   46  
47 public override async Task<TunerState> ReadAsync(CancellationToken cancellationToken) 47 public override async Task<TunerState> ReadAsync(CancellationToken cancellationToken)
48 { 48 {
49 var payload = Constants.Encoding.GetBytes($"{Name}{Generic.Constants.EOT}"); 49 var payload = Constants.Encoding.GetBytes($"{Name}{Constants.EOT}");
50 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken); 50 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
51 var buffer = new byte[CatLength.Answer]; 51 var buffer = new byte[CatLength.Answer];
52 if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer) 52 if (await SerialPort.ReadAsync(buffer, 0, CatLength.Answer, cancellationToken) != CatLength.Answer)
53 { 53 {
Line 64... Line 64...
64 return (TunerState)int.Parse(match.Result("${state}")); 64 return (TunerState)int.Parse(match.Result("${state}"));
65 } 65 }
Line 66... Line 66...
66   66  
67 public override bool Set(TunerState tunerState) 67 public override bool Set(TunerState tunerState)
68 { 68 {
Line 69... Line 69...
69 var payload = Constants.Encoding.GetBytes($"{Name}00{(int)tunerState}{Generic.Constants.EOT}"); 69 var payload = Constants.Encoding.GetBytes($"{Name}00{(int)tunerState}{Constants.EOT}");
Line 70... Line 70...
70   70  
71 SerialPort.Write(payload, 0, payload.Length); 71 SerialPort.Write(payload, 0, payload.Length);
Line 72... Line 72...
72   72  
73 return Read() == tunerState; 73 return Read() == tunerState;
74 } 74 }
Line 75... Line 75...
75   75  
Line 76... Line 76...
76 public override async Task<bool> SetAsync(TunerState tunerState, CancellationToken cancellationToken) 76 public override async Task<bool> SetAsync(TunerState tunerState, CancellationToken cancellationToken)
Line 77... Line 77...
77 { 77 {
78 var payload = Constants.Encoding.GetBytes($"{Name}00{(int)tunerState}{Generic.Constants.EOT}"); 78 var payload = Constants.Encoding.GetBytes($"{Name}00{(int)tunerState}{Constants.EOT}");
Line 79... Line 79...
79   79  
80 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken); 80 await SerialPort.WriteAsync(payload, 0, payload.Length, cancellationToken);
81   81  
82 var read = await ReadAsync(cancellationToken); 82 var read = await ReadAsync(cancellationToken);
Line 83... Line 83...
83   83  
84 return read == tunerState; 84 return read == tunerState;
85 } 85 }
Line 86... Line 86...
86   86  
87 public override void Write(TunerState tunerState) 87 public override void Write(TunerState tunerState)
88 { 88 {
89 SerialPort.Write($"{Name}00{(int)tunerState}{Generic.Constants.EOT}"); 89 SerialPort.Write($"{Name}00{(int)tunerState}{Constants.EOT}");