fixes

Author: thinkyhead

Marlin/Configuration_adv.h

@@ -2806,10 +2806,10 @@
   #define RETRACT_LENGTH_SWAP          13   // (mm) Default swap retract length (positive value)
   #define RETRACT_FEEDRATE             45   // (mm/s) Default feedrate for retracting
   #define RETRACT_ZRAISE                0   // (mm) Default retract Z-raise
-  #define RECOVER_LENGTH                0   // (mm) Default additional recover length (added to retract length on recover)
-  #define RECOVER_LENGTH_SWAP           0   // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
-  #define RECOVER_FEEDRATE              8   // (mm/s) Default feedrate for recovering from retraction
-  #define RECOVER_FEEDRATE_SWAP         8   // (mm/s) Default feedrate for recovering from swap retraction
+  #define RETRACT_RECOVER_LENGTH        0   // (mm) Default additional recover length (added to retract length on recover)
+  #define RETRACT_RECOVER_LENGTH_SWAP   0   // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
+  #define RETRACT_RECOVER_FEEDRATE      8   // (mm/s) Default feedrate for recovering from retraction
+  #define RETRACT_RECOVER_FEEDRATE_SWAP 8   // (mm/s) Default feedrate for recovering from swap retraction
   #if ENABLED(MIXING_EXTRUDER)
     //#define RETRACT_SYNC_MIXING           // Retract and restore all mixing steppers simultaneously
   #endif

Marlin/src/feature/fwretract.cpp

@@ -60,39 +60,16 @@ Flags<EXTRUDERS> FWRetract::retracted;        // Which extruders are currently r
 float FWRetract::current_retract[EXTRUDERS],  // Retract value used by planner
       FWRetract::current_hop;
 
-
-/*===========================================================
-                DELETE THIS BEFORE MERGING
-                USED TO MAKE SUCCESSFUL CHECKS
-=============================================================*/
-  #ifndef RECOVER_LENGTH
-    #define RECOVER_LENGTH RETRACT_RECOVER_LENGTH
-  #endif
-  #ifndef RECOVER_FEEDRATE
-    #define RECOVER_FEEDRATE RETRACT_RECOVER_LENGTH_SWAP
-  #endif
-  #ifndef RECOVER_LENGTH_SWAP
-    #define RECOVER_LENGTH_SWAP RETRACT_RECOVER_FEEDRATE
-  #endif
-  #ifndef RECOVER_FEEDRATE_SWAP
-    #define RECOVER_FEEDRATE_SWAP RETRACT_RECOVER_FEEDRATE_SWAP
-  #endif
-/*===========================================================
-                DELETE THIS BEFORE MERGING
-                USED TO MAKE SUCCESSFUL CHECKS
-=============================================================*/
-
-
 void FWRetract::reset() {
   TERN_(FWRETRACT_AUTORETRACT, autoretract_enabled = false);
   settings.retract_length = RETRACT_LENGTH;
   settings.retract_feedrate = RETRACT_FEEDRATE;
   settings.swap_retract_length = RETRACT_LENGTH_SWAP;
   settings.retract_zraise = RETRACT_ZRAISE;
-  settings.recover_extra = RECOVER_LENGTH;
-  settings.recover_feedrate = RECOVER_FEEDRATE;
-  settings.swap_recover_extra = RECOVER_LENGTH_SWAP;
-  settings.swap_recover_feedrate = RECOVER_FEEDRATE_SWAP;
+  settings.recover_extra = RETRACT_RECOVER_LENGTH;
+  settings.recover_feedrate = RETRACT_RECOVER_FEEDRATE;
+  settings.swap_recover_extra = RETRACT_RECOVER_LENGTH_SWAP;
+  settings.swap_recover_feedrate = RETRACT_RECOVER_FEEDRATE_SWAP;
   current_hop = 0.0;
 
   retracted.reset();

Marlin/src/gcode/host/M360.cpp

@@ -149,12 +149,10 @@ void GcodeSuite::M360() {
   //
   // Axis Steps per mm
   //
-  #define _STEPS(A) planner.settings.axis_steps_per_mm[A##_AXIS]
   PGMSTR(S_MM_STR, "Steps/mm");
-  config_line(S_MM_STR, _STEPS(X, acceleration), X_STR);
-  config_line(S_MM_STR, _STEPS(Y, acceleration), Y_STR);
-  config_line(S_MM_STR, _STEPS(Z, acceleration), Z_STR);
-  #undef _STEPS
+  config_line(S_MM_STR, planner.settings.axis_steps_per_mm[X_AXIS], X_STR);
+  config_line(S_MM_STR, planner.settings.axis_steps_per_mm[Y_AXIS], Y_STR);
+  config_line(S_MM_STR, planner.settings.axis_steps_per_mm[Z_AXIS], Z_STR);
 
   //
   // Print and Travel Acceleration
@@ -200,7 +198,7 @@ void GcodeSuite::M360() {
       #elif ENABLED(CLASSIC_JERK)
         config_line_e(e, JERK_STR, planner.max_jerk.e);
       #endif
-      config_line_e(e, F("Steps/mm"), planner.axis_steps_per_mm[E_AXIS_N(e)]);
+      config_line_e(e, F("Steps/mm"), planner.settings.axis_steps_per_mm[E_AXIS_N(e)]);
       config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
       config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
       config_line_e(e, F("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e]));
@@ -209,4 +207,4 @@ void GcodeSuite::M360() {
   #endif
 }
 
-#endif
+#endif // REPETIER_GCODE_M360