Pārlūkot izejas kodu

PREVENT_DANGEROUS_EXTRUDE => PREVENT_COLD_EXTRUSION

Also improve the documentation of this and related options, and set
EXTRUDE_MINTEMP to 170 everywhere.
Scott Lahteine 8 gadus atpakaļ
vecāks
revīzija
01d4703429
28 mainītis faili ar 213 papildinājumiem un 167 dzēšanām
  1. 3
    3
      Marlin/Conditionals_post.h
  2. 9
    7
      Marlin/Configuration.h
  3. 7
    7
      Marlin/Marlin_main.cpp
  4. 2
    0
      Marlin/SanityCheck.h
  5. 9
    7
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 9
    7
      Marlin/example_configurations/Felix/Configuration.h
  7. 9
    7
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 9
    7
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 9
    7
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 9
    7
      Marlin/example_configurations/K8200/Configuration.h
  11. 9
    7
      Marlin/example_configurations/K8400/Configuration.h
  12. 9
    7
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 9
    7
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 9
    7
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 9
    7
      Marlin/example_configurations/SCARA/Configuration.h
  16. 9
    7
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 9
    7
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 9
    7
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 9
    7
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  20. 9
    7
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 9
    7
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 9
    7
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 9
    7
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 9
    7
      Marlin/example_configurations/makibox/Configuration.h
  25. 9
    7
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  26. 1
    1
      Marlin/planner.cpp
  27. 1
    1
      Marlin/temperature.cpp
  28. 1
    1
      Marlin/temperature.h

+ 3
- 3
Marlin/Conditionals_post.h Parādīt failu

522
   #define HAS_THERMALLY_PROTECTED_BED (HAS_TEMP_BED && HAS_HEATER_BED && ENABLED(THERMAL_PROTECTION_BED))
522
   #define HAS_THERMALLY_PROTECTED_BED (HAS_TEMP_BED && HAS_HEATER_BED && ENABLED(THERMAL_PROTECTION_BED))
523
 
523
 
524
   /**
524
   /**
525
-   * This value is used by M109 when trying to calculate a ballpark safe margin
526
-   * to prevent wait-forever situation.
525
+   * This setting is also used by M109 when trying to calculate
526
+   * a ballpark safe margin to prevent wait-forever situation.
527
    */
527
    */
528
   #ifndef EXTRUDE_MINTEMP
528
   #ifndef EXTRUDE_MINTEMP
529
-   #define EXTRUDE_MINTEMP 170
529
+    #define EXTRUDE_MINTEMP 170
530
   #endif
530
   #endif
531
 
531
 
