Merge pull request #2438 from satiowadahc/cw-m5default

rene-dev · web-flow · commit 01a0ab262784 · 2023-06-18T15:13:20.000+02:00
RS274: M5 default to all spindles.
diff --git a/src/emc/rs274ngc/interp_convert.cc b/src/emc/rs274ngc/interp_convert.cc
@@ -3476,8 +3476,10 @@ int Interp::convert_m(block_pointer block,       //!< pointer to a block of RS27
             enqueue_STOP_SPINDLE_TURNING(block->dollar_number);
         }
     } else { // the default spindle
-        settings->spindle_turning[0] = CANON_STOPPED;
-        enqueue_STOP_SPINDLE_TURNING(0);
+      for (int i = 0; i < settings->num_spindles; i++){
+        settings->spindle_turning[i] = CANON_STOPPED;
+        enqueue_STOP_SPINDLE_TURNING(i);
+      }
     }
   } else if ((block->m_modes[7] == 19) && ONCE_M(7)) {
       for (int i = 0; i < settings->num_spindles; i++)

Original file line number	Diff line number	Diff line change
`@@ -3476,8 +3476,10 @@ int Interp::convert_m(block_pointer block, //!< pointer to a block of RS27`
`3476`	`3476`	`enqueue_STOP_SPINDLE_TURNING(block->dollar_number);`
`3477`	`3477`	`}`
`3478`	`3478`	`} else { // the default spindle`
`3479`		`- settings->spindle_turning[0] = CANON_STOPPED;`
`3480`		`- enqueue_STOP_SPINDLE_TURNING(0);`
	`3479`	`+ for (int i = 0; i < settings->num_spindles; i++){`
	`3480`	`+ settings->spindle_turning[i] = CANON_STOPPED;`
	`3481`	`+ enqueue_STOP_SPINDLE_TURNING(i);`
	`3482`	`+ }`
`3481`	`3483`	`}`
`3482`	`3484`	`} else if ((block->m_modes[7] == 19) && ONCE_M(7)) {`
`3483`	`3485`	`for (int i = 0; i < settings->num_spindles; i++)`