Merge pull request #7281 from thinkyhead/bf_seen_not_volatile

Fixes for recent merges

Author: thinkyhead

Marlin/G26_Mesh_Validation_Tool.cpp

@@ -58,67 +58,67 @@
    *
    *   G26 is a Mesh Validation Tool intended to provide support for the Marlin Unified Bed Leveling System.
    *   In order to fully utilize and benefit from the Marlin Unified Bed Leveling System an accurate Mesh must
-   *   be defined.  G29 is designed to allow the user to quickly validate the correctness of her Mesh.  It will
+   *   be defined. G29 is designed to allow the user to quickly validate the correctness of her Mesh. It will
    *   first heat the bed and nozzle. It will then print lines and circles along the Mesh Cell boundaries and
    *   the intersections of those lines (respectively).
    *
    *   This action allows the user to immediately see where the Mesh is properly defined and where it needs to
-   *   be edited.  The command will generate the Mesh lines closest to the nozzle's starting position.  Alternatively
-   *   the user can specify the X and Y position of interest with command parameters.  This allows the user to
+   *   be edited. The command will generate the Mesh lines closest to the nozzle's starting position. Alternatively
+   *   the user can specify the X and Y position of interest with command parameters. This allows the user to
    *   focus on a particular area of the Mesh where attention is needed.
    *
-   *   B #  Bed         Set the Bed Temperature.  If not specified, a default of 60 C. will be assumed.
+   *   B #  Bed         Set the Bed Temperature. If not specified, a default of 60 C. will be assumed.
    *
    *   C    Current     When searching for Mesh Intersection points to draw, use the current nozzle location
    *                    as the base for any distance comparison.
    *
-   *   D    Disable     Disable the Unified Bed Leveling System.  In the normal case the user is invoking this
-   *                    command to see how well a Mesh as been adjusted to match a print surface.  In order to do
-   *                    this the Unified Bed Leveling System is turned on by the G26 command.  The D parameter
+   *   D    Disable     Disable the Unified Bed Leveling System. In the normal case the user is invoking this
+   *                    command to see how well a Mesh as been adjusted to match a print surface. In order to do
+   *                    this the Unified Bed Leveling System is turned on by the G26 command. The D parameter
    *                    alters the command's normal behaviour and disables the Unified Bed Leveling System even if
    *                    it is on.
    *
-   *   H #  Hotend      Set the Nozzle Temperature.  If not specified, a default of 205 C. will be assumed.
+   *   H #  Hotend      Set the Nozzle Temperature. If not specified, a default of 205 C. will be assumed.
    *
-   *   F #  Filament    Used to specify the diameter of the filament being used.  If not specified
-   *                    1.75mm filament is assumed.  If you are not getting acceptable results by using the
+   *   F #  Filament    Used to specify the diameter of the filament being used. If not specified
+   *                    1.75mm filament is assumed. If you are not getting acceptable results by using the
    *                    'correct' numbers, you can scale this number up or down a little bit to change the amount
    *                    of filament that is being extruded during the printing of the various lines on the bed.
    *
    *   K    Keep-On     Keep the heaters turned on at the end of the command.
    *
-   *   L #  Layer       Layer height.  (Height of nozzle above bed)  If not specified .20mm will be used.
+   *   L #  Layer       Layer height. (Height of nozzle above bed)  If not specified .20mm will be used.
    *
-   *   O #  Ooooze      How much your nozzle will Ooooze filament while getting in position to print.  This
+   *   O #  Ooooze      How much your nozzle will Ooooze filament while getting in position to print. This
    *                    is over kill, but using this parameter will let you get the very first 'circle' perfect
    *                    so you have a trophy to peel off of the bed and hang up to show how perfectly you have your
-   *                    Mesh calibrated.  If not specified, a filament length of .3mm is assumed.
+   *                    Mesh calibrated. If not specified, a filament length of .3mm is assumed.
    *
-   *   P #  Prime       Prime the nozzle with specified length of filament.  If this parameter is not
-   *                    given, no prime action will take place.  If the parameter specifies an amount, that much
-   *                    will be purged before continuing.  If no amount is specified the command will start
+   *   P #  Prime       Prime the nozzle with specified length of filament. If this parameter is not
+   *                    given, no prime action will take place. If the parameter specifies an amount, that much
+   *                    will be purged before continuing. If no amount is specified the command will start
    *                    purging filament until the user provides an LCD Click and then it will continue with
-   *                    printing the Mesh.  You can carefully remove the spent filament with a needle nose
-   *                    pliers while holding the LCD Click wheel in a depressed state.  If you do not have
+   *                    printing the Mesh. You can carefully remove the spent filament with a needle nose
+   *                    pliers while holding the LCD Click wheel in a depressed state. If you do not have
    *                    an LCD, you must specify a value if you use P.
    *
-   *   Q #  Multiplier  Retraction Multiplier.  Normally not needed.  Retraction defaults to 1.0mm and
+   *   Q #  Multiplier  Retraction Multiplier. Normally not needed. Retraction defaults to 1.0mm and
    *                    un-retraction is at 1.2mm   These numbers will be scaled by the specified amount
    *
    *   R #  Repeat      Prints the number of patterns given as a parameter, starting at the current location.
    *                    If a parameter isn't given, every point will be printed unless G26 is interrupted.
    *                    This works the same way that the UBL G29 P4 R parameter works.
    *
-   *                    NOTE:  If you do not have an LCD, you -must- specify R.  This is to ensure that you are
+   *                    NOTE:  If you do not have an LCD, you -must- specify R. This is to ensure that you are
    *                    aware that there's some risk associated with printing without the ability to abort in
-   *                    cases where mesh point Z value may be inaccurate.  As above, if you do not include a
+   *                    cases where mesh point Z value may be inaccurate. As above, if you do not include a
    *                    parameter, every point will be printed.
    *
-   *   S #  Nozzle      Used to control the size of nozzle diameter.  If not specified, a .4mm nozzle is assumed.
+   *   S #  Nozzle      Used to control the size of nozzle diameter. If not specified, a .4mm nozzle is assumed.
    *
-   *   U #  Random      Randomize the order that the circles are drawn on the bed.  The search for the closest
-   *                    undrawn cicle is still done.  But the distance to the location for each circle has a
-   *                    random number of the size specified added to it.  Specifying S50 will give an interesting
+   *   U #  Random      Randomize the order that the circles are drawn on the bed. The search for the closest
+   *                    undrawn cicle is still done. But the distance to the location for each circle has a
+   *                    random number of the size specified added to it. Specifying S50 will give an interesting
    *                    deviation from the normal behaviour on a 10 x 10 Mesh.
    *
    *   X #  X Coord.    Specify the starting location of the drawing activity.
@@ -218,7 +218,7 @@
    * nozzle in a problem area and doing a G29 P4 R command.
    */
   void unified_bed_leveling::G26() {
-    SERIAL_ECHOLNPGM("G26 command started.  Waiting for heater(s).");
+    SERIAL_ECHOLNPGM("G26 command started. Waiting for heater(s).");
     float tmp, start_angle, end_angle;
     int   i, xi, yi;
     mesh_index_pair location;
@@ -264,7 +264,7 @@
     //debug_current_and_destination(PSTR("Starting G26 Mesh Validation Pattern."));
 
     /**
-     * Declare and generate a sin() & cos() table to be used during the circle drawing.  This will lighten
+     * Declare and generate a sin() & cos() table to be used during the circle drawing. This will lighten
      * the CPU load and make the arc drawing faster and more smooth
      */
     float sin_table[360 / 30 + 1], cos_table[360 / 30 + 1];
@@ -575,17 +575,17 @@
 
   /**
    * print_line_from_here_to_there() takes two cartesian coordinates and draws a line from one
-   * to the other.  But there are really three sets of coordinates involved.  The first coordinate
-   * is the present location of the nozzle.  We don't necessarily want to print from this location.
-   * We first need to move the nozzle to the start of line segment where we want to print.  Once
+   * to the other. But there are really three sets of coordinates involved. The first coordinate
+   * is the present location of the nozzle. We don't necessarily want to print from this location.
+   * We first need to move the nozzle to the start of line segment where we want to print. Once
    * there, we can use the two coordinates supplied to draw the line.
    *
    * Note:  Although we assume the first set of coordinates is the start of the line and the second
-   * set of coordinates is the end of the line, it does not always work out that way.  This function
-   * optimizes the movement to minimize the travel distance before it can start printing.  This saves
-   * a lot of time and eleminates a lot of non-sensical movement of the nozzle.   However, it does
+   * set of coordinates is the end of the line, it does not always work out that way. This function
+   * optimizes the movement to minimize the travel distance before it can start printing. This saves
+   * a lot of time and eliminates a lot of nonsensical movement of the nozzle. However, it does
    * cause a lot of very little short retracement of th nozzle when it draws the very first line
-   * segment of a 'circle'.   The time this requires is very short and is easily saved by the other
+   * segment of a 'circle'. The time this requires is very short and is easily saved by the other
    * cases where the optimization comes into play.
    */
   void unified_bed_leveling::print_line_from_here_to_there(const float &sx, const float &sy, const float &sz, const float &ex, const float &ey, const float &ez) {
@@ -850,7 +850,7 @@
 
           stepper.synchronize();    // Without this synchronize, the purge is more consistent,
                                     // but because the planner has a buffer, we won't be able
-                                    // to stop as quickly.  So we put up with the less smooth
+                                    // to stop as quickly. So we put up with the less smooth
                                     // action to give the user a more responsive 'Stop'.
           set_destination_to_current();
           idle();
@@ -860,7 +860,7 @@
 
         #if ENABLED(ULTRA_LCD)
           strcpy_P(lcd_status_message, PSTR("Done Priming")); // We can't do lcd_setstatusPGM() without having it continue;
-                                                              // So...  We cheat to get a message up.
+                                                              // So... We cheat to get a message up.
           lcd_setstatusPGM(PSTR("Done Priming"), 99);
           lcd_quick_feedback();
         #endif

Marlin/Marlin_main.cpp

@@ -3242,7 +3242,7 @@ inline void gcode_G0_G1(
       if (autoretract_enabled && !(parser.seen('X') || parser.seen('Y') || parser.seen('Z')) && parser.seen('E')) {
         const float echange = destination[E_AXIS] - current_position[E_AXIS];
         // Is this move an attempt to retract or recover?
-        if ((echange < -MIN_RETRACT && !retracted[active_extruder]) || (echange > MIN_RETRACT && retracted[active_extruder])) {
+        if ((echange < -(MIN_RETRACT) && !retracted[active_extruder]) || (echange > MIN_RETRACT && retracted[active_extruder])) {
           current_position[E_AXIS] = destination[E_AXIS]; // hide the slicer-generated retract/recover from calculations
           sync_plan_position_e();  // AND from the planner
           retract(!retracted[active_extruder]);
@@ -4617,11 +4617,11 @@ void home_all_axes() { gcode_G28(true); }
 
         #if ENABLED(AUTO_BED_LEVELING_LINEAR)
 
-//        mean += measured_z;                                  // I believe this is unused code?
-//        eqnBVector[abl_probe_index] = measured_z;            // I believe this is unused code?
-//        eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe;     // I believe this is unused code?
-//        eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe;     // I believe this is unused code?
-//        eqnAMatrix[abl_probe_index + 2 * abl2] = 1;          // I believe this is unused code?
+          mean += measured_z;
+          eqnBVector[abl_probe_index] = measured_z;
+          eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe;
+          eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe;
+          eqnAMatrix[abl_probe_index + 2 * abl2] = 1;
 
         #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
@@ -4797,9 +4797,6 @@ void home_all_axes() { gcode_G28(true); }
 
               incremental_LSF(&lsf_results, xProbe, yProbe, measured_z);
 
-          #if ENABLED(AUTO_BED_LEVELING_LINEAR)
-            indexIntoAB[xCount][yCount] = abl_probe_index;
-          #endif
             #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
               z_values[xCount][yCount] = measured_z + zoffset;
@@ -4924,11 +4921,10 @@ void home_all_axes() { gcode_G28(true); }
       }
 
       // Create the matrix but don't correct the position yet
-      if (!dryrun) {
+      if (!dryrun)
         planner.bed_level_matrix = matrix_3x3::create_look_at(
-          vector_3(-plane_equation_coefficients[0], -plane_equation_coefficients[1], 1)    // We can eleminate the '-' here and up above
+          vector_3(-plane_equation_coefficients[0], -plane_equation_coefficients[1], 1)    // We can eliminate the '-' here and up above
         );
-      }
 
       // Show the Topography map if enabled
       if (do_topography_map) {

Marlin/least_squares_fit.cpp

@@ -68,4 +68,4 @@ int finish_incremental_LSF(struct linear_fit_data *lsf) {
   return 0;
 }
 
-#endif // AUTO_BED_LEVELING_UBL || ENABLED(AUTO_BED_LEVELING_LINEAR)  
+#endif // AUTO_BED_LEVELING_UBL || ENABLED(AUTO_BED_LEVELING_LINEAR)

Marlin/least_squares_fit.h

@@ -34,7 +34,7 @@
 
 #include "MarlinConfig.h"
 
-#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_LINEAR)    
+#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_LINEAR)
 
 #include "Marlin.h"
 #include "macros.h"

Marlin/ultralcd_impl_DOGM.h

@@ -976,8 +976,8 @@ static void lcd_implementation_status_screen() {
       uint8_t x_map_pixels = ((MAP_MAX_PIXELS_X - 4) / (GRID_MAX_POINTS_X)) * (GRID_MAX_POINTS_X),
               y_map_pixels = ((MAP_MAX_PIXELS_Y - 4) / (GRID_MAX_POINTS_Y)) * (GRID_MAX_POINTS_Y),
 
-              pixels_per_X_mesh_pnt = x_map_pixels / (GRID_MAX_POINTS_X),
-              pixels_per_Y_mesh_pnt = y_map_pixels / (GRID_MAX_POINTS_Y),
+              pixels_per_x_mesh_pnt = x_map_pixels / (GRID_MAX_POINTS_X),
+              pixels_per_y_mesh_pnt = y_map_pixels / (GRID_MAX_POINTS_Y),
 
               x_offset = MAP_UPPER_LEFT_CORNER_X + 1 + (MAP_MAX_PIXELS_X - x_map_pixels - 2) / 2,
               y_offset = MAP_UPPER_LEFT_CORNER_Y + 1 + (MAP_MAX_PIXELS_Y - y_map_pixels - 2) / 2;
@@ -996,23 +996,23 @@ static void lcd_implementation_status_screen() {
       // Display Mesh Point Locations
 
       u8g.setColorIndex(1);
-      const uint8_t sx = x_offset + pixels_per_X_mesh_pnt / 2;
-            uint8_t  y = y_offset + pixels_per_Y_mesh_pnt / 2;
-      for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++, y += pixels_per_Y_mesh_pnt)
+      const uint8_t sx = x_offset + pixels_per_x_mesh_pnt / 2;
+            uint8_t  y = y_offset + pixels_per_y_mesh_pnt / 2;
+      for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++, y += pixels_per_y_mesh_pnt)
         if (PAGE_CONTAINS(y, y))
-          for (uint8_t i = 0, x = sx; i < GRID_MAX_POINTS_X; i++, x += pixels_per_X_mesh_pnt)
+          for (uint8_t i = 0, x = sx; i < GRID_MAX_POINTS_X; i++, x += pixels_per_x_mesh_pnt)
             u8g.drawBox(sx, y, 1, 1);
 
       // Fill in the Specified Mesh Point
 
       uint8_t inverted_y = GRID_MAX_POINTS_Y - y_plot - 1;  // The origin is typically in the lower right corner.  We need to
                                                             // invert the Y to get it to plot in the right location.
 
-      const uint8_t by = y_offset + inverted_y * pixels_per_Y_mesh_pnt;
-      if (PAGE_CONTAINS(by, by + pixels_per_Y_mesh_pnt))
+      const uint8_t by = y_offset + inverted_y * pixels_per_y_mesh_pnt;
+      if (PAGE_CONTAINS(by, by + pixels_per_y_mesh_pnt))
         u8g.drawBox(
-          x_offset + x_plot * pixels_per_X_mesh_pnt, by,
-          pixels_per_X_mesh_pnt, pixels_per_Y_mesh_pnt
+          x_offset + x_plot * pixels_per_x_mesh_pnt, by,
+          pixels_per_x_mesh_pnt, pixels_per_y_mesh_pnt
         );
 
       // Put Relevant Text on Display