Browse Source

Move FWRETRACT defaults to configuration_adv.h

whosawhatsis 10 years ago
parent
commit
99f0e44864
2 changed files with 14 additions and 4 deletions
  1. 8
    2
      Marlin/Configuration_adv.h
  2. 6
    2
      Marlin/Marlin_main.cpp

+ 8
- 2
Marlin/Configuration_adv.h View File

399
 // the moves are than replaced by the firmware controlled ones.
399
 // the moves are than replaced by the firmware controlled ones.
400
 
400
 
401
 // #define FWRETRACT  //ONLY PARTIALLY TESTED
401
 // #define FWRETRACT  //ONLY PARTIALLY TESTED
402
-#define MIN_RETRACT 0.1 //minimum extruded mm to accept a automatic gcode retraction attempt
403
-
402
+#ifdef FWRETRACT
403
+  #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
404
+  #define RETRACT_LENGTH 3               //default retract length (positive mm)
405
+  #define RETRACT_FEEDRATE 80*60         //default feedrate for retracting
406
+  #define RETRACT_ZLIFT 0                //default retract Z-lift
407
+  #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
408
+  #define RETRACT_RECOVER_FEEDRATE 8*60  //default feedrate for recovering from retraction
409
+#endif
404
 
410
 
405
 //adds support for experimental filament exchange support M600; requires display
411
 //adds support for experimental filament exchange support M600; requires display
406
 #ifdef ULTIPANEL
412
 #ifdef ULTIPANEL

+ 6
- 2
Marlin/Marlin_main.cpp View File

233
 #ifdef FWRETRACT
233
 #ifdef FWRETRACT
234
   bool autoretract_enabled=true;
234
   bool autoretract_enabled=true;
235
   bool retracted=false;
235
   bool retracted=false;
236
-  float retract_length=3, retract_feedrate=17*60, retract_zlift=0.8;
237
-  float retract_recover_length=0, retract_recover_feedrate=8*60;
236
+  float retract_length = RETRACT_LENGTH;
237
+  float retract_feedrate = RETRACT_FEEDRATE;
238
+  float retract_zlift = RETRACT_ZLIFT;
239
+  float retract_recover_length = RETRACT_RECOVER_LENGTH;
240
+  float retract_recover_feedrate = RETRACT_RECOVER_FEEDRATE;
238
 #endif
241
 #endif
239
 
242
 
240
 #ifdef ULTIPANEL
243
 #ifdef ULTIPANEL
1115
     }
1118
     }
1116
   } //retract
1119
   } //retract
1117
 #endif //FWRETRACT
1120
 #endif //FWRETRACT
1121
+
1118
 void process_commands()
1122
 void process_commands()
1119
 {
1123
 {
1120
   unsigned long codenum; //throw away variable
1124
   unsigned long codenum; //throw away variable

Loading…
Cancel
Save