HamBook – Diff between revs 35 and 36

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 35 Rev 36
Line 578... Line 578...
578 _bandScan.Start(step, pause, scanDetectPause, toolStripMenuItem16.Checked); 578 _bandScan.Start(step, pause, scanDetectPause, toolStripMenuItem16.Checked);
Line 579... Line 579...
579   579  
580 return; 580 return;
Line 581... Line 581...
581 } 581 }
582   582  
Line 583... Line 583...
583 _bandScan.Start(step, pause, toolStripMenuItem16.Checked); 583 _bandScan.Start(step, pause, 0, toolStripMenuItem16.Checked);
584 } 584 }
585   585  
586 private void modeToolStripMenuItem_DropDownOpening(object sender, EventArgs e) 586 private async void modeToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
587 { -  
588 Task.Delay(TimeSpan.FromSeconds(1), _cancellationToken).ContinueWith(async task => -  
589 { 587 {
Line 590... Line 588...
590 try 588 try
591 { -  
592 var mode = await _catAssemblies.CatReadAsync<RadioMode>("MD", new object[] { }, _cancellationToken); -  
593   -  
594 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => -  
595 { -  
596 toolStripComboBox1.Text = mode; 589 {
-   590 var mode = await _catAssemblies.CatReadAsync<RadioMode>("MD", new object[] { }, _cancellationToken);
-   591  
-   592 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
-   593 {
-   594 toolStripComboBox1.Text = mode;
597 }); 595 });
598 } 596 }
Line 599... Line 597...
599 catch (Exception exception) 597 catch (Exception exception)
-   598 {
-   599 Log.Error(exception, Resources.Failed_to_read_radio_mode);
-   600 }
-   601  
600 { 602 try
601 Log.Error(exception, Resources.Failed_to_read_radio_mode); 603 {
Line 602... Line -...
602 } -  
603   604 var fa = await _catAssemblies.CatReadAsync<int>("FA", new object[] { }, _cancellationToken);
604 try -  
Line 605... Line -...
605 { -  
606 var fa = await _catAssemblies.CatReadAsync<int>("FA", new object[] { }, _cancellationToken); -  
607   605  
608 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 606 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
609 { 607 {
610 scrollableToolStripComboBox1.Text = $"{fa}"; 608 scrollableToolStripComboBox1.Text = $"{fa}";
611   609  
Line 612... Line 610...
612 }); 610 });
-   611  
-   612 }
-   613 catch (Exception exception)
-   614 {
613 615 Log.Error(exception, Resources.Failed_to_read_VFO_A);
614 } 616 }
Line -... Line 617...
-   617  
-   618 try
615 catch (Exception exception) 619 {
616 { 620 var fb = await _catAssemblies.CatReadAsync<int>("FB", new object[] { }, _cancellationToken);
617 Log.Error(exception, Resources.Failed_to_read_VFO_A); 621  
-   622 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
Line 618... Line -...
618 } -  
619   623 {
620 try -  
621 { 624 scrollableToolStripComboBox2.Text = $"{fb}";
622 var fb = await _catAssemblies.CatReadAsync<int>("FB", new object[] { }, _cancellationToken); 625  
623   -  
Line 624... Line 626...
624 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 626 });
625 { 627 }
626 scrollableToolStripComboBox2.Text = $"{fb}"; 628 catch (Exception exception)
Line 627... Line 629...
627   629 {
628 }); 630 Log.Error(exception, Resources.Failed_to_read_VFO_B);
629 } 631 }
-   632  
Line -... Line 633...
-   633 try
-   634 {
630 catch (Exception exception) 635 var mc = await _catAssemblies.CatReadAsync<int>("MC", new object[] { }, _cancellationToken);
631 { 636  
632 Log.Error(exception, Resources.Failed_to_read_VFO_B); 637 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
633 } 638 {
Line 634... Line -...
634   -  
635 try 639 scrollableToolStripComboBox5.Text = $"{mc:000}";
636 { -  
637 var mc = await _catAssemblies.CatReadAsync<int>("MC", new object[] { }, _cancellationToken); 640  
638   641 if (_memoryChannelStore.TryGetValue(mc, out var memoryChannel))
639 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => -  
Line 640... Line 642...
640 { 642 {
641 scrollableToolStripComboBox5.Text = $"{mc:000}"; 643 toolStripMenuItem27.Text = memoryChannel.Text;
642   644 }
Line -... Line 645...
-   645  
-   646 });
643 if(_memoryChannelStore.TryGetValue(mc, out var memoryChannel)) 647 }
644 { 648 catch (Exception exception)
645 toolStripMenuItem27.Text = memoryChannel.Text; 649 {
-   650 Log.Error(exception, Resources.Failed_to_read_memory_channel);
Line 646... Line -...
646 } -  
647   651 }
648 }); -  
649 } 652  
650 catch (Exception exception) 653 try
651 { -  
Line 652... Line 654...
652 Log.Error(exception, Resources.Failed_to_read_memory_channel); 654 {
653 } 655 var pc = await _catAssemblies.CatReadAsync<int>("PC", new object[] { }, _cancellationToken);
654   -  
655 try -  
656 { -  
657 var pc = await _catAssemblies.CatReadAsync<int>("PC", new object[] { }, _cancellationToken); -  
658   656  
Line 659... Line 657...
659 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 657 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
660 { 658 {
661 scrollableToolStripComboBox7.Text = $"{pc}"; 659 scrollableToolStripComboBox7.Text = $"{pc}";
662   660  
663 }); 661 });
664 } 662 }
665 catch (Exception exception) -  
666 { 663 catch (Exception exception)
Line 667... Line 664...
667 Log.Error(exception, Resources.Failed_to_read_power_state); 664 {
668 } 665 Log.Error(exception, Resources.Failed_to_read_power_state);
669   666 }
Line 1231... Line 1228...
1231 _bandScan.Start(step, pause, scanDetectPause, toolStripMenuItem16.Checked); 1228 _bandScan.Start(step, pause, scanDetectPause, toolStripMenuItem16.Checked);
Line 1232... Line 1229...
1232   1229  
1233 return; 1230 return;
Line 1234... Line 1231...
1234 } 1231 }
1235   1232  
Line 1236... Line 1233...
1236 _bandScan.Start(step, pause, toolStripMenuItem16.Checked); 1233 _bandScan.Start(step, pause, 0, toolStripMenuItem16.Checked);
1237 } 1234 }
1238   1235