group/Plane.FormationCreator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

改为频率，调整LDE模式顺序，隐藏测试功能

Browse Source
This commit is contained in:
xu 2020-05-05 14:55:49 +08:00
parent 59b4669a7d
commit 3445c08e8c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
View File

@ -1513,8 +1513,8 @@ namespace Plane.FormationCreator.ViewModels
{ {
Color color = (Color)ColorConverter.ConvertFromString("#" + ledInfo.LEDRGB); Color color = (Color)ColorConverter.ConvertFromString("#" + ledInfo.LEDRGB);
int ledMode = ledInfo.LEDMode; int ledMode = ledInfo.LEDMode;
//拉烟任务模式ID是50，需要改为50 //老版本是8，新版是11 拉烟任务模式ID是50，需要改为50
if (ledMode == 11) ledMode = 50; if (ledMode == 8) ledMode = 50;
IMission LEDMission = Mission.CreateLEDControlMission( IMission LEDMission = Mission.CreateLEDControlMission(
(int)(ledInfo.Delay * 10), (int)(ledInfo.Delay * 10),
ledMode, ledMode,

13
Plane.FormationCreator/Views/ModifyTaskView.xaml
View File

@ -457,6 +457,7 @@
<Button Content="测试/停止" VerticalAlignment="Center" <Button Content="测试/停止" VerticalAlignment="Center"
Margin="0,5,5,0" Margin="0,5,5,0"
Grid.Column="2" Grid.Column="2"
Visibility="Collapsed"
Command="{Binding TestCopterLEDCommand}" Command="{Binding TestCopterLEDCommand}"
/> />
@ -504,14 +505,11 @@
<ComboBoxItem Content="常亮" /> <ComboBoxItem Content="常亮" />
<ComboBoxItem Content="同步闪烁(单色)" /> <ComboBoxItem Content="同步闪烁(单色)" />
<ComboBoxItem Content="异步闪烁(随机)" /> <ComboBoxItem Content="异步闪烁(随机)" />
<ComboBoxItem Content="同步闪烁(随机)" />
<ComboBoxItem Content="异步闪烁(单色)" />
<ComboBoxItem Content="渐亮" /> <ComboBoxItem Content="渐亮" />
<ComboBoxItem Content="渐暗" /> <ComboBoxItem Content="渐暗" />
<ComboBoxItem Content="呼吸灯(单色)" /> <ComboBoxItem Content="呼吸灯(单色)" />
<ComboBoxItem Content="呼吸灯(随机)" /> <ComboBoxItem Content="同步闪烁(随机)" />
<ComboBoxItem Content="异步呼吸(单色)" /> <ComboBoxItem Content="异步闪烁(单色)" />
<ComboBoxItem Content="异步呼吸(随机)" />
<ComboBoxItem Content="拉烟"/> <ComboBoxItem Content="拉烟"/>
</ComboBox> </ComboBox>
@ -521,9 +519,10 @@
ToolTip="单位:秒，最小设置0.1秒" ToolTip="单位:秒，最小设置0.1秒"
Text="{Binding Delay,UpdateSourceTrigger=PropertyChanged}" /> Text="{Binding Delay,UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Text="间隔" Margin="12,0,0,0" VerticalAlignment="Center"></TextBlock> <TextBlock Text="频率" Margin="12,0,0,0" VerticalAlignment="Center"></TextBlock>
<TextBox Height="25" MinWidth="35" MaxWidth="40" Margin="5,0,0,0" <TextBox Height="25" MinWidth="35" MaxWidth="40" Margin="5,0,0,0"
ToolTip="单位:秒，最小设置0.1秒" ToolTip="单位:HZ，最小设置1HZ"
Text="{Binding Path=LEDInterval, UpdateSourceTrigger=PropertyChanged}" /> Text="{Binding Path=LEDInterval, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Text="颜色" Margin="12,0,0,0" VerticalAlignment="Center"></TextBlock> <TextBlock Text="颜色" Margin="12,0,0,0" VerticalAlignment="Center"></TextBlock>