File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -735,6 +735,7 @@ class EMC_TRAJ_LINEAR_MOVE:public EMC_TRAJ_CMD_MSG {
735735 vel (0.0 ),
736736 ini_maxvel(0.0 ),
737737 acc(0.0 ),
738+ ini_maxjerk(0.0 ),
738739 feed_mode(0 ),
739740 indexer_jnum(0 )
740741 {};
@@ -763,6 +764,7 @@ class EMC_TRAJ_CIRCULAR_MOVE:public EMC_TRAJ_CMD_MSG {
763764 vel (0.0 ),
764765 ini_maxvel (0.0 ),
765766 acc (0.0 ),
767+ ini_maxjerk (0.0 ),
766768 feed_mode (0 )
767769 {};
768770
@@ -913,6 +915,7 @@ class EMC_TRAJ_PROBE:public EMC_TRAJ_CMD_MSG {
913915 vel (0.0 ),
914916 ini_maxvel (0.0 ),
915917 acc (0.0 ),
918+ ini_maxjerk (0.0 ),
916919 probe_type (0 )
917920 {};
918921
@@ -935,7 +938,8 @@ class EMC_TRAJ_RIGID_TAP:public EMC_TRAJ_CMD_MSG {
935938 vel (0.0 ),
936939 ini_maxvel (0.0 ),
937940 acc (0.0 ),
938- scale (1.0 )
941+ scale (1.0 ),
942+ ini_maxjerk (0.0 )
939943 {};
940944
941945 // For internal NML/CMS use only.
Original file line number Diff line number Diff line change @@ -70,6 +70,7 @@ EMC_TRAJ_STAT::EMC_TRAJ_STAT()
7070 queueFull(OFF),
7171 id(0 ),
7272 paused(OFF),
73+ single_stepping(false ),
7374 scale(0.0 ),
7475 rapid_scale(0.0 ),
7576
Original file line number Diff line number Diff line change 2424#include " rs274ngc_interp.hh"
2525#include < boost/python/object.hpp>
2626
27- #pragma GCC diagnostic error "-Wmissing-field-initializers"
2827setup::setup () :
2928 AA_axis_offset(0.0 ),
3029 AA_current(0.0 ),
@@ -64,6 +63,8 @@ setup::setup() :
6463 control_mode (CANON_EXACT_STOP),
6564 tolerance(0.0 ),
6665 naivecam_tolerance(0.0 ),
66+ tolerance_default(0.0 ),
67+ naivecam_tolerance_default(0.0 ),
6768 current_pocket(0 ),
6869
6970 current_x (0.0 ),
You can’t perform that action at this time.
0 commit comments