Commit 1352f2db authored by 潘栩锋's avatar 潘栩锋 🚴

AD盒的速度永远由电脑计算出来。 删除 没用的IsCalSpeed设置

parent 5fb19414
...@@ -55,10 +55,6 @@ ...@@ -55,10 +55,6 @@
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="CRC" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="CRC" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding HasCRC}"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding HasCRC}"/>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="不使用AD盒速度" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsCalSpeed}" HorizontalAlignment="Left"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" > <StackPanel Margin="{StaticResource ControlMargin}" >
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="脉冲/数据格" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="脉冲/数据格" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
......
...@@ -143,7 +143,6 @@ namespace FLY.Thick.Base.UI ...@@ -143,7 +143,6 @@ namespace FLY.Thick.Base.UI
Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.PosOffset), this, nameof(PosOffset)); Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.PosOffset), this, nameof(PosOffset));
Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.JogVelocity), this, nameof(JogVelocity)); Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.JogVelocity), this, nameof(JogVelocity));
Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.GridSmooth), this, nameof(GridSmooth)); Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.GridSmooth), this, nameof(GridSmooth));
Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.IsCalSpeed), this, nameof(IsCalSpeed));
Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.ADLag), this, nameof(ADLag)); Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.ADLag), this, nameof(ADLag));
Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.HasPosMaxMin), this, nameof(HasPosMaxMin)); Misc.BindingOperations.SetBinding(this.flyAdService, nameof(this.flyAdService.HasPosMaxMin), this, nameof(HasPosMaxMin));
...@@ -184,7 +183,6 @@ namespace FLY.Thick.Base.UI ...@@ -184,7 +183,6 @@ namespace FLY.Thick.Base.UI
flyAdService.PosOffset = this.PosOffset; flyAdService.PosOffset = this.PosOffset;
flyAdService.JogVelocity = this.JogVelocity; flyAdService.JogVelocity = this.JogVelocity;
flyAdService.GridSmooth = this.GridSmooth; flyAdService.GridSmooth = this.GridSmooth;
flyAdService.IsCalSpeed = this.IsCalSpeed;
flyAdService.ADLag = this.ADLag; flyAdService.ADLag = this.ADLag;
flyAdService.HasPosMaxMin = this.HasPosMaxMin; flyAdService.HasPosMaxMin = this.HasPosMaxMin;
......
...@@ -24,11 +24,6 @@ namespace FLY.Thick.Base.Client ...@@ -24,11 +24,6 @@ namespace FLY.Thick.Base.Client
/// </summary> /// </summary>
public int GridSmooth { get; set; } public int GridSmooth { get; set; }
/// <summary>
/// 通过脉冲计算速度,不使用AD盒的输出
/// </summary>
public bool IsCalSpeed { get; set; }
public int PosLen { get; set; } public int PosLen { get; set; }
public MOTORTYPE MotorType { get; set; } public MOTORTYPE MotorType { get; set; }
......
...@@ -24,7 +24,6 @@ namespace FLY.Thick.Base.IService ...@@ -24,7 +24,6 @@ namespace FLY.Thick.Base.IService
Int16 PosOffset { set; get; }//脉冲平移 Int16 PosOffset { set; get; }//脉冲平移
UInt32 JogVelocity { set; get; } UInt32 JogVelocity { set; get; }
int GridSmooth { get; set; } int GridSmooth { get; set; }
bool IsCalSpeed { get; set; }
int ADLag { get; set; } int ADLag { get; set; }
bool HasPosMaxMin { get; set; } bool HasPosMaxMin { get; set; }
......
...@@ -131,17 +131,7 @@ namespace FLY.Thick.Base.Server ...@@ -131,17 +131,7 @@ namespace FLY.Thick.Base.Server
flyad.GridSmooth = value; flyad.GridSmooth = value;
} }
} }
public bool IsCalSpeed
{
get
{
return flyad.IsCalSpeed;
}
set
{
flyad.IsCalSpeed = value;
}
}
public int ADLag public int ADLag
{ {
get { return flyad.ADLag; } get { return flyad.ADLag; }
......
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