Merge pull request #3190 from Sigma1912/stat_fix_mcodes_attribute

LinuxCNC · Nov 28, 2024 · 50ef8c8 · 50ef8c8
2 parents 05ce127 + f127bd5
commit 50ef8c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/emc/rs274ngc/interp_setup.cc b/src/emc/rs274ngc/interp_setup.cc
@@ -49,7 +49,7 @@ setup::setup() :
     w_origin_offset(0.0),
 
     active_g_codes{},
-    active_m_codes{},
+    active_m_codes{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
     active_settings{},
 
     arc_not_allowed(0),

diff --git a/src/emc/rs274ngc/interp_write.cc b/src/emc/rs274ngc/interp_write.cc
@@ -312,7 +312,7 @@ int Interp::write_state_tag(block_pointer block,
 	(block == NULL) ? -1 : block->m_modes[4];
 
     state.flags[GM_FLAG_SPINDLE_ON] =
-	!(settings->spindle_turning[0] != CANON_STOPPED);
+	(settings->spindle_turning[0] != CANON_STOPPED);
     state.flags[GM_FLAG_SPINDLE_CW] =
 	(settings->spindle_turning[0] == CANON_CLOCKWISE);
 

diff --git a/tests/startup-state/test-ui.py b/tests/startup-state/test-ui.py
@@ -270,7 +270,7 @@ def assert_axis_initialized(axis):
 #assert(math.fabs(s.max_acceleration - 123.45) < 0.0000001)
 
 assert(math.fabs(s.max_velocity - 45.67) < 0.0000001)
-assert(s.mcodes == (0, -1, 5, -1, 9, -1, 48, -1, 53, 0))
+assert(s.mcodes == (0, -1, 5, -1, 9, -1, 48, -1, 53, -1))
 assert(s.mist == 0)
 assert(s.motion_line == 0)
 assert(s.motion_mode == linuxcnc.TRAJ_MODE_FREE)