Commit 8c9bee4e by liulongfei

中心轴控制

parent 184ebf26
...@@ -23,7 +23,7 @@ namespace VIZ.GimbalAI.Client ...@@ -23,7 +23,7 @@ namespace VIZ.GimbalAI.Client
// 初始化 LiteDB // 初始化 LiteDB
AppSetup.AppendSetup(new AppSetup_InitLiteDB()); AppSetup.AppendSetup(new AppSetup_InitLiteDB());
// 初始化中心轴 // 初始化中心轴
AppSetup.AppendSetup(new AppSetup_InitCenterAxis()); //AppSetup.AppendSetup(new AppSetup_InitCenterAxis());
// 初始化 NDI // 初始化 NDI
AppSetup.AppendSetup(new AppSetup_InitNDI()); AppSetup.AppendSetup(new AppSetup_InitNDI());
// 初始化 UDP // 初始化 UDP
......
...@@ -40,13 +40,13 @@ namespace VIZ.GimbalAI.Connection ...@@ -40,13 +40,13 @@ namespace VIZ.GimbalAI.Connection
double x = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX; double x = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX;
double y = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY; double y = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY;
if (package.h != 0) if (package.h != 0 && (Math.Abs(package.h) < 10000))
{ {
x += (package.h > 0 ? -1 : 1) * GIMBAL_CENTER_AXIS_SPEED; x += -ApplicationDomainEx.GimbalControlModel.TargetKeepSymbolHelperX.GetSymbol(package.h) * GIMBAL_CENTER_AXIS_SPEED;
} }
if (package.v != 0) if (package.v != 0 && (Math.Abs(package.v) < 10000))
{ {
y += (package.v > 0 ? -1 : 1) * GIMBAL_CENTER_AXIS_SPEED; y += -ApplicationDomainEx.GimbalControlModel.TargetKeepSymbolHelperY.GetSymbol(package.v) * GIMBAL_CENTER_AXIS_SPEED;
} }
x = MathHelper.Clip(0, 1920, x); x = MathHelper.Clip(0, 1920, x);
......
...@@ -33,6 +33,16 @@ namespace VIZ.GimbalAI.Domain ...@@ -33,6 +33,16 @@ namespace VIZ.GimbalAI.Domain
public double CenterAxisY { get; set; } = 1080 / 2; public double CenterAxisY { get; set; } = 1080 / 2;
/// <summary> /// <summary>
/// 目标中心轴X 保持符号辅助类
/// </summary>
public KeepSymbolHelper TargetKeepSymbolHelperX { get; private set; } = new KeepSymbolHelper(3, 2);
/// <summary>
/// 目标中心轴Y 保持符号辅助类
/// </summary>
public KeepSymbolHelper TargetKeepSymbolHelperY { get; private set; } = new KeepSymbolHelper(3, 2);
/// <summary>
/// 更新中心轴 /// 更新中心轴
/// </summary> /// </summary>
/// <returns>中心轴是否有变化</returns> /// <returns>中心轴是否有变化</returns>
......
...@@ -43,7 +43,7 @@ namespace VIZ.GimbalAI.Module ...@@ -43,7 +43,7 @@ namespace VIZ.GimbalAI.Module
this.InitFPS(); this.InitFPS();
// 初始化热键 // 初始化热键
this.InitHotkey(); //this.InitHotkey();
} }
/// <summary> /// <summary>
......
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