Same fix

MarlinKimbra/Configuration_adv.h

@@ -81,8 +81,8 @@
 //This is for controlling a fan to cool down the stepper drivers
 //it will turn on when any driver is enabled
 //and turn off after the set amount of seconds from last driver being disabled again
-#define CONTROLLERFAN_PIN -1 //Pin used for the fan to cool controller (-1 to disable)
-#define CONTROLLERFAN_SECS 60 //How many seconds, after all motors were disabled, the fan should run
+#define CONTROLLERFAN_PIN -1      // Pin used for the fan to cool controller (-1 to disable)
+#define CONTROLLERFAN_SECS 60     // How many seconds, after all motors were disabled, the fan should run
 #define CONTROLLERFAN_SPEED 255   // 255 = full speed
 #define CONTROLLERFAN_MIN_SPEED 0
 
@@ -333,16 +333,13 @@
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
 // it can e.g. be used to change z-positions in the print startup phase in real-time
 // does not respect endstops!
-#ifdef CARTESIAN
-  #define BABYSTEPPING  //On cartesian printer this can be enabled as default as fully working
-#else
 //#define BABYSTEPPING
-#endif
+
 #if ENABLED(BABYSTEPPING)
-  #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
-                       //not implemented for CoreXY and deltabots!
-  #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
-  #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
+  #define BABYSTEP_XY  // not only z, but also XY in the menu. more clutter, more functions
+                       // not implemented for CoreXY and deltabots!
+  #define BABYSTEP_INVERT_Z false     // true for inverse movements in Z
+  #define BABYSTEP_Z_MULTIPLICATOR 2  // faster z movements
 #endif
 
 // extruder advance constant (s2/mm3)

MarlinKimbra/conditionals.h

@@ -41,7 +41,6 @@
     #define DOGLCD  // Support for I2C LCD 128x64 (Controller SSD1306 graphic Display Family)
   #endif
 
-
   #if ENABLED(PANEL_ONE)
     #define SDSUPPORT
     #define ULTIMAKERCONTROLLER
@@ -98,7 +97,6 @@
   /**
    * I2C PANELS
    */
-
   #if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
     // This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home )
     // Make sure it is placed in the Arduino libraries directory.
@@ -368,7 +366,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) && !defined(Z_PROBE_SLED)
+    #if (NUM_SERVOS == 0) && DISABLED(Z_PROBE_SLED)
       #undef Z_RAISE_AFTER_PROBING
       #define Z_RAISE_AFTER_PROBING 0
     #endif
@@ -386,6 +384,13 @@
     #define Z_SAFE_HOMING
   #endif
 
+  /**
+   * Babystepping
+   */
+  #if ENABLED(CARTESIAN)
+    #define BABYSTEPPING  // On Cartesian printer this can be enabled as default as fully working
+  #endif
+
   /**
    * MAX_STEP_FREQUENCY differs for TOSHIBA OR ARDUINO DUE OR ARDUINO MEGA
    */
@@ -431,8 +436,10 @@
     #undef SD_DETECT_INVERTED
   #endif
 
-  // Power Signal Control Definitions
-  // By default use Normal definition
+  /**
+   * Power Signal Control Definitions
+   * By default use Normal definition
+   */
   #ifndef POWER_SUPPLY
     #define POWER_SUPPLY 0
   #endif
@@ -673,8 +680,14 @@
     #endif
   #endif
 
+  /**
+   * Buzzer
+   */
   #define HAS_BUZZER (PIN_EXISTS(BEEPER) || defined(LCD_USE_I2C_BUZZER))
 
+  /**
+   * Servos
+   */
   #if HAS_SERVOS
     #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0
       #define HAS_SERVO_ENDSTOPS true

MarlinKimbra/temperature.cpp

@@ -997,7 +997,6 @@ void tp_init() {
     #endif
   #endif
 
-
   #if HAS_POWER_CONSUMPTION_SENSOR
     ANALOG_SELECT(POWER_CONSUMPTION_PIN);
   #endif
@@ -1599,6 +1598,7 @@ ISR(TIMER0_COMPB_vect) {
 
   // Prepare or measure a sensor, each one every 14th frame
   switch(temp_state) {
+
     case PrepareTemp_0:
       #if HAS_TEMP_0
         START_ADC(TEMP_0_PIN);