Skip to content

Commit b3f5476

Browse files
Merge pull request #43 from Inxton/42-_BUG_Add_Jerk_parameter_to_movement_in_service
[BUG]Add Jerk parameter to movement in service
2 parents 96c4be7 + 4d8825c commit b3f5476

4 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoMultiAxis/TcoMultiAxisServiceViewModel.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ private void MoveToPosition()
206206
this.Component._axis1._moveAbsoluteTask._velocity.Synchron = SelectedItem.Axis1.Velocity.Synchron;
207207
this.Component._axis1._moveAbsoluteTask._acceleration.Synchron = SelectedItem.Axis1.Acceleration.Synchron;
208208
this.Component._axis1._moveAbsoluteTask._deceleration.Synchron = SelectedItem.Axis1.Deceleration.Synchron;
209+
this.Component._axis1._moveAbsoluteTask._jerk.Synchron = SelectedItem.Axis1.Jerk.Synchron;
210+
209211

210212

211213
if ((bool)Axis1MoveAllowed)
@@ -218,6 +220,7 @@ private void MoveToPosition()
218220
this.Component._axis2._moveAbsoluteTask._velocity.Synchron = SelectedItem.Axis2.Velocity.Synchron;
219221
this.Component._axis2._moveAbsoluteTask._acceleration.Synchron = SelectedItem.Axis2.Acceleration.Synchron;
220222
this.Component._axis2._moveAbsoluteTask._deceleration.Synchron = SelectedItem.Axis2.Deceleration.Synchron;
223+
this.Component._axis2._moveAbsoluteTask._jerk.Synchron = SelectedItem.Axis2.Jerk.Synchron;
221224

222225

223226
if ((bool)Axis2MoveAllowed)
@@ -229,6 +232,8 @@ private void MoveToPosition()
229232
this.Component._axis3._moveAbsoluteTask._velocity.Synchron = SelectedItem.Axis3.Velocity.Synchron;
230233
this.Component._axis3._moveAbsoluteTask._acceleration.Synchron = SelectedItem.Axis3.Acceleration.Synchron;
231234
this.Component._axis3._moveAbsoluteTask._deceleration.Synchron = SelectedItem.Axis3.Deceleration.Synchron;
235+
this.Component._axis3._moveAbsoluteTask._jerk.Synchron = SelectedItem.Axis3.Jerk.Synchron;
236+
232237

233238

234239
if ((bool)Axis3MoveAllowed)
@@ -240,6 +245,8 @@ private void MoveToPosition()
240245
this.Component._axis4._moveAbsoluteTask._velocity.Synchron = SelectedItem.Axis4.Velocity.Synchron;
241246
this.Component._axis4._moveAbsoluteTask._acceleration.Synchron = SelectedItem.Axis4.Acceleration.Synchron;
242247
this.Component._axis4._moveAbsoluteTask._deceleration.Synchron = SelectedItem.Axis4.Deceleration.Synchron;
248+
this.Component._axis4._moveAbsoluteTask._jerk.Synchron = SelectedItem.Axis4.Jerk.Synchron;
249+
243250

244251

245252
if ((bool)Axis4MoveAllowed)

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoSingleAxis/TcoSingleAxisServiceViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ private void MoveToPosition()
177177
this.Component._axis._moveAbsoluteTask._velocity.Synchron = SelectedItem.Axis1.Velocity.Synchron;
178178
this.Component._axis._moveAbsoluteTask._acceleration.Synchron = SelectedItem.Axis1.Acceleration.Synchron;
179179
this.Component._axis._moveAbsoluteTask._deceleration.Synchron = SelectedItem.Axis1.Deceleration.Synchron;
180+
this.Component._axis._moveAbsoluteTask._jerk.Synchron = SelectedItem.Axis1.Jerk.Synchron;
181+
180182

181183

182184

src/TcoKukaRobotics/src/TcoKukaRobotics.Wpf/Krc4/Service/TcoKrc4_ECat_v_5_x_xServiceView.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public TcoKrc4_Ecat_v_5_x_xServiceView()
2626
{
2727
if (DesignerProperties.GetIsInDesignMode(this))
2828
{
29-
this.DataContext = new TcoKrc4_v_5_x_xServiceViewModel();
29+
this.DataContext = new TcoKrc4_Ecat_v_5_x_xServiceViewModel();
3030
}
3131

3232
InitializeComponent();

src/TcoKukaRobotics/src/TcoKukaRobotics.Wpf/Krc4/Service/TcoKrc4_Ecat_v_5_x_xServiceViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public TcoKrc4_Ecat_v_5_x_xServiceViewModel() :base()
2121

2222
}
2323
}
24-
public class TcoKrc4_Ecat_v_5_x_xViewModel : TcoKrc4_v_5_x_xServiceViewModel
24+
public class TcoKrc4_Ecat_v_5_x_xViewModel : TcoKrc4_Ecat_v_5_x_xServiceViewModel
2525
{ }
2626

2727
}

0 commit comments

Comments
 (0)