数据上下行逻辑调整

VIZ.GimbalAI.Controller.Connection/SerialPort/Gimbal/GimbalPackageDownProvider.cs

@@ -24,16 +24,16 @@ namespace VIZ.GimbalAI.Controller.Connection
         /// </summary>
         /// <param name="fixedBufferSize">包大小</param>
         /// <param name="syncHeader">同步针头</param>
-        /// <param name="downEndpointManagerKey">下行终结点管理器键</param>
-        public GimbalPackageDownProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string downEndpointManagerKey) : base(fixedBufferSize, syncHeader)
+        /// <param name="upEndpointManagerKey">上行终结点管理器键</param>
+        public GimbalPackageDownProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string upEndpointManagerKey) : base(fixedBufferSize, syncHeader)
         {
-            this.DownEndpointManagerKey = downEndpointManagerKey;
+            this.UpEndpointManagerKey = upEndpointManagerKey;
         }
 
         /// <summary>
-        /// 下行终结点管理器键
+        /// 上行行终结点管理器键
         /// </summary>
-        public string DownEndpointManagerKey { get; private set; }
+        public string UpEndpointManagerKey { get; private set; }
 
         /// <summary>
         /// 处理器集合
@@ -46,13 +46,6 @@ namespace VIZ.GimbalAI.Controller.Connection
         /// <param name="info">信息</param>
         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();
             data.FromBuffer(info.Buffer);
@@ -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)
                 return;
 

VIZ.GimbalAI.Controller.Connection/SerialPort/Gimbal/GimbalPackageUpProvider.cs

@@ -22,16 +22,16 @@ namespace VIZ.GimbalAI.Controller.Connection
         /// </summary>
         /// <param name="fixedBufferSize">包大小</param>
         /// <param name="syncHeader">同步针头</param>
-        /// <param name="upEndpointManagerKey">上行终结点管理器键</param>
-        public GimbalPackageUpProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string upEndpointManagerKey) : base(fixedBufferSize, syncHeader)
+        /// <param name="downEndpointManagerKey">下行终结点管理器键</param>
+        public GimbalPackageUpProvider(int fixedBufferSize, IEnumerable<byte> syncHeader, string downEndpointManagerKey) : base(fixedBufferSize, syncHeader)
         {
-            this.UpEndpointManagerKey = upEndpointManagerKey;
+            this.DownEndpointManagerKey = downEndpointManagerKey;
         }
 
         /// <summary>
-        /// 上行终结点管理器键
+        /// 下行终结点管理器键
         /// </summary>
-        public string UpEndpointManagerKey { get; private set; }
+        public string DownEndpointManagerKey { get; private set; }
 
         /// <summary>
         /// 处理器集合
@@ -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)
                 return;
 
+            data.Real_Horizontal_Angle = 60;
+
             byte[] buffer = data.ToBuffer();
             manager.Send(buffer);
         }

VIZ.GimbalAI.Controller.Module/Setup/Provider/AppSetup_SerialPort.cs

@@ -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);
-            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);
 
             down_endpoint_manager.Open();
 
             // 上行
             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);
 
             up_endpoint_manager.Open();

Viz.GimbalAI.Controller.Module.Resource/Converter/GimbalPackage_down_CheckValueConverter.cs

@@ -21,7 +21,7 @@ namespace Viz.GimbalAI.Controller.Module.Resource
             if (down == null)
                 return string.Empty;
 
-            return down.GetCheckValue().ToString();
+            return down.GetCheckValue();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Viz.GimbalAI.Controller.Module.Resource/Converter/GimbalPackage_up_CheckValueConverter.cs

+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 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Converter\GimbalPackage_up_CheckValueConverter.cs" />
     <Compile Include="Converter\GimbalPackage_down_CheckValueConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>