Update 4.2.0 dev

final test stage

MarlinKimbra/Configuration_Pins.h

@@ -65,21 +65,10 @@
 //=========================== FEATURE ==============================
 
 #if ENABLED(MKR4)
-  #if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1)    // Use this for one driver and two extruder
-    #define E0E1_CHOICE_PIN    5
-  #elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1)  // Use this for one driver and 3 extruder
-    #define E0E1_CHOICE_PIN    5
-    #define E0E2_CHOICE_PIN    6
-  #elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1)  // Use this for one driver and 4 extruder
-    #define E0E1_CHOICE_PIN    4
-    #define E0E2_CHOICE_PIN    5
-    #define E0E3_CHOICE_PIN    6
-  #elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2)  // Use this for two driver and 3 extruder
-    #define E0E2_CHOICE_PIN    5
-  #elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2)  // Use this for two driver and 4 extruder
-    #define E0E2_CHOICE_PIN    5
-    #define E1E3_CHOICE_PIN    6
-  #endif //EXTRUDERS
+  #define E0E1_CHOICE_PIN    -1
+  #define E0E2_CHOICE_PIN    -1
+  #define E0E3_CHOICE_PIN    -1
+  #define E1E3_CHOICE_PIN    -1
 #endif //MKR4
 
 #if ENABLED(NPR2)
@@ -87,8 +76,8 @@
 #endif
 
 #if ENABLED(LASERBEAM)
-  #define LASER_PWR_PIN       41
-  #define LASER_TTL_PIN       42
+  #define LASER_PWR_PIN       -1
+  #define LASER_TTL_PIN       -1
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
@@ -128,5 +117,9 @@
   #define X2_DIR_PIN -1
 #endif
 
+#if ENABLED(Z_PROBE_SLED)
+  #define SLED_PIN -1
+#endif
+
 //============================================================================
 #endif
\ No newline at end of file

MarlinKimbra/conditionals.h

@@ -361,7 +361,7 @@
   #define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
 
   // Z_RAISE_AFTER_PROBING is not for all probes. Be sure that it is zero in that cases
-  #if (NUM_SERVOS == 0) && DISABLED(Z_PROBE_SLED)
+  #if DISABLED(ENABLE_SERVOS) && DISABLED(Z_PROBE_SLED)
     #undef Z_RAISE_AFTER_PROBING
     #define Z_RAISE_AFTER_PROBING 0
   #endif
@@ -557,13 +557,14 @@
 #define HAS_AUTO_FAN (HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3)
 #define HAS_FAN (PIN_EXISTS(FAN))
 #define HAS_CONTROLLERFAN (ENABLED(CONTROLLERFAN) && PIN_EXISTS(CONTROLLERFAN))
-#define HAS_SERVOS (ENABLED(ENABLE_SERVOS) && NUM_SERVOS > 0)
 #define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
 #define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
 #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
 #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
+#define HAS_SERVOS ((ENABLED(ENABLE_SERVOS) && NUM_SERVOS > 0) && (HAS_SERVO_0 || HAS_SERVO_1 || HAS_SERVO_2 || HAS_SERVO_3))
 #define HAS_FILAMENT_SENSOR (ENABLED(FILAMENT_SENSOR) && PIN_EXISTS(FILWIDTH))
 #define HAS_POWER_CONSUMPTION_SENSOR (ENABLED(POWER_CONSUMPTION) && PIN_EXISTS(POWER_CONSUMPTION))
+#define HAS_Z_PROBE_SLED (ENABLED(Z_PROBE_SLED) && PIN_EXISTS(SLED_PIN))
 #define HAS_FILRUNOUT (ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FILRUNOUT))
 #define HAS_HOME (PIN_EXISTS(HOME))
 #define HAS_KILL (PIN_EXISTS(KILL))
@@ -583,10 +584,10 @@
 #define HAS_SOLENOID_1 (PIN_EXISTS(SOL1))
 #define HAS_SOLENOID_2 (PIN_EXISTS(SOL2))
 #define HAS_SOLENOID_3 (PIN_EXISTS(SOL3))
-#define HAS_MICROSTEPS (PIN_EXISTS(X_MS1))
-#define HAS_MICROSTEPS_E0 (PIN_EXISTS(E0_MS1))
-#define HAS_MICROSTEPS_E1 (PIN_EXISTS(E1_MS1))
-#define HAS_MICROSTEPS_E2 (PIN_EXISTS(E2_MS1))
+#define HAS_MICROSTEPS (ENABLED(USE_MICROSTEPS) && PIN_EXISTS(X_MS1))
+#define HAS_MICROSTEPS_E0 (ENABLED(USE_MICROSTEPS) && PIN_EXISTS(E0_MS1))
+#define HAS_MICROSTEPS_E1 (ENABLED(USE_MICROSTEPS) && PIN_EXISTS(E1_MS1))
+#define HAS_MICROSTEPS_E2 (ENABLED(USE_MICROSTEPS) && PIN_EXISTS(E2_MS1))
 #define HAS_STEPPER_RESET (PIN_EXISTS(STEPPER_RESET))
 #define HAS_X_ENABLE (PIN_EXISTS(X_ENABLE))
 #define HAS_X2_ENABLE (PIN_EXISTS(X2_ENABLE))

MarlinKimbra/configuration_feature.h

@@ -1310,6 +1310,7 @@
  * Alligator Board support 16 or 32 only value                         *
  *                                                                     *
  ***********************************************************************/
+//#define USE_MICROSTEPS
 #define MICROSTEP_MODES {16, 16, 16, 16} // X Y Z E - [1,2,4,8,16,32]
 /***********************************************************************/
 
@@ -1320,9 +1321,10 @@
  *                                                                     *
  * Use it if you have low speed stepper driver                         *
  *                                                                     *
- * Uncomment STEPPER_HIGH_LOW_DELAY to enable this feature             *
+ * Uncomment STEPPER_HIGH_LOW to enable this feature                   *
  *                                                                     *
  ***********************************************************************/
+//#define STEPPER_HIGH_LOW
 //#define STEPPER_HIGH_LOW_DELAY 1u  // Delay in microseconds
 /***********************************************************************/
 

MarlinKimbra/elements.h

@@ -49,8 +49,7 @@
 
 #include "language.h"
 #include "conditionals.h"
-#include "dependencies.h"
-#include "conflicts.h"
+#include "sanitycheck.h"
 
 #include "comunication.h"
 

MarlinKimbra/stepper.cpp

@@ -683,7 +683,7 @@ ISR(TIMER1_COMPA_vect) {
         STEP_START(e,E);
       #endif
 
-      #if EXIST(STEPPER_HIGH_LOW_DELAY) && STEPPER_HIGH_LOW_DELAY > 0
+      #if ENABLED(STEPPER_HIGH_LOW) && STEPPER_HIGH_LOW_DELAY > 0
         delayMicroseconds(STEPPER_HIGH_LOW_DELAY);
       #endif