-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Yak52 radio and significant radio code refactoring (#351)
* vhf radio added to pz69 * Front and rear ADF added. Optimized usage imports in solution. * Imports optimized * Yak-52 GMK and refactoring Radios now display what mode they are in after the first report. Clicking, turning any dial will do this. Refactored radio OO structure for this to work and some syntax refactoring overall done. * Update DCSFPOpenMacroBoardMetaProject * Added ClickSkipper to all radio classes. * ClickSkipper.Click(dcsbiosCommand) now used in radios to lessen code
- Loading branch information
Showing
58 changed files
with
2,701 additions
and
3,151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
Source/ControlReference/UserControls/DCSBIOSControlUserControl.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| using System; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Linq; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| using System.Diagnostics; | ||
| using DCS_BIOS.Json; | ||
| using DCS_BIOS.Json; | ||
|
|
||
| namespace DCS_BIOS | ||
| { | ||
|
|
||
Submodule DCSFPOpenMacroBoardMetaProject
updated
from 106295 to b8cc26
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
Source/DCSFlightpanels/Radios/PreProgrammed/RadioPanelPZ69UserControlYak52.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| <panelUserControls:UserControlBase x:Class="DCSFlightpanels.Radios.PreProgrammed.RadioPanelPZ69UserControlYak52" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:panelUserControls="clr-namespace:DCSFlightpanels.PanelUserControls" | ||
| mc:Ignorable="d" | ||
| d:DesignHeight="750" d:DesignWidth="1000" Loaded="RadioPanelPZ69UserControlYak52_OnLoaded"> | ||
| <Grid> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="240" /> | ||
| <RowDefinition Height="1*" /> | ||
| <RowDefinition Height="1*" /> | ||
| <RowDefinition Height="1*" /> | ||
| <RowDefinition Height="1*" /> | ||
| <RowDefinition Height="1*" /> | ||
| <RowDefinition Height="1*" /> | ||
| </Grid.RowDefinitions> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="80*" /> | ||
| <ColumnDefinition Width="80"/> | ||
| <ColumnDefinition Width="80*" /> | ||
| <ColumnDefinition Width="80*"/> | ||
| <ColumnDefinition Width="80*"/> | ||
| <ColumnDefinition Width="97*" /> | ||
| <ColumnDefinition Width="301*" /> | ||
| </Grid.ColumnDefinitions> | ||
| <Canvas HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="5"> | ||
| <Image Height="226" Stretch="None" Source="/dcsfp;component/Images/PZ69_Radiopanel_Transp.png" /> | ||
|
|
||
| <!-- UPPER LEFT SELECTOR --> | ||
| <Image Height="76" Name="TopLeftCom1" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="65" Canvas.Top="34" /> | ||
| <Image Height="76" Name="TopLeftCom2" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="54" Canvas.Top="36" /> | ||
| <Image Height="76" Name="TopLeftNav1" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="46" Canvas.Top="45" /> | ||
| <Image Height="76" Name="TopLeftNav2" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="43" Canvas.Top="57" /> | ||
| <Image Height="76" Name="TopLeftADF" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="46" Canvas.Top="69" /> | ||
| <Image Height="76" Name="TopLeftDME" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="56" Canvas.Top="77" /> | ||
| <Image Height="76" Name="TopLeftXPDR" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="66" Canvas.Top="81" /> | ||
|
|
||
| <!-- LOWER LEFT SELECTOR --> | ||
| <Image Height="76" Name="LowerLeftCom1" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="65" Canvas.Top="112" /> | ||
| <Image Height="76" Name="LowerLeftCom2" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="54" Canvas.Top="114" /> | ||
| <Image Height="76" Name="LowerLeftNav1" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="45" Canvas.Top="122" /> | ||
| <Image Height="76" Name="LowerLeftNav2" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="43" Canvas.Top="134" /> | ||
| <Image Height="76" Name="LowerLeftADF" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="46" Canvas.Top="147" /> | ||
| <Image Height="76" Name="LowerLeftDME" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="56" Canvas.Top="156" /> | ||
| <Image Height="76" Name="LowerLeftXPDR" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="66" Canvas.Top="159" /> | ||
|
|
||
| <!-- UPPER LCD KNOB --> | ||
| <Image Height="76" Name="UpperSmallerLCDKnobInc" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="484" Canvas.Top="60" /> | ||
| <Image Height="76" Name="UpperSmallerLCDKnobDec" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="469" Canvas.Top="60" /> | ||
| <Image Height="76" Name="UpperLargerLCDKnobInc" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="498" Canvas.Top="60" /> | ||
| <Image Height="76" Name="UpperLargerLCDKnobDec" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="447" Canvas.Top="60" /> | ||
|
|
||
| <!-- LOWER LCD KNOB --> | ||
| <Image Height="76" Name="LowerSmallerLCDKnobInc" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="484" Canvas.Top="136" /> | ||
| <Image Height="76" Name="LowerSmallerLCDKnobDec" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="469" Canvas.Top="136" /> | ||
| <Image Height="76" Name="LowerLargerLCDKnobInc" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="498" Canvas.Top="136" /> | ||
| <Image Height="76" Name="LowerLargerLCDKnobDec" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="447" Canvas.Top="136" /> | ||
|
|
||
| <!-- Right Switches --> | ||
| <Image Height="76" Name="UpperRightSwitch" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="562" Canvas.Top="58" /> | ||
| <Image Height="76" Name="LowerRightSwitch" Source="/dcsfp;component/Images/dot.jpg" Stretch="None" Canvas.Left="562" Canvas.Top="131" /> | ||
|
|
||
| <Button Name="ButtonGetIdentify" Content="Identify" HorizontalAlignment="Left" VerticalAlignment="Top" Width="76" Canvas.Left="430" Canvas.Top="12" Click="ButtonGetIdentify_OnClick"/> | ||
| <Button Name="ButtonGetId" Content="ID" HorizontalAlignment="Left" VerticalAlignment="Top" Width="76" Canvas.Left="520" Canvas.Top="12" Click="ButtonGetId_OnClick"/> | ||
| </Canvas> | ||
| <GroupBox Header="Selector Knobs" Name="GroupUpperSelectorKnob" FontSize="14" FontWeight="Bold" Grid.Column="0" Grid.Row="1" Grid.RowSpan="3" Grid.ColumnSpan="3" > | ||
| <StackPanel > | ||
| <TextBlock FontSize="10" FontWeight="Bold"> | ||
| COM 1 VHF = <LineBreak/> | ||
| <TextBlock Margin="15,0,0,0"> | ||
| Large Dial : Mhz Dial | ||
| <LineBreak/> | ||
| Small Dial : Khz Dial | ||
| <LineBreak/> | ||
| ACT/STBY + Small Dial : Volume | ||
| <LineBreak/> | ||
| ACT/STBY : Squelch ON/OFF | ||
| <LineBreak/> | ||
| </TextBlock> | ||
| </TextBlock> | ||
| <TextBlock FontSize="10" FontWeight="Bold"> | ||
| ADF : FRONT ADF = <LineBreak/> | ||
| <TextBlock Margin="15,0,0,0"> | ||
| Large Dial : Volume | ||
| <LineBreak/> | ||
| Small Dial : Channel | ||
| <LineBreak/> | ||
| </TextBlock> | ||
| </TextBlock> | ||
| <TextBlock FontSize="10" FontWeight="Bold"> | ||
| DME : REAR ADF = <LineBreak/> | ||
| <TextBlock Margin="15,0,0,0"> | ||
| Large Dial : Volume | ||
| <LineBreak/> | ||
| Small Dial : Channel | ||
| <LineBreak/> | ||
| </TextBlock> | ||
| </TextBlock> | ||
| </StackPanel> | ||
| </GroupBox> | ||
|
|
||
| <GroupBox Header="Settings" FontSize="10" FontWeight="Bold" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3" Grid.RowSpan="2" > | ||
| <StackPanel > | ||
| <Label Content="Frequency Knobs sensitivity"></Label> | ||
| <ComboBox Name="ComboBoxFreqKnobSensitivity" Width="100" HorizontalAlignment="Left" Margin="5,5,0,0" SelectedIndex="0" SelectedValuePath="Content" IsReadOnly="True" SelectionChanged="ComboBoxFreqKnobSensitivity_OnSelectionChanged"> | ||
| <ComboBoxItem >0</ComboBoxItem> | ||
| <ComboBoxItem >-1</ComboBoxItem> | ||
| <ComboBoxItem >-2</ComboBoxItem> | ||
| </ComboBox> | ||
| <Label Content="ACT to STBY transfer of freq. delay (ms)"></Label> | ||
| <ComboBox Name="ComboBoxSyncOKDelayTimeout" Width="100" HorizontalAlignment="Left" Margin="5,5,0,0" SelectedIndex="0" SelectedValuePath="Content" IsReadOnly="True" SelectionChanged="ComboBoxSyncOKDelayTimeout_OnSelectionChanged"> | ||
| <ComboBoxItem >1000</ComboBoxItem> | ||
| <ComboBoxItem >1500</ComboBoxItem> | ||
| <ComboBoxItem >2000</ComboBoxItem> | ||
| <ComboBoxItem >2500</ComboBoxItem> | ||
| <ComboBoxItem >3000</ComboBoxItem> | ||
| <ComboBoxItem >3500</ComboBoxItem> | ||
| <ComboBoxItem >4000</ComboBoxItem> | ||
| <ComboBoxItem >5000</ComboBoxItem> | ||
| <ComboBoxItem >6000</ComboBoxItem> | ||
| <ComboBoxItem >7000</ComboBoxItem> | ||
| <ComboBoxItem >8000</ComboBoxItem> | ||
| <ComboBoxItem >9000</ComboBoxItem> | ||
| </ComboBox> | ||
| </StackPanel> | ||
| </GroupBox> | ||
|
|
||
| <StackPanel Grid.Column="3" Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="6"> | ||
| <Label Content="Radio" FontWeight="Bold"/> | ||
| <Image Height="300" Source="/dcsfp;component/Images/YAK52_VHF.jpg" /> | ||
| </StackPanel> | ||
| <StackPanel Grid.Column="6" Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="5"> | ||
| <Label Name="LabelAirframe" Content="Yak-52" FontSize="30" FontWeight="Bold" Grid.Column="4" Grid.Row="0"/> | ||
| <Label Content="ADF" FontWeight="Bold"/> | ||
| <Image Height="300" Source="/dcsfp;component/Images/YAK52_ADF.jpg" /> | ||
| </StackPanel> | ||
| <DockPanel Grid.Column="6" Grid.Row="4" Grid.RowSpan="3" > | ||
| <GroupBox DockPanel.Dock="Bottom" Header="Log" FontSize="10" Margin="0,0.5,0,-1"> | ||
| <TextBox x:Name="TextBoxLogPZ69" VerticalScrollBarVisibility="Visible" VerticalAlignment="Stretch" TextWrapping="Wrap" HorizontalAlignment="Stretch" Height="140"/> | ||
| </GroupBox> | ||
| </DockPanel> | ||
| </Grid> | ||
| </panelUserControls:UserControlBase> |
Oops, something went wrong.