Skip to content

V
VIZ.GimbalAI.Controller
Commit 733f36f4 by liulongfei
Options

数据上下行逻辑调整

parent f32b61a4
Showing with 196 additions and 58 deletions
VIZ.GimbalAI.Controller.Connection/SerialPort/Gimbal/GimbalPackageDownProvider.cs
...@@ -24,16 +24,16 @@ namespace VIZ.GimbalAI.Controller.Connection ...@@ -24,16 +24,16 @@ namespace VIZ.GimbalAI.Controller.Connection
/// </summary> /// </summary>
/// <param name="fixedBufferSize">包大小</param> /// <param name="fixedBufferSize">包大小</param>
/// <param name="syncHeader">同步针头</param> /// <param name="syncHeader">同步针头</param>
/// <param name="downEndpointManagerKey">下行终结点管理器键</param> /// <param name="upEndpointManagerKey">上行终结点管理器键</param>
public GimbalPackageDownProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string downEndpointManagerKey) : base(fixedBufferSize, syncHeader) public GimbalPackageDownProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string upEndpointManagerKey) : base(fixedBufferSize, syncHeader)
{ {
this.DownEndpointManagerKey = downEndpointManagerKey; this.UpEndpointManagerKey = upEndpointManagerKey;
} }
/// <summary> /// <summary>
/// 下行终结点管理器键 /// 上行行终结点管理器键
/// </summary> /// </summary>
public string DownEndpointManagerKey { get; private set; } public string UpEndpointManagerKey { get; private set; }
/// <summary> /// <summary>
/// 处理器集合 /// 处理器集合
...@@ -46,13 +46,6 @@ namespace VIZ.GimbalAI.Controller.Connection ...@@ -46,13 +46,6 @@ namespace VIZ.GimbalAI.Controller.Connection
/// <param name="info">信息</param> /// <param name="info">信息</param>
protected override void Execute(ConnFixedBufferInfo info) protected override void Execute(ConnFixedBufferInfo info)
{ {
if (info.Buffer.Any(p => p == 0xA5))
{
Debug.WriteLine("-------------------------------------------");
Debug.WriteLine("0xA5");
Debug.WriteLine("-------------------------------------------");
}
// 解析数据 // 解析数据
GimbalPackage_down data = new GimbalPackage_down(); GimbalPackage_down data = new GimbalPackage_down();
data.FromBuffer(info.Buffer); data.FromBuffer(info.Buffer);
...@@ -73,7 +66,7 @@ namespace VIZ.GimbalAI.Controller.Connection ...@@ -73,7 +66,7 @@ namespace VIZ.GimbalAI.Controller.Connection
} }
// 下发数据 // 下发数据
SerialPortEndpointManager manager = ConnectionManager.SerialPortConnection.GetEndpointManager(this.DownEndpointManagerKey); SerialPortEndpointManager manager = ConnectionManager.SerialPortConnection.GetEndpointManager(this.UpEndpointManagerKey);
if (manager == null) if (manager == null)
return; return;
......
VIZ.GimbalAI.Controller.Connection/SerialPort/Gimbal/GimbalPackageUpProvider.cs
...@@ -22,16 +22,16 @@ namespace VIZ.GimbalAI.Controller.Connection ...@@ -22,16 +22,16 @@ namespace VIZ.GimbalAI.Controller.Connection
/// </summary> /// </summary>
/// <param name="fixedBufferSize">包大小</param> /// <param name="fixedBufferSize">包大小</param>
/// <param name="syncHeader">同步针头</param> /// <param name="syncHeader">同步针头</param>
/// <param name="upEndpointManagerKey">上行终结点管理器键</param> /// <param name="downEndpointManagerKey">下行终结点管理器键</param>
public GimbalPackageUpProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string upEndpointManagerKey) : base(fixedBufferSize, syncHeader) public GimbalPackageUpProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string downEndpointManagerKey) : base(fixedBufferSize, syncHeader)
{ {
this.UpEndpointManagerKey = upEndpointManagerKey; this.DownEndpointManagerKey = downEndpointManagerKey;
} }
/// <summary> /// <summary>
/// 上行终结点管理器键 /// 下行终结点管理器键
/// </summary> /// </summary>
public string UpEndpointManagerKey { get; private set; } public string DownEndpointManagerKey { get; private set; }
/// <summary> /// <summary>
/// 处理器集合 /// 处理器集合
...@@ -55,10 +55,12 @@ namespace VIZ.GimbalAI.Controller.Connection ...@@ -55,10 +55,12 @@ namespace VIZ.GimbalAI.Controller.Connection
} }
// 上发数据 // 上发数据
SerialPortEndpointManager manager = ConnectionManager.SerialPortConnection.GetEndpointManager(this.UpEndpointManagerKey); SerialPortEndpointManager manager = ConnectionManager.SerialPortConnection.GetEndpointManager(this.DownEndpointManagerKey);
if (manager == null) if (manager == null)
return; return;
data.Real_Horizontal_Angle = 60;
byte[] buffer = data.ToBuffer(); byte[] buffer = data.ToBuffer();
manager.Send(buffer); manager.Send(buffer);
} }
......
VIZ.GimbalAI.Controller.Module/MainView/View/MainView.xaml
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
d:DesignHeight="850" d:DesignWidth="1200"> d:DesignHeight="850" d:DesignWidth="1200">
<UserControl.Resources> <UserControl.Resources>
<resource:GimbalPackage_down_CheckValueConverter x:Key="GimbalPackage_down_CheckValueConverter"></resource:GimbalPackage_down_CheckValueConverter> <resource:GimbalPackage_down_CheckValueConverter x:Key="GimbalPackage_down_CheckValueConverter"></resource:GimbalPackage_down_CheckValueConverter>
<resource:GimbalPackage_up_CheckValueConverter x:Key="GimbalPackage_up_CheckValueConverter"></resource:GimbalPackage_up_CheckValueConverter>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
<RowDefinition Height="40"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<common:LabelValue Label="命令状态:" Text="{Binding Path=CurrentCommandStatus}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Label="命令状态:" Text1="{Binding Path=CurrentCommandStatus}" Margin="5,0,5,0"></common:LabelValue2>
</Grid> </Grid>
</GroupBox> </GroupBox>
...@@ -59,50 +60,110 @@ ...@@ -59,50 +60,110 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- 状态帧 --> <!-- 状态帧 -->
<common:LabelValue Grid.Row="0" Grid.Column="0" Label="同步帧头1:" Text="{Binding Path=DownData.SyncHead_1}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="0" Grid.Column="0" Label="同步帧头1:"
<common:LabelValue Grid.Row="0" Grid.Column="1" Label="同步帧头2:" Text="{Binding Path=DownData.SyncHead_2}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.SyncHead_1,StringFormat=X6}"
Text2="{Binding Path=DownData.SyncHead_1}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="0" Grid.Column="1" Label="同步帧头2:"
Text1="{Binding Path=DownData.SyncHead_2,StringFormat=X6}"
Text2="{Binding Path=DownData.SyncHead_2}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 命令字 --> <!-- 命令字 -->
<common:LabelValue Grid.Row="1" Grid.Column="0" Label="命令字标记:" Text="{Binding Path=DownData.Command_PN}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="1" Grid.Column="0" Label="命令字标记:"
<common:LabelValue Grid.Row="1" Grid.Column="1" Label="命令字值:" Text="{Binding Path=DownData.Command}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.Command_PN,StringFormat=X6}"
Text2="{Binding Path=DownData.Command_PN}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="1" Grid.Column="1" Label="命令字值:"
Text1="{Binding Path=DownData.Command,StringFormat=X6}"
Text2="{Binding Path=DownData.Command}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 俯仰控制指令 --> <!-- 俯仰控制指令 -->
<common:LabelValue Grid.Row="2" Grid.Column="0" Label="俯仰控制指令标记:" Text="{Binding Path=DownData.Vertical_PN}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="2" Grid.Column="0" Label="俯仰控制指令标记:"
<common:LabelValue Grid.Row="2" Grid.Column="1" Label="俯仰控制指令值:" Text="{Binding Path=DownData.Vertical}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.Vertical_PN,StringFormat=X6}"
Text2="{Binding Path=DownData.Vertical_PN}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="2" Grid.Column="1" Label="俯仰控制指令值:"
Text1="{Binding Path=DownData.Vertical,StringFormat=X6}"
Text2="{Binding Path=DownData.Vertical}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 方位控制指令 --> <!-- 方位控制指令 -->
<common:LabelValue Grid.Row="3" Grid.Column="0" Label="方位控制指令标记:" Text="{Binding Path=DownData.Horizontal_PN}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="3" Grid.Column="0" Label="方位控制指令标记:"
<common:LabelValue Grid.Row="3" Grid.Column="1" Label="方位控制指令值:" Text="{Binding Path=DownData.Horizontal}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.Horizontal_PN,StringFormat=X6}"
Text2="{Binding Path=DownData.Horizontal_PN}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="3" Grid.Column="1" Label="方位控制指令值:"
Text1="{Binding Path=DownData.Horizontal,StringFormat=X6}"
Text2="{Binding Path=DownData.Horizontal}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 横滚控制指令 --> <!-- 横滚控制指令 -->
<common:LabelValue Grid.Row="4" Grid.Column="0" Label="横滚控制指令:" Text="{Binding Path=DownData.Roll}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="4" Grid.Column="0" Label="横滚控制指令:"
Text1="{Binding Path=DownData.Roll,StringFormat=X6}"
Text2="{Binding Path=DownData.Roll}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 变焦控制指令 --> <!-- 变焦控制指令 -->
<common:LabelValue Grid.Row="5" Grid.Column="0" Label="变焦控制指令:" Text="{Binding Path=DownData.Zoom}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="5" Grid.Column="0" Label="变焦控制指令:"
Text1="{Binding Path=DownData.Zoom,StringFormat=X6}"
Text2="{Binding Path=DownData.Zoom}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 光圈控制指令 --> <!-- 光圈控制指令 -->
<common:LabelValue Grid.Row="6" Grid.Column="0" Label="光圈控制指令:" Text="{Binding Path=DownData.Aperture}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="6" Grid.Column="0" Label="光圈控制指令:"
Text1="{Binding Path=DownData.Aperture,StringFormat=X6}"
Text2="{Binding Path=DownData.Aperture}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 聚焦控制指令 --> <!-- 聚焦控制指令 -->
<common:LabelValue Grid.Row="7" Grid.Column="0" Label="聚焦控制指令:" Text="{Binding Path=DownData.Focus}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="7" Grid.Column="0" Label="聚焦控制指令:"
Text1="{Binding Path=DownData.Focus,StringFormat=X6}"
Text2="{Binding Path=DownData.Focus}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 镜头品牌选择指令 --> <!-- 镜头品牌选择指令 -->
<common:LabelValue Grid.Row="8" Grid.Column="0" Label="镜头品牌选择指令:" Text="{Binding Path=DownData.Brand}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="8" Grid.Column="0" Label="镜头品牌选择指令:"
Text1="{Binding Path=DownData.Brand,StringFormat=X6}"
Text2="{Binding Path=DownData.Brand}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 跟踪时，由计算机所计算的俯仰控制指令 --> <!-- 跟踪时，由计算机所计算的俯仰控制指令 -->
<common:LabelValue Grid.Row="9" Grid.Column="0" Label="俯仰[跟踪]标记:" Text="{Binding Path=DownData.Track_Vertical_PN}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="9" Grid.Column="0" Label="俯仰[跟踪]标记:"
<common:LabelValue Grid.Row="9" Grid.Column="1" Label="俯仰[跟踪]值:" Text="{Binding Path=DownData.Track_Vertical}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.Track_Vertical_PN,StringFormat=X6}"
Text2="{Binding Path=DownData.Track_Vertical_PN}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="9" Grid.Column="1" Label="俯仰[跟踪]值:"
Text1="{Binding Path=DownData.Track_Vertical,StringFormat=X6}"
Text2="{Binding Path=DownData.Track_Vertical}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 跟踪时，由计算机所计算的方位控制指令 --> <!-- 跟踪时，由计算机所计算的方位控制指令 -->
<common:LabelValue Grid.Row="10" Grid.Column="0" Label="方位[跟踪]标记:" Text="{Binding Path=DownData.Track_Horizontal_PN}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="10" Grid.Column="0" Label="方位[跟踪]标记:"
<common:LabelValue Grid.Row="10" Grid.Column="1" Label="方位[跟踪]值:" Text="{Binding Path=DownData.Track_Horizontal}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.Track_Horizontal_PN,StringFormat=X6}"
Text2="{Binding Path=DownData.Track_Horizontal_PN}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="10" Grid.Column="1" Label="方位[跟踪]值:"
Text1="{Binding Path=DownData.Track_Horizontal,StringFormat=X6}"
Text2="{Binding Path=DownData.Track_Horizontal}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 心跳指令 --> <!-- 心跳指令 -->
<common:LabelValue Grid.Row="11" Grid.Column="0" Label="心跳指令:" Text="{Binding Path=DownData.Heart}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="11" Grid.Column="0" Label="心跳指令:"
Text1="{Binding Path=DownData.Heart,StringFormat=X6}"
Text2="{Binding Path=DownData.Heart}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 校验和 --> <!-- 校验和 -->
<common:LabelValue Grid.Row="12" Grid.Column="0" Label="校验和:" Text="{Binding Path=DownData.Check}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="12" Grid.Column="0" Label="校验和:"
<common:LabelValue Grid.Row="12" Grid.Column="1" Label="计算校验和:" Text="{Binding Path=DownData,Converter={StaticResource GimbalPackage_down_CheckValueConverter}}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=DownData.Check,StringFormat=X6}"
Text2="{Binding Path=DownData.Check}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="12" Grid.Column="1" Label="计算校验和:"
Text1="{Binding Path=DownData,Converter={StaticResource GimbalPackage_down_CheckValueConverter},StringFormat=X6}"
Text2="{Binding Path=DownData,Converter={StaticResource GimbalPackage_down_CheckValueConverter}}"
Margin="5,0,5,0"></common:LabelValue2>
</Grid> </Grid>
</GroupBox> </GroupBox>
...@@ -131,47 +192,96 @@ ...@@ -131,47 +192,96 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- 状态帧 --> <!-- 状态帧 -->
<common:LabelValue Grid.Row="0" Grid.Column="0" Label="同步帧头1:" Text="{Binding Path=UpData.SyncHead_1}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="0" Grid.Column="0" Label="同步帧头1:"
<common:LabelValue Grid.Row="0" Grid.Column="1" Label="同步帧头2:" Text="{Binding Path=UpData.SyncHead_2}" Margin="5,0,5,0"></common:LabelValue> Text1="{Binding Path=UpData.SyncHead_1,StringFormat=X6}"
Text2="{Binding Path=UpData.SyncHead_1}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="0" Grid.Column="1" Label="同步帧头2:"
Text1="{Binding Path=UpData.SyncHead_2,StringFormat=X6}"
Text2="{Binding Path=UpData.SyncHead_2}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 状态字 --> <!-- 状态字 -->
<common:LabelValue Grid.Row="1" Grid.Column="0" Label="状态字:" Text="{Binding Path=UpData.Command}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="1" Grid.Column="0" Label="状态字:"
Text1="{Binding Path=UpData.Command,StringFormat=X6}"
Text2="{Binding Path=UpData.Command}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 俯仰角度值 --> <!-- 俯仰角度值 -->
<common:LabelValue Grid.Row="2" Grid.Column="0" Label="俯仰角度值:" Text="{Binding Path=UpData.Vertical}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="2" Grid.Column="0" Label="俯仰角度值:"
Text1="{Binding Path=UpData.Vertical,StringFormat=X6}"
Text2="{Binding Path=UpData.Vertical}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 方位角度值 --> <!-- 方位角度值 -->
<common:LabelValue Grid.Row="3" Grid.Column="0" Label="方位角度值:" Text="{Binding Path=UpData.Horizontal}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="3" Grid.Column="0" Label="方位角度值:"
Text1="{Binding Path=UpData.Horizontal,StringFormat=X6}"
Text2="{Binding Path=UpData.Horizontal}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 横滚角度值 --> <!-- 横滚角度值 -->
<common:LabelValue Grid.Row="4" Grid.Column="0" Label="横滚角度值:" Text="{Binding Path=UpData.Roll}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="4" Grid.Column="0" Label="横滚角度值:"
Text1="{Binding Path=UpData.Roll,StringFormat=X6}"
Text2="{Binding Path=UpData.Roll}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 变焦值 --> <!-- 变焦值 -->
<common:LabelValue Grid.Row="5" Grid.Column="0" Label="变焦值:" Text="{Binding Path=UpData.Zoom}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="5" Grid.Column="0" Label="变焦值:"
Text1="{Binding Path=UpData.Zoom,StringFormat=X6}"
Text2="{Binding Path=UpData.Zoom}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 光圈值 --> <!-- 光圈值 -->
<common:LabelValue Grid.Row="6" Grid.Column="0" Label="光圈值:" Text="{Binding Path=UpData.Aperture}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="6" Grid.Column="0" Label="光圈值:"
Text1="{Binding Path=UpData.Aperture,StringFormat=X6}"
Text2="{Binding Path=UpData.Aperture}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 聚焦值 --> <!-- 聚焦值 -->
<common:LabelValue Grid.Row="7" Grid.Column="0" Label="聚焦值:" Text="{Binding Path=UpData.Focus}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="7" Grid.Column="0" Label="聚焦值:"
Text1="{Binding Path=UpData.Focus,StringFormat=X6}"
Text2="{Binding Path=UpData.Focus}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 心跳指令 --> <!-- 心跳指令 -->
<common:LabelValue Grid.Row="8" Grid.Column="0" Label="心跳指令:" Text="{Binding Path=UpData.Heart}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="8" Grid.Column="0" Label="心跳指令:"
Text1="{Binding Path=UpData.Heart,StringFormat=X6}"
Text2="{Binding Path=UpData.Heart}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 处理后的俯仰角 --> <!-- 处理后的俯仰角 -->
<common:LabelValue Grid.Row="9" Grid.Column="0" Label="处理后的俯仰角:" Text="{Binding Path=UpData.Real_Vertical_Angle}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="9" Grid.Column="0" Label="处理后的俯仰角:"
Text1="{Binding Path=UpData.Real_Vertical_Angle,StringFormat=X6}"
Text2="{Binding Path=UpData.Real_Vertical_Angle}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 处理后的方位角 --> <!-- 处理后的方位角 -->
<common:LabelValue Grid.Row="10" Grid.Column="0" Label="处理后的方位角:" Text="{Binding Path=UpData.Real_Horizontal_Angle}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="10" Grid.Column="0" Label="处理后的方位角:"
Text1="{Binding Path=UpData.Real_Horizontal_Angle,StringFormat=X6}"
Text2="{Binding Path=UpData.Real_Horizontal_Angle}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 变焦值 --> <!-- 变焦值 -->
<common:LabelValue Grid.Row="11" Grid.Column="0" Label="变焦值:" Text="{Binding Path=UpData.Real_Zoom}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="11" Grid.Column="0" Label="变焦值:"
Text1="{Binding Path=UpData.Real_Zoom,StringFormat=X6}"
Text2="{Binding Path=UpData.Real_Zoom}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 焦点位置 --> <!-- 焦点位置 -->
<common:LabelValue Grid.Row="12" Grid.Column="0" Label="焦点位置:" Text="{Binding Path=UpData.Real_Focus}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="12" Grid.Column="0" Label="焦点位置:"
Text1="{Binding Path=UpData.Real_Focus,StringFormat=X6}"
Text2="{Binding Path=UpData.Real_Focus}"
Margin="5,0,5,0"></common:LabelValue2>
<!-- 校验和 --> <!-- 校验和 -->
<common:LabelValue Grid.Row="13" Grid.Column="0" Label="校验和:" Text="{Binding Path=UpData.Check}" Margin="5,0,5,0"></common:LabelValue> <common:LabelValue2 Grid.Row="13" Grid.Column="0" Label="校验和:"
Text1="{Binding Path=UpData.Check,StringFormat=X6}"
Text2="{Binding Path=UpData.Check}"
Margin="5,0,5,0"></common:LabelValue2>
<common:LabelValue2 Grid.Row="13" Grid.Column="1" Label="计算校验和:"
Text1="{Binding Path=UpData,Converter={StaticResource GimbalPackage_up_CheckValueConverter},StringFormat=X6}"
Text2="{Binding Path=UpData,Converter={StaticResource GimbalPackage_up_CheckValueConverter}}"
Margin="5,0,5,0"></common:LabelValue2>
</Grid> </Grid>
</GroupBox> </GroupBox>
......
VIZ.GimbalAI.Controller.Module/Setup/Provider/AppSetup_SerialPort.cs
...@@ -51,14 +51,14 @@ namespace VIZ.GimbalAI.Controller.Module ...@@ -51,14 +51,14 @@ namespace VIZ.GimbalAI.Controller.Module
// 下行 // 下行
SerialPortEndpointManager down_endpoint_manager = new SerialPortEndpointManager(SerialPortKeys.DOWN, GIMBAL_SERIAL_PORT_DOWN, 115200, Parity.None, 8, StopBits.One); SerialPortEndpointManager down_endpoint_manager = new SerialPortEndpointManager(SerialPortKeys.DOWN, GIMBAL_SERIAL_PORT_DOWN, 115200, Parity.None, 8, StopBits.One);
down_endpoint_manager.PackageProvider = new GimbalPackageDownProvider(53, new byte[] { 0xA5, 0xE7 }, SerialPortKeys.DOWN); down_endpoint_manager.PackageProvider = new GimbalPackageDownProvider(53, new byte[] { 0xA5, 0xE7 }, SerialPortKeys.UP);
ConnectionManager.SerialPortConnection.AddEndpointManager(down_endpoint_manager); ConnectionManager.SerialPortConnection.AddEndpointManager(down_endpoint_manager);
down_endpoint_manager.Open(); down_endpoint_manager.Open();
// 上行 // 上行
SerialPortEndpointManager up_endpoint_manager = new SerialPortEndpointManager(SerialPortKeys.UP, GIMBAL_SERIAL_PORT_UP, 115200, Parity.None, 8, StopBits.One); SerialPortEndpointManager up_endpoint_manager = new SerialPortEndpointManager(SerialPortKeys.UP, GIMBAL_SERIAL_PORT_UP, 115200, Parity.None, 8, StopBits.One);
up_endpoint_manager.PackageProvider = new GimbalPackageUpProvider(53, new byte[] { 0x58, 0xA0 }, SerialPortKeys.UP); up_endpoint_manager.PackageProvider = new GimbalPackageUpProvider(53, new byte[] { 0x58, 0xA0 }, SerialPortKeys.DOWN);
ConnectionManager.SerialPortConnection.AddEndpointManager(up_endpoint_manager); ConnectionManager.SerialPortConnection.AddEndpointManager(up_endpoint_manager);
up_endpoint_manager.Open(); up_endpoint_manager.Open();
......
Viz.GimbalAI.Controller.Module.Resource/Converter/GimbalPackage_down_CheckValueConverter.cs
...@@ -21,7 +21,7 @@ namespace Viz.GimbalAI.Controller.Module.Resource ...@@ -21,7 +21,7 @@ namespace Viz.GimbalAI.Controller.Module.Resource
if (down == null) if (down == null)
return string.Empty; return string.Empty;
return down.GetCheckValue().ToString(); return down.GetCheckValue();
} }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
......
Viz.GimbalAI.Controller.Module.Resource/Converter/GimbalPackage_up_CheckValueConverter.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
using VIZ.Framework.Core;
using VIZ.GimbalAI.Controller.Connection;
namespace Viz.GimbalAI.Controller.Module.Resource
{
/// <summary>
/// 上行数据计算校验和转化器
/// </summary>
public class GimbalPackage_up_CheckValueConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
GimbalPackage_up up = value as GimbalPackage_up;
if (up == null)
return string.Empty;
return up.GetCheckValue();
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
Viz.GimbalAI.Controller.Module.Resource/Viz.GimbalAI.Controller.Module.Resource.csproj
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Converter\GimbalPackage_up_CheckValueConverter.cs" />
<Compile Include="Converter\GimbalPackage_down_CheckValueConverter.cs" /> <Compile Include="Converter\GimbalPackage_down_CheckValueConverter.cs" />
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
......
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