HamBook – Diff between revs 36 and 39

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 36 Rev 39
Line 67... Line 67...
67   67  
68 _scanThread = new Thread(new ParameterizedThreadStart(Scan)); 68 _scanThread = new Thread(new ParameterizedThreadStart(Scan));
69 _scanThread.Start(new BandScanParameters(stepFrequency, pauseTime, pauseDetectTime, autoTune)); 69 _scanThread.Start(new BandScanParameters(stepFrequency, pauseTime, pauseDetectTime, autoTune));
Line 70... Line 70...
70 } 70 }
71   71  
72 public async Task Stop() 72 public void Stop()
73 { 73 {
74 if (_scanThread != null) 74 if (_scanThread != null)
75 { 75 {
Line 104... Line 104...
104 var taskCompletionSource = new TaskCompletionSource<bool>(); 104 var taskCompletionSource = new TaskCompletionSource<bool>();
Line 105... Line 105...
105   105  
106 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav"))) 106 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav")))
107 { 107 {
-   108 soundPlayer.Play();
108 soundPlayer.Play(); 109  
109 await _catAssemblies.CatWriteAsync<int>("FA", new object[] { _currentFrequency }, _scanningCancellationToken); 110 await _catAssemblies.CatWriteAsync<int>("FA", new object[] { _currentFrequency }, _scanningCancellationToken);
Line 110... Line 111...
110 } 111 }
111   112  
112 if (bandScanParameters.AutoTune) 113 if (bandScanParameters.AutoTune)
Line -... Line 114...
-   114 {
-   115 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNER_ON }, _scanningCancellationToken);
-   116  
-   117 do
-   118 {
-   119 await Task.Delay(TimeSpan.FromSeconds(1), _scanningCancellationToken);
-   120  
-   121 try
-   122 {
-   123 var tuneState = await _catAssemblies.CatReadAsync<TunerState>("AC", new object[] { }, _scanningCancellationToken);
-   124  
-   125 if (tuneState != TunerState.TUNER_ON)
-   126 {
-   127 break;
-   128 }
-   129 }
-   130 catch (Exception)
-   131 {
-   132 // retry
-   133 }
113 { 134  
Line 114... Line 135...
114 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNER_ON }, _scanningCancellationToken); 135 } while (!_scanningCancellationToken.IsCancellationRequested);
115   136  
116 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNING_START }, _scanningCancellationToken); 137 await _catAssemblies.CatWriteAsync<TunerState>("AC", new object[] { TunerState.TUNING_START }, _scanningCancellationToken);
Line 117... Line 138...
117   138  
118 do 139 do
119 { 140 {
-   141 await Task.Delay(TimeSpan.FromSeconds(1), _scanningCancellationToken);
-   142  
120 await Task.Delay(TimeSpan.FromSeconds(1), _scanningCancellationToken); 143 try
121   144 {
122 try 145 var tuneState = await _catAssemblies.CatReadAsync<TunerState>("AC", new object[] { }, _scanningCancellationToken);
123 { 146  
124 if (await _catAssemblies.CatReadAsync<TunerState>("AC", new object[] { }, _scanningCancellationToken) != TunerState.TUNING_START) 147 if (tuneState != TunerState.TUNING_START)