Fix NUM_AXIS

MarlinKimbra/ConfigurationStore.cpp

@@ -357,7 +357,7 @@ void Config_ResetDefault()
   float tmp6[]=DEFAULT_Ki;
   float tmp7[]=DEFAULT_Kd;
   
-  for (short i=0;i<NUM_AXIS;i++) 
+  for (short i=0;i<7;i++) 
   {
     axis_steps_per_unit[i]=tmp1[i];
     max_feedrate[i]=tmp2[i];

MarlinKimbra/Configuration_Cartesian.h

@@ -192,7 +192,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 #define MANUAL_Z_HOME_POS 0
 
 //// MOVEMENT SETTINGS
-#define NUM_AXIS 7 // The axis order in all axis related arrays is X, Y, Z, E0, E1, E2, E3
+#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
 #define HOMING_FEEDRATE {100*60,100*60,2*60,0}      // set the homing speeds (mm/min)
 
 // default settings

MarlinKimbra/Configuration_Corexy.h

@@ -197,7 +197,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 #define MANUAL_Z_HOME_POS 0
 
 //// MOVEMENT SETTINGS
-#define NUM_AXIS 7 // The axis order in all axis related arrays is X, Y, Z, E0, E1, E2, E3
+#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
 #define HOMING_FEEDRATE {100*60,100*60,2*60,0}      // set the homing speeds (mm/min)
 
 // default settings

MarlinKimbra/Configuration_Delta.h

@@ -127,7 +127,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define Z_MAX_LENGTH (Z_MAX_POS - Z_MIN_POS)
 
 //// MOVEMENT SETTINGS
-#define NUM_AXIS 7 // The axis order in all axis related arrays is X, Y, Z, E
+#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
 #define HOMING_FEEDRATE {100*60,100*60,100*60,0}      // set the homing speeds (mm/min)
 
 // default settings

MarlinKimbra/Configuration_Scara.h

@@ -217,7 +217,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 
 
 //// MOVEMENT SETTINGS
-#define NUM_AXIS 7 // The axis order in all axis related arrays is X, Y, Z, E0, E1, E2, E3
+#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
 #define HOMING_FEEDRATE {40*60, 40*60, 10*60, 0}  // set the homing speeds (mm/min)
 
 // default settings

MarlinKimbra/planner.cpp

@@ -63,10 +63,10 @@
 //===========================================================================
 
 unsigned long minsegmenttime;
-float max_feedrate[NUM_AXIS]; // set the max speeds
+float max_feedrate[7]; // set the max speeds
 float max_retraction_feedrate[4]; // set the max speeds for retraction
-float axis_steps_per_unit[NUM_AXIS];
-unsigned long max_acceleration_units_per_sq_second[NUM_AXIS]; // Use M201 to override by software
+float axis_steps_per_unit[7];
+unsigned long max_acceleration_units_per_sq_second[7]; // Use M201 to override by software
 float minimumfeedrate;
 float acceleration;         // Normal acceleration mm/s^2  THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX
 float retract_acceleration; //  mm/s^2   filament pull-pack and push-forward  while standing still in the other axis M204 TXXXX
@@ -74,7 +74,7 @@ float max_xy_jerk; //speed than can be stopped at once, if i understand correctl
 float max_z_jerk;
 float max_e_jerk;
 float mintravelfeedrate;
-unsigned long axis_steps_per_sqr_second[NUM_AXIS];
+unsigned long axis_steps_per_sqr_second[7];
 
 #ifdef ENABLE_AUTO_BED_LEVELING
 // this holds the required transform to compensate for bed level
@@ -1139,7 +1139,7 @@ void set_extrude_min_temp(float temp)
 // Calculate the steps/s^2 acceleration rates, based on the mm/s^s
 void reset_acceleration_rates()
 {
-	for(int8_t i=0; i < NUM_AXIS; i++)
+	for(int8_t i=0; i < 7; i++)
         {
         axis_steps_per_sqr_second[i] = max_acceleration_units_per_sq_second[i] * axis_steps_per_unit[i];
         }

MarlinKimbra/planner.h

@@ -110,10 +110,10 @@ void check_axes_activity();
 uint8_t movesplanned(); //return the nr of buffered moves
 
 extern unsigned long minsegmenttime;
-extern float max_feedrate[NUM_AXIS]; // set the max speeds
+extern float max_feedrate[7]; // set the max speeds
 extern float max_retraction_feedrate[4]; // set the max speeds for retraction
-extern float axis_steps_per_unit[NUM_AXIS];
-extern unsigned long max_acceleration_units_per_sq_second[NUM_AXIS]; // Use M201 to override by software
+extern float axis_steps_per_unit[7];
+extern unsigned long max_acceleration_units_per_sq_second[7]; // Use M201 to override by software
 extern float minimumfeedrate;
 extern float acceleration;         // Normal acceleration mm/s^2  THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX
 extern float retract_acceleration; //  mm/s^2   filament pull-pack and push-forward  while standing still in the other axis M204 TXXXX
@@ -121,7 +121,7 @@ extern float max_xy_jerk; //speed than can be stopped at once, if i understand c
 extern float max_z_jerk;
 extern float max_e_jerk;
 extern float mintravelfeedrate;
-extern unsigned long axis_steps_per_sqr_second[NUM_AXIS];
+extern unsigned long axis_steps_per_sqr_second[7];
 
 #ifdef AUTOTEMP
     extern bool autotemp_enabled;