From 3445c08e8c92ec9df5157a90abb4862ef26acfd7 Mon Sep 17 00:00:00 2001
From: xu <pxzleo@126.com>
Date: Tue, 5 May 2020 14:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=A2=91=E7=8E=87=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4LDE=E6=A8=A1=E5=BC=8F=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/ControlPanelViewModel.cs             |  4 ++--
 Plane.FormationCreator/Views/ModifyTaskView.xaml    | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs b/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
index a9e8f3d..6791ae6 100644
--- a/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
+++ b/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
@@ -1513,8 +1513,8 @@ namespace Plane.FormationCreator.ViewModels
             {
                 Color color = (Color)ColorConverter.ConvertFromString("#" + ledInfo.LEDRGB);
                 int ledMode = ledInfo.LEDMode;
-                //拉烟任务模式ID是50，需要改为50
-                if (ledMode == 11) ledMode = 50;
+                //老版本是8，新版是11 拉烟任务模式ID是50，需要改为50
+                if (ledMode == 8) ledMode = 50;
                 IMission LEDMission = Mission.CreateLEDControlMission(
                         (int)(ledInfo.Delay * 10),
                         ledMode,
diff --git a/Plane.FormationCreator/Views/ModifyTaskView.xaml b/Plane.FormationCreator/Views/ModifyTaskView.xaml
index 8304910..f3ea3b2 100644
--- a/Plane.FormationCreator/Views/ModifyTaskView.xaml
+++ b/Plane.FormationCreator/Views/ModifyTaskView.xaml
@@ -457,6 +457,7 @@
                             <Button Content="测试/停止" VerticalAlignment="Center"
                                     Margin="0,5,5,0"
                                     Grid.Column="2"
+                                     Visibility="Collapsed"
                                     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="拉烟"/>
 
                                     </ComboBox>
@@ -521,9 +519,10 @@
                                                          ToolTip="单位:秒，最小设置0.1秒"
                                                          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"
-                                              ToolTip="单位:秒，最小设置0.1秒"
+                                              ToolTip="单位:HZ，最小设置1HZ"
+                                            
                                                          Text="{Binding Path=LEDInterval, UpdateSourceTrigger=PropertyChanged}" />
 
                                     <TextBlock Text="颜色"  Margin="12,0,0,0" VerticalAlignment="Center"></TextBlock>