HamBook – Diff between revs 46 and 50

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 46 Rev 50
Line 112... Line 112...
112 { 112 {
113 _sparkle.StartLoop(true, true); 113 _sparkle.StartLoop(true, true);
Line 114... Line 114...
114   114  
Line 115... Line 115...
115 Configuration = await LoadConfiguration(); 115 Configuration = await LoadConfiguration();
Line 116... Line 116...
116   116  
Line 117... Line 117...
117 _memoryBanks = Radios.Generic.MemoryBanks.Create(Configuration.Radio); 117 _memoryBanks = MemoryBanks.Create(Configuration.Radio);
Line -... Line 118...
-   118  
118   119 _serialPort = InitializeSerialPort(Configuration);
119 _serialPort = InitializeSerialPort(Configuration); 120  
120   121 _catAssemblies = InitializeAssemblies(_serialPort);
121 _catAssemblies = InitializeAssemblies(_serialPort); 122  
122   123 // Initialize power state.
Line 138... Line 139...
138 catch(Exception exception) 139 catch(Exception exception)
139 { 140 {
140 Log.Error(exception, Resources.Failed_to_read_power_state); 141 Log.Error(exception, Resources.Failed_to_read_power_state);
141 } 142 }
Line -... Line 143...
-   143  
142   144 // Initialize memory banks.
143 var memoryBankQueue = new ConcurrentQueue<string>(); 145 var memoryBankQueue = new ConcurrentQueue<string>();
Line 144... Line 146...
144 var memoryBankTaskCompletionSource = new TaskCompletionSource<bool>(); 146 var memoryBankTaskCompletionSource = new TaskCompletionSource<bool>();
145   147  
Line 197... Line 199...
197 { 199 {
198 System.Windows.Forms.Application.Idle -= IdleHandler; 200 System.Windows.Forms.Application.Idle -= IdleHandler;
Line 199... Line 201...
199   201  
200 Log.Error(exception, Resources.Unable_to_read_memory_banks); 202 Log.Error(exception, Resources.Unable_to_read_memory_banks);
-   203 }
-   204  
-   205 // Initialize lock state.
-   206 try
-   207 {
-   208 var lockState = await _catAssemblies.CatReadAsync<LockState>("LK", new object[] { }, _cancellationToken);
-   209 switch(lockState)
-   210 {
-   211 case LockState.OFF:
-   212 lockToolStripMenuItem.Checked = false;
-   213 break;
-   214 case LockState.ON:
-   215 lockToolStripMenuItem.Checked = true;
-   216 break;
-   217 }
-   218 }
-   219 catch (Exception exception)
-   220 {
-   221 Log.Error(exception, Resources.Failed_to_read_lock_state);
201 } 222 }
Line 202... Line 223...
202 } 223 }
203   224  
204 private async void quitToolStripMenuItem_Click(object sender, EventArgs e) 225 private async void quitToolStripMenuItem_Click(object sender, EventArgs e)
Line 734... Line 755...
734 } 755 }
735 catch (Exception exception) 756 catch (Exception exception)
736 { 757 {
737 Log.Error(exception, Resources.Failed_to_read_split_state); 758 Log.Error(exception, Resources.Failed_to_read_split_state);
738 } 759 }
-   760  
-   761 try
-   762 {
-   763 var lockState = await _catAssemblies.CatReadAsync<LockState>("LK", new object[] { }, _cancellationToken);
-   764 switch (lockState)
-   765 {
-   766 case LockState.OFF:
-   767 lockToolStripMenuItem.Checked = false;
-   768 break;
-   769 case LockState.ON:
-   770 lockToolStripMenuItem.Checked = true;
-   771 break;
-   772 }
-   773 }
-   774 catch (Exception exception)
-   775 {
-   776 Log.Error(exception, Resources.Failed_to_read_lock_state);
-   777 }
739 } 778 }
Line 740... Line 779...
740   779  
741 private void spectrogramToolStripMenuItem_Click(object sender, EventArgs e) 780 private void spectrogramToolStripMenuItem_Click(object sender, EventArgs e)
742 { 781 {
Line 1457... Line 1496...
1457 catch (Exception exception) 1496 catch (Exception exception)
1458 { 1497 {
1459 Log.Error(exception, Resources.Unable_to_swap_VFO_A_and_VFO_B); 1498 Log.Error(exception, Resources.Unable_to_swap_VFO_A_and_VFO_B);
1460 } 1499 }
1461 } 1500 }
-   1501  
-   1502 private async void lockToolStripMenuItem_CheckStateChanged(object sender, EventArgs e)
-   1503 {
-   1504 var toolStripMenuItem = (ToolStripMenuItem)sender;
-   1505 try
-   1506 {
-   1507 LockState state;
-   1508 switch (toolStripMenuItem.Checked)
-   1509 {
-   1510 case true:
-   1511 state = LockState.ON;
-   1512 break;
-   1513 default:
-   1514 state = LockState.OFF;
-   1515 break;
-   1516 }
-   1517  
-   1518 if (!await _catAssemblies.CatSetAsync<LockState, bool>("LK", new object[] { state }, _cancellationToken))
-   1519 {
-   1520 Log.Error(Resources.Failed_to_set_lock_state);
-   1521 }
-   1522 }
-   1523 catch (Exception exception)
-   1524 {
-   1525 Log.Error(exception, Resources.Failed_to_read_lock_state);
-   1526 }
-   1527 }
1462 } 1528 }
1463 } 1529 }