misc. cleanup

Author: thinkyhead

Marlin/Configuration_adv.h

@@ -602,10 +602,10 @@
  * gets it spinning reliably for a short time before setting the requested speed.
  * (Does not work on Sanguinololu with FAN_SOFT_PWM.)
  */
-//#define FAN_KICKSTART_TIME  100    // (ms)
-//#define FAN_KICKSTART_POWER 180    // 64-255
-//#define FAN_KICKSTART_LINEAR       // Set kickstart time linearly based on the speed, e.g. for 20% (51) it  will be FAN_KICKSTART_TIME * 0.2.
-                                     // Usefull for quick speed up to low speed. Kickstart power will be set to 255.
+//#define FAN_KICKSTART_TIME  100  // (ms)
+//#define FAN_KICKSTART_POWER 180  // 64-255
+//#define FAN_KICKSTART_LINEAR     // Set kickstart time linearly based on the speed, e.g. for 20% (51) it will be FAN_KICKSTART_TIME * 0.2.
+                                   // Useful for quick speed up to low speed. Kickstart power must be set to 255.
 
 // Some coolers may require a non-zero "off" state.
 //#define FAN_OFF_PWM  1

Marlin/src/inc/Conditionals_post.h

@@ -2752,7 +2752,7 @@
 
 // Fan Kickstart
 #if FAN_KICKSTART_TIME && !defined(FAN_KICKSTART_POWER)
-  #define FAN_KICKSTART_POWER 180
+  #define FAN_KICKSTART_POWER TERN(FAN_KICKSTART_LINEAR, 255, 180)
 #endif
 
 // Servos

Marlin/src/inc/SanityCheck.h

@@ -1011,8 +1011,12 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
 #endif
 
 // Fan Kickstart power
-#if FAN_KICKSTART_TIME && !WITHIN(FAN_KICKSTART_POWER, 64, 255)
-  #error "FAN_KICKSTART_POWER must be an integer from 64 to 255."
+#if FAN_KICKSTART_TIME
+  #if ENABLED(FAN_KICKSTART_LINEAR) && FAN_KICKSTART_POWER != 255
+    #error "FAN_KICKSTART_LINEAR requires a FAN_KICKSTART_POWER of 255."
+  #elif !WITHIN(FAN_KICKSTART_POWER, 64, 255)
+    #error "FAN_KICKSTART_POWER must be an integer from 64 to 255."
+  #endif
 #endif
 
 /**

Marlin/src/module/planner.cpp

@@ -1314,19 +1314,16 @@ void Planner::recalculate(const_float_t safe_exit_speed_sqr) {
       if (fan_speed[f] > FAN_OFF_PWM) {
         if (fan_kick_end[f] == 0 && fan_speed[f] > set_fan_speed[f]) {
           fan_kick_end[f] = ms + FAN_KICKSTART_TIME TERN_(FAN_KICKSTART_LINEAR, * (fan_speed[f] - set_fan_speed[f]) / 255);
-          fan_speed[f] = TERN(FAN_KICKSTART_LINEAR, 255, FAN_KICKSTART_POWER);
+          fan_speed[f] = FAN_KICKSTART_POWER;
+          return;
+        }
+        else if (PENDING(ms, fan_kick_end[f])) {
+          fan_speed[f] = FAN_KICKSTART_POWER;
+          return;
         }
-        else if (PENDING(ms, fan_kick_end[f]))
-          fan_speed[f] = TERN(FAN_KICKSTART_LINEAR, 255, FAN_KICKSTART_POWER);
-             else {
-          fan_kick_end[f] = 0;
-          set_fan_speed[f] = fan_speed[f];
-             }
-      }
-      else {
-        fan_kick_end[f] = 0;
-        set_fan_speed[f] = fan_speed[f];
       }
+      fan_kick_end[f] = 0;
+      set_fan_speed[f] = fan_speed[f];
     }
 
   #endif