Skip to content

T
Thick-Common
Commit 3e8a249d authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

AD盒输出扩展到8位

parent 97495615
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 13 deletions
Project.FLY.FlyADBase/FLYAD7_Simulation_Wpf/App.xaml.cs
View file @ 3e8a249d
...@@ -34,10 +34,10 @@ namespace FLYAD7_Simulation_Wpf ...@@ -34,10 +34,10 @@ namespace FLYAD7_Simulation_Wpf
{ {
this.MainWindow = new MainWindow(); this.MainWindow = new MainWindow();
Misc.Ver ver = new Misc.Ver(); //Misc.Ver ver = new Misc.Ver();
ver.SrcType = this.GetType(); //ver.SrcType = this.GetType();
this.MainWindow.Title = ver.ToString(); //this.MainWindow.Title = ver.ToString();
notifyiconhelper = new FLY.AppHelper.WindowNotifyIconHelper(this.MainWindow, this.MainWindow.Title); notifyiconhelper = new FLY.AppHelper.WindowNotifyIconHelper(this.MainWindow, this.MainWindow.Title);
this.MainWindow.Show(); this.MainWindow.Show();
}; };
......
Project.FLY.FlyADBase/FlyADBase/FlyADClientAdv.cs
View file @ 3e8a249d
...@@ -178,7 +178,7 @@ namespace FlyADBase ...@@ -178,7 +178,7 @@ namespace FlyADBase
/// <param name="is1"></param> /// <param name="is1"></param>
public void SetOutputBit(int index, bool is1) public void SetOutputBit(int index, bool is1)
{ {
if (index > 4) if (index > 15)//4)
return; return;
if (index < 0) if (index < 0)
return; return;
......
Project.FLY.FlyADBase/Flyad7_WPF/Converters/BinConverter.cs
View file @ 3e8a249d
...@@ -28,11 +28,11 @@ namespace Flyad7_WPF.Converters ...@@ -28,11 +28,11 @@ namespace Flyad7_WPF.Converters
UInt16 v = (UInt16)value; UInt16 v = (UInt16)value;
if (Misc.MyBase.CHECKBIT(v, index)) if (Misc.MyBase.CHECKBIT(v, index))
{ {
return 1; return "On";
} }
else else
{ {
return 0; return "Off";
} }
} }
......
Project.FLY.FlyADBase/Flyad7_WPF/MainWindow.xaml
View file @ 3e8a249d
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<ColumnDefinition Width="573*" /> <ColumnDefinition Width="573*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Name="grid_param"/> <Grid Name="grid_param"/>
<Grid Name="grid_viewModel"/>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<GroupBox Margin="5" Name="groupBox2" > <GroupBox Margin="5" Name="groupBox2" >
<GroupBox.Header> <GroupBox.Header>
...@@ -132,10 +132,11 @@ ...@@ -132,10 +132,11 @@
<TextBox Style="{StaticResource TextBoxStyle_itemContent}" Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource ResourceKey=io2bin}}" IsEnabled="False" Width="120" /> <TextBox Style="{StaticResource TextBoxStyle_itemContent}" Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource ResourceKey=io2bin}}" IsEnabled="False" Width="120" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button Style="{StaticResource ButtonStyle}" Content="输出设置" Click="button_output_Click" /> <Button Style="{StaticResource ButtonStyle}" Content="输出设置" Click="button_output_Click" />
<TextBox Style="{StaticResource TextBoxStyle_itemContent}" Name="textbox_output" /> <TextBox Style="{StaticResource TextBoxStyle_itemContent}" Name="textbox_output" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel>
<StackPanel.Resources> <StackPanel.Resources>
<Style TargetType="Button" x:Key="ButtonStyle_Bit"> <Style TargetType="Button" x:Key="ButtonStyle_Bit">
<Setter Property="Height" Value="30"/> <Setter Property="Height" Value="30"/>
...@@ -143,11 +144,57 @@ ...@@ -143,11 +144,57 @@
<Setter Property="Margin" Value="3"/> <Setter Property="Margin" Value="3"/>
</Style> </Style>
</StackPanel.Resources> </StackPanel.Resources>
<Button Style="{StaticResource ButtonStyle_Bit}" x:Name="button_bit3" Content="{Binding OStatus,Converter={StaticResource binConv}, ConverterParameter=3}" Tag="3" Click="button_setbit_Click" /> <StackPanel Orientation="Horizontal">
<Button Style="{StaticResource ButtonStyle_Bit}" x:Name="button_bit2" Content="{Binding OStatus,Converter={StaticResource binConv}, ConverterParameter=2}" Tag="2" Click="button_setbit_Click" /> <Button Style="{StaticResource ButtonStyle_Bit}" Tag="0" Click="button_setbit_Click">
<Button Style="{StaticResource ButtonStyle_Bit}" x:Name="button_bit1" Content="{Binding OStatus,Converter={StaticResource binConv}, ConverterParameter=1}" Tag="1" Click="button_setbit_Click" /> <TextBlock>
<Button Style="{StaticResource ButtonStyle_Bit}" x:Name="button_bit0" Content="{Binding OStatus,Converter={StaticResource binConv}, ConverterParameter=0}" Tag="0" Click="button_setbit_Click" /> 1(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=0}"/>)
</TextBlock>
</Button>
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="1" Click="button_setbit_Click">
<TextBlock>
2(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=1}"/>)
</TextBlock>
</Button>
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="2" Click="button_setbit_Click">
<TextBlock>
3(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=2}"/>)
</TextBlock>
</Button>
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="3" Click="button_setbit_Click">
<TextBlock>
4(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=3}"/>)
</TextBlock>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="4" Click="button_setbit_Click">
<TextBlock>
5(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=4}"/>)
</TextBlock>
</Button>
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="5" Click="button_setbit_Click">
<TextBlock>
6(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=5}"/>)
</TextBlock>
</Button>
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="6" Click="button_setbit_Click">
<TextBlock>
7(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=6}"/>)
</TextBlock>
</Button>
<Button Style="{StaticResource ButtonStyle_Bit}" Tag="7" Click="button_setbit_Click">
<TextBlock>
8(<Run Text="{Binding OStatus,Mode=OneWay,Converter={StaticResource binConv}, ConverterParameter=7}"/>)
</TextBlock>
</Button>
</StackPanel>
<Button Style="{StaticResource ButtonStyle}" Click="btnAutoOutClick" >
<TextBlock>
走马灯(<Run Text="{Binding ElementName=grid_viewModel,Path=DataContext.IsAutoOutRunning,Mode=OneWay}"/>)
</TextBlock>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>
......
Project.FLY.FlyADBase/Flyad7_WPF/MainWindow.xaml.cs
View file @ 3e8a249d
...@@ -63,7 +63,7 @@ namespace Flyad7_WPF ...@@ -63,7 +63,7 @@ namespace Flyad7_WPF
this.DataContext = flyad; this.DataContext = flyad;
this.grid_viewModel.DataContext = this;
this.grid_param.DataContext = param; this.grid_param.DataContext = param;
this.groupBox_fb.DataContext = autofb; this.groupBox_fb.DataContext = autofb;
this.groupBox_adpos.DataContext = flyad_clientui; this.groupBox_adpos.DataContext = flyad_clientui;
...@@ -608,6 +608,40 @@ namespace Flyad7_WPF ...@@ -608,6 +608,40 @@ namespace Flyad7_WPF
MessageBox.Show($"成功保存到 {path}"); MessageBox.Show($"成功保存到 {path}");
} }
DispatcherTimer timer = new DispatcherTimer();
bool isTimerInited = false;
public int OutIdx { get; private set; }
public bool IsAutoOutRunning { get; private set; }
void TimerInit() {
timer.Tick += (s, e) =>
{
flyad.SetOutputBit(OutIdx, true);
OutIdx += 1;
if (OutIdx > 7)
OutIdx = 0;
flyad.SetOutputBit(OutIdx, false);
};
timer.Interval = TimeSpan.FromSeconds(1);
}
private void btnAutoOutClick(object sender, RoutedEventArgs e)
{
if (!isTimerInited) {
TimerInit();
}
if (timer.IsEnabled)
{
timer.Stop();
IsAutoOutRunning = false;
}
else {
timer.Start();
IsAutoOutRunning = true;
}
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment