Browse Source

Merge pull request #6071 from Roxy-3D/RCBugFix

Allow FWRETRACT with UBL Enabled
Roxy-3D 8 years ago
parent
commit
b3c4f71c6f
1 changed files with 8 additions and 8 deletions
  1. 8
    8
      Marlin/G26_Mesh_Validation_Tool.cpp

+ 8
- 8
Marlin/G26_Mesh_Validation_Tool.cpp View File

@@ -146,10 +146,10 @@
146 146
         Random_Deviation = 0.0,
147 147
         Layer_Height = LAYER_HEIGHT;
148 148
 
149
-  bool retracted = false; // We keep track of the state of the nozzle to know if it
150
-                          // is currently retracted or not.  This allows us to be
151
-                          // less careful because mis-matched retractions and un-retractions
152
-                          // won't leave us in a bad state.
149
+  bool G26_retracted = false; // We keep track of the state of the nozzle to know if it
150
+                              // is currently retracted or not.  This allows us to be
151
+                              // less careful because mis-matched retractions and un-retractions
152
+                              // won't leave us in a bad state.
153 153
   #if ENABLED(ULTRA_LCD)
154 154
     void lcd_setstatus(const char* message, bool persist);
155 155
   #endif
@@ -673,8 +673,8 @@
673 673
   }
674 674
 
675 675
   void retract_filament() {
676
-    if (!retracted) { // Only retract if we are not already retracted!
677
-      retracted = true;
676
+    if (!G26_retracted) { // Only retract if we are not already retracted!
677
+      G26_retracted = true;
678 678
       if (G26_Debug_flag) SERIAL_ECHOLNPGM(" Decided to do retract.");
679 679
       move_to(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], -1.0 * Retraction_Multiplier);
680 680
       if (G26_Debug_flag) SERIAL_ECHOLNPGM(" Retraction done.");
@@ -682,9 +682,9 @@
682 682
   }
683 683
 
684 684
   void un_retract_filament() {
685
-    if (retracted) { // Only un-retract if we are retracted.
685
+    if (G26_retracted) { // Only un-retract if we are retracted.
686 686
       move_to(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], 1.2 * Retraction_Multiplier);
687
-      retracted = false;
687
+      G26_retracted = false;
688 688
       if (G26_Debug_flag) SERIAL_ECHOLNPGM(" unretract done.");
689 689
     }
690 690
   }

Loading…
Cancel
Save