532
   /**
532
   /**

+ 9
- 7
Marlin/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
354
-#define PREVENT_LENGTHY_EXTRUDE
355
-
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
356
 #define EXTRUDE_MINTEMP 170
355
 #define EXTRUDE_MINTEMP 170
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
358
+#define PREVENT_LENGTHY_EXTRUDE
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 7
- 7
Marlin/Marlin_main.cpp Parādīt failu

5844
 
5844
 
5845
 #endif // HAS_LCD_CONTRAST
5845
 #endif // HAS_LCD_CONTRAST
5846
 
5846
 
5847
-#if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
5847
+#if ENABLED(PREVENT_COLD_EXTRUSION)
5848
 
5848
 
5849
   /**
5849
   /**
5850
    * M302: Allow cold extrudes, or set the minimum extrude temperature
5850
    * M302: Allow cold extrudes, or set the minimum extrude temperature
5879
     }
5879
     }
5880
   }
5880
   }
5881
 
5881
 
5882
-#endif // PREVENT_DANGEROUS_EXTRUDE
5882
+#endif // PREVENT_COLD_EXTRUSION
5883
 
5883
 
5884
 /**
5884
 /**
5885
  * M303: PID relay autotune
5885
  * M303: PID relay autotune
7549
           break;
7549
           break;
7550
       #endif // HAS_LCD_CONTRAST
7550
       #endif // HAS_LCD_CONTRAST
7551
 
7551
 
7552
-      #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
7552
+      #if ENABLED(PREVENT_COLD_EXTRUSION)
7553
         case 302: // allow cold extrudes, or set the minimum extrude temperature
7553
         case 302: // allow cold extrudes, or set the minimum extrude temperature
7554
           gcode_M302();
7554
           gcode_M302();
7555
           break;
7555
           break;
7556
-      #endif // PREVENT_DANGEROUS_EXTRUDE
7556
+      #endif // PREVENT_COLD_EXTRUSION
7557
 
7557
 
7558
       case 303: // M303 PID autotune
7558
       case 303: // M303 PID autotune
7559
         gcode_M303();
7559
         gcode_M303();
8121
 
8121
 
8122
 #endif // !DELTA && !SCARA
8122
 #endif // !DELTA && !SCARA
8123
 
8123
 
8124
-#if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
8124
+#if ENABLED(PREVENT_COLD_EXTRUSION)
8125
 
8125
 
8126
   inline void prevent_dangerous_extrude(float& curr_e, float& dest_e) {
8126
   inline void prevent_dangerous_extrude(float& curr_e, float& dest_e) {
8127
     if (DEBUGGING(DRYRUN)) return;
8127
     if (DEBUGGING(DRYRUN)) return;
8142
     }
8142
     }
8143
   }
8143
   }
8144
 
8144
 
8145
-#endif // PREVENT_DANGEROUS_EXTRUDE
8145
+#endif // PREVENT_COLD_EXTRUSION
8146
 
8146
 
8147
 /**
8147
 /**
8148
  * Prepare a single move and get ready for the next one
8148
  * Prepare a single move and get ready for the next one
8154
   clamp_to_software_endstops(destination);
8154
   clamp_to_software_endstops(destination);
8155
   refresh_cmd_timeout();
8155
   refresh_cmd_timeout();
8156
 
8156
 
8157
-  #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
8157
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
8158
     prevent_dangerous_extrude(current_position[E_AXIS], destination[E_AXIS]);
8158
     prevent_dangerous_extrude(current_position[E_AXIS], destination[E_AXIS]);
8159
   #endif
8159
   #endif
8160
 
8160
 

+ 2
- 0
Marlin/SanityCheck.h Parādīt failu

135
   #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration."
135
   #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration."
136
 #elif !defined(MIN_SEGMENTS_FOR_MOVE)
136
 #elif !defined(MIN_SEGMENTS_FOR_MOVE)
137
   #error "\"dropsegments\" is replaced with MIN_SEGMENTS_FOR_MOVE (and increases by 1). Please update Configuration_adv.h."
137
   #error "\"dropsegments\" is replaced with MIN_SEGMENTS_FOR_MOVE (and increases by 1). Please update Configuration_adv.h."
138
+#elif defined(PREVENT_DANGEROUS_EXTRUDE)
139
+  #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
138
 #endif
140
 #endif
139
 
141
 
140
 /**
142
 /**

+ 9
- 7
Marlin/example_configurations/Cartesio/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
355
+#define EXTRUDE_MINTEMP 170
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
354
 #define PREVENT_LENGTHY_EXTRUDE
358
 #define PREVENT_LENGTHY_EXTRUDE
355
-
356
-#define EXTRUDE_MINTEMP 18
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/Felix/Configuration.h Parādīt failu

329
 
329
 
330
 // @section extruder
330
 // @section extruder
331
 
331
 
332
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
333
-//can be software-disabled for whatever purposes by
334
-#define PREVENT_DANGEROUS_EXTRUDE
335
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
336
-#define PREVENT_LENGTHY_EXTRUDE
337
-
332
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
333
+// It also enables the M302 command to set the minimum extrusion temperature
334
+// or to allow moving the extruder regardless of the hotend temperature.
335
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
336
+#define PREVENT_COLD_EXTRUSION
338
 #define EXTRUDE_MINTEMP 170
337
 #define EXTRUDE_MINTEMP 170
339
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
338
+
339
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
340
+#define PREVENT_LENGTHY_EXTRUDE
341
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
340
 
342
 
341
 //===========================================================================
343
 //===========================================================================
342
 //======================== Thermal Runaway Protection =======================
344
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/Felix/DUAL/Configuration.h Parādīt failu

327
 
327
 
328
 // @section extruder
328
 // @section extruder
329
 
329
 
330
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
331
-//can be software-disabled for whatever purposes by
332
-#define PREVENT_DANGEROUS_EXTRUDE
333
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
334
-#define PREVENT_LENGTHY_EXTRUDE
335
-
330
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
331
+// It also enables the M302 command to set the minimum extrusion temperature
332
+// or to allow moving the extruder regardless of the hotend temperature.
333
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
334
+#define PREVENT_COLD_EXTRUSION
336
 #define EXTRUDE_MINTEMP 170
335
 #define EXTRUDE_MINTEMP 170
337
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
336
+
337
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
338
+#define PREVENT_LENGTHY_EXTRUDE
339
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
338
 
340
 
339
 //===========================================================================
341
 //===========================================================================
340
 //======================== Thermal Runaway Protection =======================
342
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/Hephestos/Configuration.h Parādīt failu

339
 
339
 
340
 // @section extruder
340
 // @section extruder
341
 
341
 
342
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
343
-//can be software-disabled for whatever purposes by
344
-#define PREVENT_DANGEROUS_EXTRUDE
345
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
346
-#define PREVENT_LENGTHY_EXTRUDE
347
-
342
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
343
+// It also enables the M302 command to set the minimum extrusion temperature
344
+// or to allow moving the extruder regardless of the hotend temperature.
345
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
346
+#define PREVENT_COLD_EXTRUSION
348
 #define EXTRUDE_MINTEMP 170
347
 #define EXTRUDE_MINTEMP 170
349
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
348
+
349
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
350
+#define PREVENT_LENGTHY_EXTRUDE
351
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
350
 
352
 
351
 //===========================================================================
353
 //===========================================================================
352
 //======================== Thermal Runaway Protection =======================
354
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/Hephestos_2/Configuration.h Parādīt failu

341
 
341
 
342
 // @section extruder
342
 // @section extruder
343
 
343
 
344
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
345
-//can be software-disabled for whatever purposes by
346
-#define PREVENT_DANGEROUS_EXTRUDE
347
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
348
-#define PREVENT_LENGTHY_EXTRUDE
349
-
344
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
345
+// It also enables the M302 command to set the minimum extrusion temperature
346
+// or to allow moving the extruder regardless of the hotend temperature.
347
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
348
+#define PREVENT_COLD_EXTRUSION
350
 #define EXTRUDE_MINTEMP 170
349
 #define EXTRUDE_MINTEMP 170
351
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
350
+
351
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
352
+#define PREVENT_LENGTHY_EXTRUDE
353
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
352
 
354
 
353
 //===========================================================================
355
 //===========================================================================
354
 //======================== Thermal Runaway Protection =======================
356
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/K8200/Configuration.h Parādīt failu

364
 
364
 
365
 // @section extruder
365
 // @section extruder
366
 
366
 
367
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
368
-//can be software-disabled for whatever purposes by
369
-#define PREVENT_DANGEROUS_EXTRUDE
370
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
371
-#define PREVENT_LENGTHY_EXTRUDE
372
-
367
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
368
+// It also enables the M302 command to set the minimum extrusion temperature
369
+// or to allow moving the extruder regardless of the hotend temperature.
370
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
371
+#define PREVENT_COLD_EXTRUSION
373
 #define EXTRUDE_MINTEMP 170
372
 #define EXTRUDE_MINTEMP 170
374
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
373
+
374
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
375
+#define PREVENT_LENGTHY_EXTRUDE
376
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
375
 
377
 
376
 //===========================================================================
378
 //===========================================================================
377
 //======================== Thermal Runaway Protection =======================
379
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/K8400/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
355
+#define EXTRUDE_MINTEMP 170
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
354
 #define PREVENT_LENGTHY_EXTRUDE
358
 #define PREVENT_LENGTHY_EXTRUDE
355
-
356
-#define EXTRUDE_MINTEMP 160
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/K8400/Dual-head/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
355
+#define EXTRUDE_MINTEMP 170
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
354
 #define PREVENT_LENGTHY_EXTRUDE
358
 #define PREVENT_LENGTHY_EXTRUDE
355
-
356
-#define EXTRUDE_MINTEMP 160
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
354
-#define PREVENT_LENGTHY_EXTRUDE
355
-
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
356
 #define EXTRUDE_MINTEMP 170
355
 #define EXTRUDE_MINTEMP 170
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
358
+#define PREVENT_LENGTHY_EXTRUDE
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/RigidBot/Configuration.h Parādīt failu

344
 
344
 
345
 // @section extruder
345
 // @section extruder
346
 
346
 
347
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
348
-//can be software-disabled for whatever purposes by
349
-#define PREVENT_DANGEROUS_EXTRUDE
350
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
351
-#define PREVENT_LENGTHY_EXTRUDE
352
-
347
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
348
+// It also enables the M302 command to set the minimum extrusion temperature
349
+// or to allow moving the extruder regardless of the hotend temperature.
350
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
351
+#define PREVENT_COLD_EXTRUSION
353
 #define EXTRUDE_MINTEMP 170
352
 #define EXTRUDE_MINTEMP 170
354
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
353
+
354
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
355
+#define PREVENT_LENGTHY_EXTRUDE
356
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
355
 
357
 
356
 //===========================================================================
358
 //===========================================================================
357
 //======================== Thermal Runaway Protection =======================
359
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/SCARA/Configuration.h Parādīt failu

355
 
355
 
356
 // @section extruder
356
 // @section extruder
357
 
357
 
358
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
359
-//can be software-disabled for whatever purposes by
360
-//#define PREVENT_DANGEROUS_EXTRUDE
361
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
358
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
359
+// It also enables the M302 command to set the minimum extrusion temperature
360
+// or to allow moving the extruder regardless of the hotend temperature.
361
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
362
+#define PREVENT_COLD_EXTRUSION
363
+#define EXTRUDE_MINTEMP 170
364
+
365
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
362
 #define PREVENT_LENGTHY_EXTRUDE
366
 #define PREVENT_LENGTHY_EXTRUDE
363
-
364
-#define EXTRUDE_MINTEMP 150
365
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
367
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
366
 
368
 
367
 //===========================================================================
369
 //===========================================================================
368
 //======================== Thermal Runaway Protection =======================
370
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/TAZ4/Configuration.h Parādīt failu

368
 
368
 
369
 // @section extruder
369
 // @section extruder
370
 
370
 
371
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
372
-//can be software-disabled for whatever purposes by
373
-#define PREVENT_DANGEROUS_EXTRUDE
374
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
375
-#define PREVENT_LENGTHY_EXTRUDE
376
-
371
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
372
+// It also enables the M302 command to set the minimum extrusion temperature
373
+// or to allow moving the extruder regardless of the hotend temperature.
374
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
375
+#define PREVENT_COLD_EXTRUSION
377
 #define EXTRUDE_MINTEMP 170
376
 #define EXTRUDE_MINTEMP 170
378
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
377
+
378
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
379
+#define PREVENT_LENGTHY_EXTRUDE
380
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
379
 
381
 
380
 //===========================================================================
382
 //===========================================================================
381
 //======================== Thermal Runaway Protection =======================
383
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/WITBOX/Configuration.h Parādīt failu

339
 
339
 
340
 // @section extruder
340
 // @section extruder
341
 
341
 
342
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
343
-//can be software-disabled for whatever purposes by
344
-#define PREVENT_DANGEROUS_EXTRUDE
345
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
346
-#define PREVENT_LENGTHY_EXTRUDE
347
-
342
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
343
+// It also enables the M302 command to set the minimum extrusion temperature
344
+// or to allow moving the extruder regardless of the hotend temperature.
345
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
346
+#define PREVENT_COLD_EXTRUSION
348
 #define EXTRUDE_MINTEMP 170
347
 #define EXTRUDE_MINTEMP 170
349
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
348
+
349
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
350
+#define PREVENT_LENGTHY_EXTRUDE
351
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
350
 
352
 
351
 //===========================================================================
353
 //===========================================================================
352
 //======================== Thermal Runaway Protection =======================
354
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/adafruit/ST7565/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
354
-#define PREVENT_LENGTHY_EXTRUDE
355
-
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
356
 #define EXTRUDE_MINTEMP 170
355
 #define EXTRUDE_MINTEMP 170
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
358
+#define PREVENT_LENGTHY_EXTRUDE
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/delta/biv2.5/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
354
-#define PREVENT_LENGTHY_EXTRUDE
355
-
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
356
 #define EXTRUDE_MINTEMP 170
355
 #define EXTRUDE_MINTEMP 170
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
358
+#define PREVENT_LENGTHY_EXTRUDE
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/delta/generic/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
354
-#define PREVENT_LENGTHY_EXTRUDE
355
-
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
356
 #define EXTRUDE_MINTEMP 170
355
 #define EXTRUDE_MINTEMP 170
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
358
+#define PREVENT_LENGTHY_EXTRUDE
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/delta/kossel_mini/Configuration.h Parādīt failu

347
 
347
 
348
 // @section extruder
348
 // @section extruder
349
 
349
 
350
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
351
-//can be software-disabled for whatever purposes by
352
-#define PREVENT_DANGEROUS_EXTRUDE
353
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
354
-#define PREVENT_LENGTHY_EXTRUDE
355
-
350
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
351
+// It also enables the M302 command to set the minimum extrusion temperature
352
+// or to allow moving the extruder regardless of the hotend temperature.
353
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
354
+#define PREVENT_COLD_EXTRUSION
356
 #define EXTRUDE_MINTEMP 170
355
 #define EXTRUDE_MINTEMP 170
357
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
356
+
357
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
358
+#define PREVENT_LENGTHY_EXTRUDE
359
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
358
 
360
 
359
 //===========================================================================
361
 //===========================================================================
360
 //======================== Thermal Runaway Protection =======================
362
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/delta/kossel_pro/Configuration.h Parādīt failu

336
 
336
 
337
 // @section extruder
337
 // @section extruder
338
 
338
 
339
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
340
-//can be software-disabled for whatever purposes by
341
-#define PREVENT_DANGEROUS_EXTRUDE
342
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
343
-#define PREVENT_LENGTHY_EXTRUDE
344
-
339
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
340
+// It also enables the M302 command to set the minimum extrusion temperature
341
+// or to allow moving the extruder regardless of the hotend temperature.
342
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
343
+#define PREVENT_COLD_EXTRUSION
345
 #define EXTRUDE_MINTEMP 170
344
 #define EXTRUDE_MINTEMP 170
346
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
345
+
346
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
347
+#define PREVENT_LENGTHY_EXTRUDE
348
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
347
 
349
 
348
 //===========================================================================
350
 //===========================================================================
349
 //======================== Thermal Runaway Protection =======================
351
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/delta/kossel_xl/Configuration.h Parādīt failu

345
 
345
 
346
 // @section extruder
346
 // @section extruder
347
 
347
 
348
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
349
-//can be software-disabled for whatever purposes by
350
-#define PREVENT_DANGEROUS_EXTRUDE
351
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
352
-#define PREVENT_LENGTHY_EXTRUDE
353
-
348
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
349
+// It also enables the M302 command to set the minimum extrusion temperature
350
+// or to allow moving the extruder regardless of the hotend temperature.
351
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
352
+#define PREVENT_COLD_EXTRUSION
354
 #define EXTRUDE_MINTEMP 170
353
 #define EXTRUDE_MINTEMP 170
355
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
354
+
355
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
356
+#define PREVENT_LENGTHY_EXTRUDE
357
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
356
 
358
 
357
 //===========================================================================
359
 //===========================================================================
358
 //======================== Thermal Runaway Protection =======================
360
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/makibox/Configuration.h Parādīt failu

350
 
350
 
351
 // @section extruder
351
 // @section extruder
352
 
352
 
353
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
354
-//can be software-disabled for whatever purposes by
355
-#define PREVENT_DANGEROUS_EXTRUDE
356
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
357
-#define PREVENT_LENGTHY_EXTRUDE
358
-
353
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
354
+// It also enables the M302 command to set the minimum extrusion temperature
355
+// or to allow moving the extruder regardless of the hotend temperature.
356
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
357
+#define PREVENT_COLD_EXTRUSION
359
 #define EXTRUDE_MINTEMP 170
358
 #define EXTRUDE_MINTEMP 170
360
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
359
+
360
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
361
+#define PREVENT_LENGTHY_EXTRUDE
362
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
361
 
363
 
362
 //===========================================================================
364
 //===========================================================================
363
 //======================== Thermal Runaway Protection =======================
365
 //======================== Thermal Runaway Protection =======================

+ 9
- 7
Marlin/example_configurations/tvrrug/Round2/Configuration.h Parādīt failu

337
 
337
 
338
 // @section extruder
338
 // @section extruder
339
 
339
 
340
-//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
341
-//can be software-disabled for whatever purposes by
342
-#define PREVENT_DANGEROUS_EXTRUDE
343
-//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
344
-#define PREVENT_LENGTHY_EXTRUDE
345
-
340
+// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP.
341
+// It also enables the M302 command to set the minimum extrusion temperature
342
+// or to allow moving the extruder regardless of the hotend temperature.
343
+// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
344
+#define PREVENT_COLD_EXTRUSION
346
 #define EXTRUDE_MINTEMP 170
345
 #define EXTRUDE_MINTEMP 170
347
-#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
346
+
347
+// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH.
348
+#define PREVENT_LENGTHY_EXTRUDE
349
+#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH)
348
 
350
 
349
 //===========================================================================
351
 //===========================================================================
350
 //======================== Thermal Runaway Protection =======================
352
 //======================== Thermal Runaway Protection =======================

+ 1
- 1
Marlin/planner.cpp Parādīt failu

573
 
573
 
574
   long de = target[E_AXIS] - position[E_AXIS];
574
   long de = target[E_AXIS] - position[E_AXIS];
575
 
575
 
576
-  #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
576
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
577
     if (de) {
577
     if (de) {
578
       if (thermalManager.tooColdToExtrude(extruder)) {
578
       if (thermalManager.tooColdToExtrude(extruder)) {
579
         position[E_AXIS] = target[E_AXIS]; // Behave as if the move really took place, but ignore E part
579
         position[E_AXIS] = target[E_AXIS]; // Behave as if the move really took place, but ignore E part

+ 1
- 1
Marlin/temperature.cpp Parādīt failu

108
   millis_t Temperature::watch_bed_next_ms = 0;
108
   millis_t Temperature::watch_bed_next_ms = 0;
109
 #endif
109
 #endif
110
 
110
 
111
-#if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
111
+#if ENABLED(PREVENT_COLD_EXTRUSION)
112
   bool Temperature::allow_cold_extrude = false;
112
   bool Temperature::allow_cold_extrude = false;
113
   float Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
113
   float Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
114
 #endif
114
 #endif

+ 1
- 1
Marlin/temperature.h Parādīt failu

121
       static millis_t watch_bed_next_ms;
121
       static millis_t watch_bed_next_ms;
122
     #endif
122
     #endif
123
 
123
 
124
-    #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
124
+    #if ENABLED(PREVENT_COLD_EXTRUSION)
125
       static bool allow_cold_extrude;
125
       static bool allow_cold_extrude;
126
       static float extrude_min_temp;
126
       static float extrude_min_temp;
127
       static bool tooColdToExtrude(uint8_t e) {
127
       static bool tooColdToExtrude(uint8_t e) {

Notiek ielāde…
Atcelt
Saglabāt