Multispindle: Make interp_check do the right things now that we use $ not E / D

Signed-off-by: andy pugh <andy@bodgesoc.org>

Author: andypugh

src/emc/rs274ngc/interp_convert.cc

@@ -4120,16 +4120,15 @@ Called by: execute_block.
 
 */
 
-int Interp::convert_speed(int e_number,          //The E-number or -1 if none
+int Interp::convert_speed(int spindle,          //The spindle ($) or -1 if none
 					      block_pointer block,   //!< pointer to a block of RS274 instructions
                           setup_pointer settings)//!< pointer to machine settings
 {
-  for (int s = 0; s < settings->num_spindles; s++){
-	  if (e_number == -1 || s == e_number){
-		  enqueue_SET_SPINDLE_SPEED(s, block->s_number);
-		  settings->speed[s] = block->s_number;
-	  }
-  }
+    if (spindle >= 0 && spindle <  settings->num_spindles){
+        enqueue_SET_SPINDLE_SPEED(spindle, block->s_number);
+        settings->speed[spindle] = block->s_number;
+}
+
   return INTERP_OK;
 }
 

src/emc/rs274ngc/interp_queue.cc

@@ -235,7 +235,7 @@ void enqueue_SET_SPINDLE_MODE(int spindle, double mode) {
 
 void enqueue_SET_SPINDLE_SPEED(int spindle, double speed) {
     if(qc().empty()) {
-    if(debug_qc) printf("immediate set spindle speed %f\n", speed);
+        if(debug_qc) printf("immediate set spindle speed %f\n", speed);
         SET_SPINDLE_SPEED(spindle, speed);
         return;
     }

src/emc/rs274ngc/rs274ngc_interp.hh

@@ -320,8 +320,8 @@ public:
  int convert_setup(block_pointer block, setup_pointer settings);
  int convert_setup_tool(block_pointer block, setup_pointer settings);
  int convert_set_plane(int g_code, setup_pointer settings);
- int convert_speed(int e_number, block_pointer block, setup_pointer settings);
- int convert_spindle_mode(int e_number, block_pointer block, setup_pointer settings);
+ int convert_speed(int spindle, block_pointer block, setup_pointer settings);
+ int convert_spindle_mode(int spindle, block_pointer block, setup_pointer settings);
  int convert_stop(block_pointer block, setup_pointer settings);
  int convert_straight(int move, block_pointer block,
                             setup_pointer settings);