HamBook – Diff between revs 21 and 23

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 21 Rev 23
Line 47... Line 47...
47 _serialPort = serialPort; 47 _serialPort = serialPort;
48 _configuration = configuration; 48 _configuration = configuration;
Line 49... Line 49...
49   49  
Line 50... Line 50...
50 } 50 }
51   51  
52 public async void Start(int stepFrequency, int pauseTime) 52 public async void Start(int stepFrequency, int pauseTime, bool autoTune = false)
53 { 53 {
54 if(_scanTask != null) 54 if(_scanTask != null)
55 { 55 {
Line 63... Line 63...
63 } 63 }
Line 64... Line 64...
64   64  
65 _scanningCancellationTokenSource = new CancellationTokenSource(); 65 _scanningCancellationTokenSource = new CancellationTokenSource();
Line 66... Line 66...
66 _scanningCancellationToken = _scanningCancellationTokenSource.Token; 66 _scanningCancellationToken = _scanningCancellationTokenSource.Token;
67   67  
Line 68... Line 68...
68 _scanTask = Scan(stepFrequency, pauseTime); 68 _scanTask = Scan(stepFrequency, pauseTime, autoTune);
69 } 69 }
70   70  
71 public async void Start(int stepFrequency, int pauseTime, int pauseDetectTime) 71 public async void Start(int stepFrequency, int pauseTime, int pauseDetectTime, bool autoTune = false)
72 { 72 {
73 if (_scanTask != null) 73 if (_scanTask != null)
Line 82... Line 82...
82 } 82 }
Line 83... Line 83...
83   83  
84 _scanningCancellationTokenSource = new CancellationTokenSource(); 84 _scanningCancellationTokenSource = new CancellationTokenSource();
Line 85... Line 85...
85 _scanningCancellationToken = _scanningCancellationTokenSource.Token; 85 _scanningCancellationToken = _scanningCancellationTokenSource.Token;
86   86  
Line 87... Line 87...
87 _scanTask = Scan(stepFrequency, pauseTime, pauseDetectTime); 87 _scanTask = Scan(stepFrequency, pauseTime, pauseDetectTime, autoTune);
88 } 88 }
89   89  
Line 99... Line 99...
99 await _scanTask; 99 await _scanTask;
100 _scanTask = null; 100 _scanTask = null;
101 } 101 }
102 } 102 }
Line 103... Line 103...
103   103  
104 private async Task Scan(int stepFrequency, int pauseTime) 104 private async Task Scan(int stepFrequency, int pauseTime, bool autoTune)
105 { 105 {
106 if (!_serialPort.IsOpen) 106 if (!_serialPort.IsOpen)
107 { 107 {
108 _serialPort.Open(); 108 _serialPort.Open();
Line 130... Line 130...
130 { 130 {
131 soundPlayer.Play(); 131 soundPlayer.Play();
132 await _catAssemblies.CatWriteAsync<int>("FA", new object[] { _currentFrequency }, _scanningCancellationToken); 132 await _catAssemblies.CatWriteAsync<int>("FA", new object[] { _currentFrequency }, _scanningCancellationToken);
133 } 133 }
Line -... Line 134...
-   134  
-   135 if (autoTune)
-   136 {
-   137 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNER_ON }, _scanningCancellationToken);
-   138  
-   139 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNING_START }, _scanningCancellationToken);
-   140 }
134   141  
Line 135... Line 142...
135 await taskCompletionSource.Task; 142 await taskCompletionSource.Task;
136   143  
137 _currentFrequency = _currentFrequency + stepFrequency; 144 _currentFrequency = _currentFrequency + stepFrequency;
Line 161... Line 168...
161 _serialPort.DiscardInBuffer(); 168 _serialPort.DiscardInBuffer();
162 } 169 }
163 } 170 }
164 } 171 }
Line 165... Line 172...
165   172  
166 private async Task Scan(int stepFrequency, int pauseTime, int pauseDetectTime) 173 private async Task Scan(int stepFrequency, int pauseTime, int pauseDetectTime, bool autoTune)
167 { 174 {
168 if (!_serialPort.IsOpen) 175 if (!_serialPort.IsOpen)
169 { 176 {
170 _serialPort.Open(); 177 _serialPort.Open();
Line 192... Line 199...
192 { 199 {
193 soundPlayer.Play(); 200 soundPlayer.Play();
194 await _catAssemblies.CatWriteAsync<int>("FA", new object[] { _currentFrequency }, _scanningCancellationToken); 201 await _catAssemblies.CatWriteAsync<int>("FA", new object[] { _currentFrequency }, _scanningCancellationToken);
195 } 202 }
Line -... Line 203...
-   203  
-   204 if(autoTune)
-   205 {
-   206 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNER_ON }, _scanningCancellationToken);
-   207  
-   208 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNING_START }, _scanningCancellationToken);
-   209 }
196   210  
197 using (var memoryStream = new MemoryStream()) 211 using (var memoryStream = new MemoryStream())
198 { 212 {
Line 199... Line 213...
199 _serialPort.DiscardInBuffer(); 213 _serialPort.DiscardInBuffer();