Browse Source

Merge pull request #3105 from esenapaj2/esenapaj2-patch-1

update example configurations
Scott Lahteine 8 years ago
parent
commit
04b147645d
33 changed files with 261 additions and 160 deletions
  1. 6
    5
      Marlin/example_configurations/Felix/Configuration.h
  2. 51
    17
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  3. 5
    2
      Marlin/example_configurations/Felix/Configuration_adv.h
  4. 4
    4
      Marlin/example_configurations/Hephestos/Configuration.h
  5. 5
    2
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  6. 12
    12
      Marlin/example_configurations/Hephestos_2/Configuration.h
  7. 3
    3
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  8. 1
    1
      Marlin/example_configurations/K8200/Configuration.h
  9. 1
    1
      Marlin/example_configurations/K8200/Configuration_adv.h
  10. 4
    4
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  11. 11
    3
      Marlin/example_configurations/RigidBot/Configuration.h
  12. 8
    8
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  13. 4
    3
      Marlin/example_configurations/SCARA/Configuration.h
  14. 5
    2
      Marlin/example_configurations/SCARA/Configuration_adv.h
  15. 9
    7
      Marlin/example_configurations/TAZ4/Configuration.h
  16. 1
    1
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  17. 4
    3
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 5
    2
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  19. 4
    4
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  20. 9
    4
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  21. 5
    1
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  22. 10
    10
      Marlin/example_configurations/delta/generic/Configuration.h
  23. 5
    2
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  24. 9
    5
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  25. 5
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  26. 9
    5
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  27. 5
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  28. 29
    26
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  29. 8
    3
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  30. 5
    4
      Marlin/example_configurations/makibox/Configuration.h
  31. 10
    6
      Marlin/example_configurations/makibox/Configuration_adv.h
  32. 4
    4
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  33. 5
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

+ 6
- 5
Marlin/example_configurations/Felix/Configuration.h View File

@@ -451,7 +451,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
451 451
     #define FRONT_PROBE_BED_POSITION 20
452 452
     #define BACK_PROBE_BED_POSITION 180
453 453
 
454
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
454
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
455 455
 
456 456
     // Set the number of grid points per dimension.
457 457
     // You probably don't need more than 3 (squared=9).
@@ -506,8 +506,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
506 506
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
507 507
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
508 508
 
509
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
510
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
509
+
510
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
511
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
511 512
 
512 513
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
513 514
                           // When defined, it will:
@@ -585,10 +586,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
585 586
 // default steps per unit for Felix 2.0/3.0: 0.00249mm x/y rounding error with 3mm pitch HTD belt and 14 tooth pulleys. 0 z error.
586 587
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {76.190476, 76.190476, 1600, 164}
587 588
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
588
-#define DEFAULT_MAX_ACCELERATION      {5000,5000,100,80000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
589
+#define DEFAULT_MAX_ACCELERATION      {5000,5000,100,80000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
589 590
 
590 591
 #define DEFAULT_ACCELERATION          1750 //1500    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
591
-#define DEFAULT_RETRACT_ACCELERATION  5000 // X, Y, Z and E max acceleration in mm/s^2 for r retracts
592
+#define DEFAULT_RETRACT_ACCELERATION  5000 // E acceleration in mm/s^2 for retracts
592 593
 #define DEFAULT_TRAVEL_ACCELERATION   3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
593 594
 
594 595
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)

+ 51
- 17
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

@@ -61,6 +61,7 @@ Here are some standard links for getting your machine calibrated:
61 61
 #define SERIAL_PORT 0
62 62
 
63 63
 // This determines the communication speed of the printer
64
+// :[2400,9600,19200,38400,57600,115200,250000]
64 65
 #define BAUDRATE 250000
65 66
 
66 67
 // Enable the Bluetooth serial interface on AT90USB devices
@@ -81,17 +82,27 @@ Here are some standard links for getting your machine calibrated:
81 82
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 83
 
83 84
 // This defines the number of extruders
85
+// :[1,2,3,4]
84 86
 #define EXTRUDERS 2
85 87
 
88
+// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
89
+// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
90
+// For the other hotends it is their distance from the extruder 0 hotend.
91
+//#define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
92
+//#define EXTRUDER_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
93
+
86 94
 //// The following define selects which power supply you have. Please choose the one that matches your setup
87 95
 // 1 = ATX
88 96
 // 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
97
+// :{1:'ATX',2:'X-Box 360'}
89 98
 
90 99
 #define POWER_SUPPLY 1
91 100
 
92 101
 // Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
93 102
 #define PS_DEFAULT_OFF
94 103
 
104
+// @section temperature
105
+
95 106
 //===========================================================================
96 107
 //============================= Thermal Settings ============================
97 108
 //===========================================================================
@@ -228,9 +239,10 @@ Here are some standard links for getting your machine calibrated:
228 239
   #define DEFAULT_bedKi 2.79
229 240
   #define DEFAULT_bedKd 956.94
230 241
 
231
-// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
242
+  // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
232 243
 #endif // PIDTEMPBED
233 244
 
245
+// @section extruder
234 246
 
235 247
 //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
236 248
 //can be software-disabled for whatever purposes by
@@ -310,6 +322,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
310 322
 //#define DISABLE_Z_MIN_PROBE_ENDSTOP
311 323
 
312 324
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
325
+// :{0:'Low',1:'High'}
313 326
 #define X_ENABLE_ON 0
314 327
 #define Y_ENABLE_ON 0
315 328
 #define Z_ENABLE_ON 0
@@ -322,20 +335,32 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
322 335
 #define DISABLE_Z false
323 336
 // Warn on display about possibly reduced accuracy
324 337
 //#define DISABLE_REDUCED_ACCURACY_WARNING
338
+
339
+// @section extruder
340
+
325 341
 #define DISABLE_E false // For all extruders
326 342
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
327 343
 
344
+// @section machine
345
+
328 346
 // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
329 347
 #define INVERT_X_DIR true
330 348
 #define INVERT_Y_DIR true
331 349
 #define INVERT_Z_DIR true
350
+
351
+// @section extruder
352
+
353
+// For direct drive extruder v9 set to true, for geared extruder set to false.
332 354
 #define INVERT_E0_DIR false
333 355
 #define INVERT_E1_DIR true
334 356
 #define INVERT_E2_DIR false
335 357
 #define INVERT_E3_DIR false
336 358
 
359
+// @section homing
360
+
337 361
 // ENDSTOP SETTINGS:
338 362
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
363
+// :[-1,1]
339 364
 #define X_HOME_DIR -1
340 365
 #define Y_HOME_DIR -1
341 366
 #define Z_HOME_DIR -1
@@ -343,6 +368,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
343 368
 #define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
344 369
 #define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
345 370
 
371
+// @section machine
372
+
346 373
 // Travel limits after homing (units are in mm)
347 374
 #define X_MIN_POS 0
348 375
 #define Y_MIN_POS 0
@@ -393,7 +420,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
393 420
 
394 421
 // @section bedlevel
395 422
 
396
-
397 423
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
398 424
 //#define DEBUG_LEVELING_FEATURE
399 425
 //#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -422,7 +448,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
422 448
     #define FRONT_PROBE_BED_POSITION 20
423 449
     #define BACK_PROBE_BED_POSITION 180
424 450
 
425
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
451
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
426 452
 
427 453
     // Set the number of grid points per dimension.
428 454
     // You probably don't need more than 3 (squared=9).
@@ -477,8 +503,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
477 503
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
478 504
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
479 505
 
480
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
481
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
506
+
507
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
508
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
482 509
 
483 510
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
484 511
                           // When defined, it will:
@@ -528,6 +555,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
528 555
 #endif // AUTO_BED_LEVELING_FEATURE
529 556
 
530 557
 
558
+// @section homing
559
+
531 560
 // The position of the homing switches
532 561
 //#define MANUAL_HOME_POSITIONS  // If defined, MANUAL_*_HOME_POS below will be used
533 562
 //#define BED_CENTER_AT_0_0  // If defined, the center of the bed is at (X=0, Y=0)
@@ -541,6 +570,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
541 570
   //#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing.
542 571
 #endif
543 572
 
573
+// @section movement
574
+
544 575
 /**
545 576
  * MOVEMENT SETTINGS
546 577
  */
@@ -552,18 +583,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
552 583
 // default steps per unit for Felix 2.0/3.0: 0.00249mm x/y rounding error with 3mm pitch HTD belt and 14 tooth pulleys. 0 z error.
553 584
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {76.190476, 76.190476, 1600, 164}
554 585
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
555
-#define DEFAULT_MAX_ACCELERATION      {5000,5000,100,80000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
586
+#define DEFAULT_MAX_ACCELERATION      {5000,5000,100,80000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
556 587
 
557 588
 #define DEFAULT_ACCELERATION          1750 //1500    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
558
-#define DEFAULT_RETRACT_ACCELERATION  5000 // X, Y, Z and E max acceleration in mm/s^2 for r retracts
589
+#define DEFAULT_RETRACT_ACCELERATION  5000 // E acceleration in mm/s^2 for retracts
559 590
 #define DEFAULT_TRAVEL_ACCELERATION   3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
560 591
 
561
-// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
562
-// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
563
-// For the other hotends it is their distance from the extruder 0 hotend.
564
-//#define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
565
-//#define EXTRUDER_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
566
-
567 592
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
568 593
 #define DEFAULT_XYJERK                10   // (mm/sec)
569 594
 #define DEFAULT_ZJERK                 0.3  //0.4   // (mm/sec)
@@ -574,6 +599,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
574 599
 //============================= Additional Features ===========================
575 600
 //=============================================================================
576 601
 
602
+// @section more
603
+
577 604
 // Custom M code points
578 605
 #define CUSTOM_M_CODES
579 606
 #if ENABLED(CUSTOM_M_CODES)
@@ -584,6 +611,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
584 611
   #endif
585 612
 #endif
586 613
 
614
+// @section extras
587 615
 
588 616
 // EEPROM
589 617
 // The microcontroller can store settings in the EEPROM, e.g. max velocity...
@@ -595,7 +623,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
595 623
 
596 624
 #if ENABLED(EEPROM_SETTINGS)
597 625
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
598
-  #define EEPROM_CHITCHAT // please keep turned on if you can.
626
+  #define EEPROM_CHITCHAT // Please keep turned on if you can.
599 627
 #endif
600 628
 
601 629
 //
@@ -615,6 +643,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
615 643
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
616 644
 
617 645
 //==============================LCD and SD support=============================
646
+// @section lcd
618 647
 
619 648
 // Define your display language below. Replace (en) with your language code and uncomment.
620 649
 // en, pl, fr, de, es, ru, bg, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, cn, test
@@ -642,7 +671,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
642 671
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
643 672
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
644 673
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
645
-
646 674
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
647 675
 // http://reprap.org/wiki/PanelOne
648 676
 //#define PANEL_ONE
@@ -709,13 +737,19 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
709 737
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
710 738
 //#define LCD_I2C_VIKI
711 739
 
740
+// SSD1306 OLED generic display support
741
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
742
+//#define U8GLIB_SSD1306
743
+
712 744
 // Shift register panels
713 745
 // ---------------------
714 746
 // 2 wire Non-latching LCD SR from:
715 747
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
716
-
748
+// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
717 749
 //#define SAV_3DLCD
718 750
 
751
+// @section extras
752
+
719 753
 // Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
720 754
 #define FAST_PWM_FAN
721 755
 
@@ -739,7 +773,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
739 773
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
740 774
 //#define PHOTOGRAPH_PIN     23
741 775
 
742
-// SF send wrong arc g-codes when using Arc Point as fillet procedure
776
+// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
743 777
 //#define SF_ARC_FIX
744 778
 
745 779
 // Support for the BariCUDA Paste Extruder.

+ 5
- 2
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -347,7 +347,6 @@
347 347
   //#define USE_SMALL_INFOFONT
348 348
 #endif // DOGLCD
349 349
 
350
-
351 350
 // @section more
352 351
 
353 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif
@@ -459,6 +459,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
459 459
     #define FILAMENTCHANGE_ZADD 10
460 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
461 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
462 465
   #endif
463 466
 #endif
464 467
 

+ 4
- 4
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -433,7 +433,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
433 433
 
434 434
 // @section bedlevel
435 435
 
436
-
437 436
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
438 437
 //#define DEBUG_LEVELING_FEATURE
439 438
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -462,7 +461,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
462 461
     #define FRONT_PROBE_BED_POSITION 20
463 462
     #define BACK_PROBE_BED_POSITION 170
464 463
 
465
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
464
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
466 465
 
467 466
     // Set the number of grid points per dimension.
468 467
     // You probably don't need more than 3 (squared=9).
@@ -517,8 +516,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
517 516
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
518 517
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
519 518
 
520
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
521
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
519
+
520
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
521
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
522 522
 
523 523
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
524 524
                           // When defined, it will:

+ 5
- 2
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -347,7 +347,6 @@
347 347
   //#define USE_SMALL_INFOFONT
348 348
 #endif // DOGLCD
349 349
 
350
-
351 350
 // @section more
352 351
 
353 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif
@@ -459,6 +459,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
459 459
     #define FILAMENTCHANGE_ZADD 10
460 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
461 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
462 465
   #endif
463 466
 #endif
464 467
 

+ 12
- 12
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -436,7 +436,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
436 436
 
437 437
 // @section bedlevel
438 438
 
439
-
440 439
 #define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
441 440
 //#define DEBUG_LEVELING_FEATURE
442 441
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -473,14 +472,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
473 472
 
474 473
   #else  // !AUTO_BED_LEVELING_GRID
475 474
 
476
-      // Arbitrary points to probe.
477
-      // A simple cross-product is used to estimate the plane of the bed.
478
-      #define ABL_PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
479
-      #define ABL_PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
480
-      #define ABL_PROBE_PT_2_X X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER
481
-      #define ABL_PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
482
-      #define ABL_PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
483
-      #define ABL_PROBE_PT_3_Y Y_MAX_POS - Y_PROBE_OFFSET_FROM_EXTRUDER
475
+    // Arbitrary points to probe.
476
+    // A simple cross-product is used to estimate the plane of the bed.
477
+    #define ABL_PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
478
+    #define ABL_PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
479
+    #define ABL_PROBE_PT_2_X X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER
480
+    #define ABL_PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
481
+    #define ABL_PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
482
+    #define ABL_PROBE_PT_3_Y Y_MAX_POS - Y_PROBE_OFFSET_FROM_EXTRUDER
484 483
 
485 484
   #endif // AUTO_BED_LEVELING_GRID
486 485
 
@@ -520,8 +519,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
520 519
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
521 520
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
522 521
 
523
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
524
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
522
+
523
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
524
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
525 525
 
526 526
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
527 527
                           // When defined, it will:
@@ -717,7 +717,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
717 717
 // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB)
718 718
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
719 719
 //
720
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
720
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
721 721
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
722 722
 
723 723
 // The RepRapWorld REPRAPWORLD_KEYPAD v1.1

+ 3
- 3
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -347,7 +347,6 @@
347 347
   #define USE_SMALL_INFOFONT
348 348
 #endif // DOGLCD
349 349
 
350
-
351 350
 // @section more
352 351
 
353 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif
@@ -459,7 +459,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of
459 459
     #define FILAMENTCHANGE_ZADD 10
460 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
461 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
-    #define AUTO_FILAMENT_CHANGE                //This extrudes filament until you press the button on LCD
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463 463
     #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464 464
     #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
465 465
   #endif

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h View File

@@ -330,7 +330,7 @@ Here are some standard links for getting your machine calibrated:
330 330
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
331 331
 
332 332
 #if DISABLED(ENDSTOPPULLUPS)
333
-  // define endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
333
+  // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
334 334
   //#define ENDSTOPPULLUP_XMAX
335 335
   //#define ENDSTOPPULLUP_YMAX
336 336
   //#define ENDSTOPPULLUP_ZMAX

+ 1
- 1
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -57,7 +57,7 @@
57 57
  * The maximum buffered steps/sec of the extruder motor is called "se".
58 58
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
59 59
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
60
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
60
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
61 61
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
62 62
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
63 63
  */

+ 4
- 4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -441,7 +441,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
441 441
 
442 442
 // @section bedlevel
443 443
 
444
-
445 444
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
446 445
 //#define DEBUG_LEVELING_FEATURE
447 446
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -470,7 +469,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
470 469
     #define FRONT_PROBE_BED_POSITION 20
471 470
     #define BACK_PROBE_BED_POSITION 170
472 471
 
473
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
472
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
474 473
 
475 474
     // Set the number of grid points per dimension.
476 475
     // You probably don't need more than 3 (squared=9).
@@ -525,8 +524,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
525 524
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
526 525
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
527 526
 
528
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
529
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
527
+
528
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
529
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
530 530
 
531 531
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
532 532
                           // When defined, it will:

+ 11
- 3
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -297,6 +297,9 @@ Here are some standard links for getting your machine calibrated:
297 297
 // Uncomment this option to enable CoreXY kinematics
298 298
 //#define COREXY
299 299
 
300
+// Uncomment this option to enable CoreXZ kinematics
301
+//#define COREXZ
302
+
300 303
 // Enable this option for Toshiba steppers
301 304
 //#define CONFIG_STEPPERS_TOSHIBA
302 305
 
@@ -460,7 +463,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
460 463
     #define FRONT_PROBE_BED_POSITION 20
461 464
     #define BACK_PROBE_BED_POSITION 170
462 465
 
463
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
466
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
464 467
 
465 468
     // Set the number of grid points per dimension.
466 469
     // You probably don't need more than 3 (squared=9).
@@ -515,8 +518,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
515 518
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
516 519
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
517 520
 
518
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
519
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
521
+
522
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
523
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
520 524
 
521 525
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
522 526
                           // When defined, it will:
@@ -729,6 +733,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
729 733
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
730 734
 //#define RA_CONTROL_PANEL
731 735
 
736
+// The MakerLab Mini Panel with graphic controller and SD support
737
+// http://reprap.org/wiki/Mini_panel
738
+//#define MINIPANEL
739
+
732 740
 // RigidBot Panel V1.0
733 741
 // http://www.inventapart.com/
734 742
 #define RIGIDBOT_PANEL

+ 8
- 8
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -296,13 +296,12 @@
296 296
 
297 297
 #if ENABLED(SDSUPPORT)
298 298
 
299
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
300
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SD_DETECT_PIN
301
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
302
-  // be commented out otherwise
303
-  #ifndef ELB_FULL_GRAPHIC_CONTROLLER
304
-    #define SD_DETECT_INVERTED
305
-  #endif
299
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
300
+  // around this by connecting a push button or single throw switch to the pin defined
301
+  // as SD_DETECT_PIN in your board's pins definitions.
302
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
303
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
304
+  #define SD_DETECT_INVERTED
306 305
 
307 306
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
308 307
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif

+ 4
- 3
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -477,7 +477,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
477 477
     #define FRONT_PROBE_BED_POSITION 20
478 478
     #define BACK_PROBE_BED_POSITION 170
479 479
 
480
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
480
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
481 481
 
482 482
     // Set the number of grid points per dimension.
483 483
     // You probably don't need more than 3 (squared=9).
@@ -532,8 +532,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
532 532
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
533 533
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
534 534
 
535
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
536
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
535
+
536
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
537
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
537 538
 
538 539
   //#define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
539 540
                             // When defined, it will:

+ 5
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -347,7 +347,6 @@
347 347
   //#define USE_SMALL_INFOFONT
348 348
 #endif // DOGLCD
349 349
 
350
-
351 350
 // @section more
352 351
 
353 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif
@@ -459,6 +459,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
459 459
     #define FILAMENTCHANGE_ZADD 10
460 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
461 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
462 465
   #endif
463 466
 #endif
464 467
 

+ 9
- 7
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -461,10 +461,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
461 461
 
462 462
 // @section bedlevel
463 463
 
464
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
465
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
464
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
465
+//#define DEBUG_LEVELING_FEATURE
466
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
466 467
 
467
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
468
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
468 469
 
469 470
   // There are 2 different ways to specify probing locations:
470 471
   //
@@ -543,8 +544,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
543 544
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
544 545
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
545 546
 
546
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
547
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
547
+
548
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
549
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
548 550
 
549 551
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
550 552
                           // When defined, it will:
@@ -591,7 +593,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
591 593
   //
592 594
   //#define Z_MIN_PROBE_ENDSTOP
593 595
 
594
-#endif // ENABLE_AUTO_BED_LEVELING
596
+#endif // AUTO_BED_LEVELING_FEATURE
595 597
 
596 598
 
597 599
 // @section homing
@@ -642,7 +644,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
642 644
 // Custom M code points
643 645
 #define CUSTOM_M_CODES
644 646
 #if ENABLED(CUSTOM_M_CODES)
645
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
647
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
646 648
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
647 649
     #define Z_PROBE_OFFSET_RANGE_MIN -20
648 650
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */

+ 4
- 3
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -461,7 +461,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
461 461
     #define FRONT_PROBE_BED_POSITION 20
462 462
     #define BACK_PROBE_BED_POSITION 170
463 463
 
464
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
464
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
465 465
 
466 466
     // Set the number of grid points per dimension.
467 467
     // You probably don't need more than 3 (squared=9).
@@ -516,8 +516,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
516 516
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
517 517
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
518 518
 
519
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
520
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
519
+
520
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
521
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
521 522
 
522 523
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
523 524
                           // When defined, it will:

+ 5
- 2
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -347,7 +347,6 @@
347 347
   //#define USE_SMALL_INFOFONT
348 348
 #endif // DOGLCD
349 349
 
350
-
351 350
 // @section more
352 351
 
353 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif
@@ -459,6 +459,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
459 459
     #define FILAMENTCHANGE_ZADD 10
460 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
461 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
462 465
   #endif
463 466
 #endif
464 467
 

+ 4
- 4
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -441,7 +441,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
441 441
 
442 442
 // @section bedlevel
443 443
 
444
-
445 444
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
446 445
 //#define DEBUG_LEVELING_FEATURE
447 446
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -470,7 +469,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
470 469
     #define FRONT_PROBE_BED_POSITION 20
471 470
     #define BACK_PROBE_BED_POSITION 170
472 471
 
473
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
472
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
474 473
 
475 474
     // Set the number of grid points per dimension.
476 475
     // You probably don't need more than 3 (squared=9).
@@ -525,8 +524,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
525 524
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
526 525
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
527 526
 
528
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
529
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
527
+
528
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
529
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
530 530
 
531 531
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
532 532
                           // When defined, it will:

+ 9
- 4
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -506,7 +506,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
506 506
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
507 507
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
508 508
 
509
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
509
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
510 510
 
511 511
     // Non-linear bed leveling will be used.
512 512
     // Compensate by interpolating between the nearest four Z probe values for each point.
@@ -563,6 +563,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
563 563
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
564 564
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
565 565
 
566
+
566 567
   // Allen key retractable Z probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
567 568
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
568 569
   //#define Z_PROBE_ALLEN_KEY
@@ -644,8 +645,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
644 645
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
645 646
   #endif
646 647
 
647
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
648
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
648
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
649
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
649 650
 
650 651
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
651 652
                           // When defined, it will:
@@ -724,7 +725,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
724 725
 // delta speeds must be the same on xyz
725 726
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {72.9, 72.9, 72.9, 291}  // default steps per unit for BI v2.5 (cable drive)
726 727
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 500, 150}    // (mm/sec)
727
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
728
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
728 729
 
729 730
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
730 731
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
@@ -856,6 +857,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
856 857
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
857 858
 //#define RA_CONTROL_PANEL
858 859
 
860
+// The MakerLab Mini Panel with graphic controller and SD support
861
+// http://reprap.org/wiki/Mini_panel
862
+//#define MINIPANEL
863
+
859 864
 // Delta calibration menu
860 865
 // uncomment to add three points calibration menu option.
861 866
 // See http://minow.blogspot.com/index.html#4918805519571907051

+ 5
- 1
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -369,6 +369,7 @@
369 369
 //#define BABYSTEPPING
370 370
 #if ENABLED(BABYSTEPPING)
371 371
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
372
+                       //not implemented for CoreXY and deltabots!
372 373
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
373 374
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
374 375
 #endif
@@ -460,6 +461,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
460 461
     #define FILAMENTCHANGE_ZADD 10
461 462
     #define FILAMENTCHANGE_FIRSTRETRACT -2
462 463
     #define FILAMENTCHANGE_FINALRETRACT -100
464
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
465
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
466
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
463 467
   #endif
464 468
 #endif
465 469
 

+ 10
- 10
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -476,14 +476,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
476 476
 
477 477
 // @section bedlevel
478 478
 
479
-
480 479
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
481 480
 //#define DEBUG_LEVELING_FEATURE
482 481
 //#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
483 482
 
484 483
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
485 484
 
486
-  // There are 2 different ways to specify probing locations.
485
+  // There are 2 different ways to specify probing locations:
487 486
   //
488 487
   // - "grid" mode
489 488
   //   Probe several points in a rectangular grid.
@@ -507,7 +506,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
507 506
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
508 507
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
509 508
 
510
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
509
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
511 510
 
512 511
     // Non-linear bed leveling will be used.
513 512
     // Compensate by interpolating between the nearest four Z probe values for each point.
@@ -564,6 +563,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
564 563
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
565 564
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
566 565
 
566
+
567 567
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
568 568
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
569 569
   //#define Z_PROBE_ALLEN_KEY
@@ -645,8 +645,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
645 645
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
646 646
   #endif
647 647
 
648
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
649
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
648
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
649
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
650 650
 
651 651
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
652 652
                           // When defined, it will:
@@ -725,7 +725,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
725 725
 // delta speeds must be the same on xyz
726 726
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 80, 760*1.1}  // default steps per unit for Kossel (GT2, 20 tooth)
727 727
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 500, 25}    // (mm/sec)
728
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
728
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
729 729
 
730 730
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
731 731
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
@@ -857,6 +857,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
857 857
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
858 858
 //#define RA_CONTROL_PANEL
859 859
 
860
+// The MakerLab Mini Panel with graphic controller and SD support
861
+// http://reprap.org/wiki/Mini_panel
862
+//#define MINIPANEL
863
+
860 864
 // Delta calibration menu
861 865
 // uncomment to add three points calibration menu option.
862 866
 // See http://minow.blogspot.com/index.html#4918805519571907051
@@ -864,10 +868,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
864 868
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
865 869
 //#define DELTA_CALIBRATION_MENU
866 870
 
867
-// The MakerLab Mini Panel with graphic controller and SD support
868
-// http://reprap.org/wiki/Mini_panel
869
-//#define MINIPANEL
870
-
871 871
 /**
872 872
  * I2C Panels
873 873
  */

+ 5
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -349,7 +349,6 @@
349 349
   //#define USE_SMALL_INFOFONT
350 350
 #endif // DOGLCD
351 351
 
352
-
353 352
 // @section more
354 353
 
355 354
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -370,6 +369,7 @@
370 369
 //#define BABYSTEPPING
371 370
 #if ENABLED(BABYSTEPPING)
372 371
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
372
+                       //not implemented for CoreXY and deltabots!
373 373
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
374 374
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
375 375
 #endif
@@ -461,6 +461,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
461 461
     #define FILAMENTCHANGE_ZADD 10
462 462
     #define FILAMENTCHANGE_FIRSTRETRACT -2
463 463
     #define FILAMENTCHANGE_FINALRETRACT -100
464
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
465
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
466
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
464 467
   #endif
465 468
 #endif
466 469
 

+ 9
- 5
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -476,7 +476,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
476 476
 
477 477
 // @section bedlevel
478 478
 
479
-
480 479
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
481 480
 //#define DEBUG_LEVELING_FEATURE
482 481
 //#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -507,7 +506,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
507 506
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
508 507
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
509 508
 
510
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
509
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
511 510
 
512 511
     // Non-linear bed leveling will be used.
513 512
     // Compensate by interpolating between the nearest four Z probe values for each point.
@@ -564,6 +563,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
564 563
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
565 564
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
566 565
 
566
+
567 567
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
568 568
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
569 569
   #define Z_PROBE_ALLEN_KEY
@@ -649,8 +649,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
649 649
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
650 650
   #endif
651 651
 
652
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
653
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
652
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
653
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
654 654
 
655 655
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
656 656
                           // When defined, it will:
@@ -729,7 +729,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
729 729
 // delta speeds must be the same on xyz
730 730
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 80, 760*1.1}  // default steps per unit for Kossel (GT2, 20 tooth)
731 731
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 500, 25}    // (mm/sec)
732
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
732
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
733 733
 
734 734
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
735 735
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
@@ -861,6 +861,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
861 861
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
862 862
 //#define RA_CONTROL_PANEL
863 863
 
864
+// The MakerLab Mini Panel with graphic controller and SD support
865
+// http://reprap.org/wiki/Mini_panel
866
+//#define MINIPANEL
867
+
864 868
 // Delta calibration menu
865 869
 // uncomment to add three points calibration menu option.
866 870
 // See http://minow.blogspot.com/index.html#4918805519571907051

+ 5
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -348,7 +348,6 @@
348 348
   //#define USE_SMALL_INFOFONT
349 349
 #endif // DOGLCD
350 350
 
351
-
352 351
 // @section more
353 352
 
354 353
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -369,6 +368,7 @@
369 368
 //#define BABYSTEPPING
370 369
 #if ENABLED(BABYSTEPPING)
371 370
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
371
+                       //not implemented for CoreXY and deltabots!
372 372
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
373 373
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
374 374
 #endif
@@ -460,6 +460,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
460 460
     #define FILAMENTCHANGE_ZADD 10
461 461
     #define FILAMENTCHANGE_FIRSTRETRACT -2
462 462
     #define FILAMENTCHANGE_FINALRETRACT -100
463
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
464
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
465
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
463 466
   #endif
464 467
 #endif
465 468
 

+ 9
- 5
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -463,7 +463,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
463 463
 
464 464
 // @section bedlevel
465 465
 
466
-
467 466
 #define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
468 467
 //#define DEBUG_LEVELING_FEATURE
469 468
 //#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -494,7 +493,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
494 493
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
495 494
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
496 495
 
497
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
496
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
498 497
 
499 498
     // Non-linear bed leveling will be used.
500 499
     // Compensate by interpolating between the nearest four Z probe values for each point.
@@ -553,6 +552,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
553 552
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
554 553
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
555 554
 
555
+
556 556
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
557 557
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
558 558
   #define Z_PROBE_ALLEN_KEY
@@ -634,8 +634,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
634 634
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
635 635
   #endif
636 636
 
637
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
638
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
637
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
638
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
639 639
 
640 640
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
641 641
                           // When defined, it will:
@@ -720,7 +720,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
720 720
 // delta speeds must be the same on xyz
721 721
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 184.8}
722 722
 #define DEFAULT_MAX_FEEDRATE          {200, 200, 200, 200}    // (mm/sec)
723
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,9000}    // X, Y, Z, E maximum start speed for accelerated moves.
723
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,9000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
724 724
 
725 725
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
726 726
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
@@ -852,6 +852,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
852 852
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
853 853
 //#define RA_CONTROL_PANEL
854 854
 
855
+// The MakerLab Mini Panel with graphic controller and SD support
856
+// http://reprap.org/wiki/Mini_panel
857
+//#define MINIPANEL
858
+
855 859
 // Delta calibration menu
856 860
 // uncomment to add three points calibration menu option.
857 861
 // See http://minow.blogspot.com/index.html#4918805519571907051

+ 5
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -56,7 +56,7 @@
56 56
  * The maximum buffered steps/sec of the extruder motor is called "se".
57 57
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
58 58
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
59
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
59
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
60 60
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
61 61
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
62 62
  */
@@ -352,7 +352,6 @@
352 352
   //#define USE_SMALL_INFOFONT
353 353
 #endif // DOGLCD
354 354
 
355
-
356 355
 // @section more
357 356
 
358 357
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -373,6 +372,7 @@
373 372
 //#define BABYSTEPPING
374 373
 #if ENABLED(BABYSTEPPING)
375 374
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
375
+                       //not implemented for CoreXY and deltabots!
376 376
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
377 377
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
378 378
 #endif
@@ -464,6 +464,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
464 464
     #define FILAMENTCHANGE_ZADD 10
465 465
     #define FILAMENTCHANGE_FIRSTRETRACT -2
466 466
     #define FILAMENTCHANGE_FINALRETRACT -100
467
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
468
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
469
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
467 470
   #endif
468 471
 #endif
469 472
 

+ 29
- 26
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -377,11 +377,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
377 377
 #define Z_ENABLE_ON 0
378 378
 #define E_ENABLE_ON 0 // For all extruders
379 379
 
380
-// Disables axis when it's not being used.
380
+// Disables axis stepper immediately when it's not being used.
381 381
 // WARNING: When motors turn off there is a chance of losing position accuracy!
382 382
 #define DISABLE_X false
383 383
 #define DISABLE_Y false
384 384
 #define DISABLE_Z false
385
+// Warn on display about possibly reduced accuracy
386
+//#define DISABLE_REDUCED_ACCURACY_WARNING
385 387
 
386 388
 // @section extruder
387 389
 
@@ -439,16 +441,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
439 441
 #endif
440 442
 
441 443
 //===========================================================================
442
-//=========================== Manual Bed Leveling ===========================
444
+//============================ Mesh Bed Leveling ============================
443 445
 //===========================================================================
444 446
 
445
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
446 447
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
447 448
 
448
-#if ENABLED(MANUAL_BED_LEVELING)
449
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
450
-#endif  // MANUAL_BED_LEVELING
451
-
452 449
 #if ENABLED(MESH_BED_LEVELING)
453 450
   #define MESH_MIN_X 10
454 451
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -457,6 +454,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
457 454
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
458 455
   #define MESH_NUM_Y_POINTS 3
459 456
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
457
+
458
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
459
+
460
+  #if ENABLED(MANUAL_BED_LEVELING)
461
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
462
+  #endif  // MANUAL_BED_LEVELING
463
+
460 464
 #endif  // MESH_BED_LEVELING
461 465
 
462 466
 //===========================================================================
@@ -466,7 +470,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
466 470
 // @section bedlevel
467 471
 
468 472
 #define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
469
-#//define DEBUG_LEVELING_FEATURE
473
+//#define DEBUG_LEVELING_FEATURE
470 474
 //#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
471 475
 
472 476
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
@@ -499,19 +503,19 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
499 503
     // Non-linear bed leveling will be used.
500 504
     // Compensate by interpolating between the nearest four Z probe values for each point.
501 505
     // Useful for deltas where the print surface may appear like a bowl or dome shape.
502
-    // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher.
506
+    // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
503 507
     #define AUTO_BED_LEVELING_GRID_POINTS 7
504 508
 
505 509
   #else  // !AUTO_BED_LEVELING_GRID
506 510
 
507
-      // Arbitrary points to probe.
508
-      // A simple cross-product is used to estimate the plane of the bed.
509
-      #define ABL_PROBE_PT_1_X 15
510
-      #define ABL_PROBE_PT_1_Y 180
511
-      #define ABL_PROBE_PT_2_X 15
512
-      #define ABL_PROBE_PT_2_Y 20
513
-      #define ABL_PROBE_PT_3_X 170
514
-      #define ABL_PROBE_PT_3_Y 20
511
+    // Arbitrary points to probe.
512
+    // A simple cross-product is used to estimate the plane of the bed.
513
+    #define ABL_PROBE_PT_1_X 15
514
+    #define ABL_PROBE_PT_1_Y 180
515
+    #define ABL_PROBE_PT_2_X 15
516
+    #define ABL_PROBE_PT_2_Y 20
517
+    #define ABL_PROBE_PT_3_X 170
518
+    #define ABL_PROBE_PT_3_Y 20
515 519
 
516 520
   #endif // AUTO_BED_LEVELING_GRID
517 521
 
@@ -635,7 +639,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
635 639
 
636 640
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 158}   // default steps per unit for PowerWasp
637 641
 #define DEFAULT_MAX_FEEDRATE          {200, 200, 200, 200}    // (mm/sec)
638
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,9000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
642
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,9000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
639 643
 
640 644
 #define DEFAULT_ACCELERATION          2000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
641 645
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
@@ -711,10 +715,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
711 715
 
712 716
 //#define ULTRA_LCD  //general LCD support, also 16x2
713 717
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
714
-//define SDSUPPORT // Enable SD Card Support in Hardware Console
715
-// Changed behaviour! If you need SDSUPPORT uncomment it!
716
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
717
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
718
+//#define SDSUPPORT // Enable SD Card Support in Hardware Console
719
+                    // Changed behaviour! If you need SDSUPPORT uncomment it!
720
+//#define SPI_SPEED SPI_HALF_SPEED // (also SPI_QUARTER_SPEED, SPI_EIGHTH_SPEED) Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
718 721
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
719 722
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
720 723
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
@@ -734,13 +737,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
734 737
 
735 738
 // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
736 739
 // http://panucatt.com
737
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
740
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
738 741
 //#define VIKI2
739 742
 //#define miniVIKI
740 743
 
741 744
 // This is a new controller currently under development.  https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
742 745
 //
743
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
746
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
744 747
 //#define ELB_FULL_GRAPHIC_CONTROLLER
745 748
 //#define SD_DETECT_INVERTED
746 749
 
@@ -755,7 +758,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
755 758
 // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB)
756 759
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
757 760
 //
758
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
761
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
759 762
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
760 763
 
761 764
 // The RepRapWorld REPRAPWORLD_KEYPAD v1.1
@@ -791,7 +794,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
791 794
 //#define LCD_I2C_VIKI
792 795
 
793 796
 // SSD1306 OLED generic display support
794
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
797
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
795 798
 //#define U8GLIB_SSD1306
796 799
 
797 800
 // Shift register panels

+ 8
- 3
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -232,7 +232,13 @@
232 232
 #define INVERT_E_STEP_PIN false
233 233
 
234 234
 // Default stepper release if idle. Set to 0 to deactivate.
235
+// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true.
236
+// Time can be set by M18 and M84.
235 237
 #define DEFAULT_STEPPER_DEACTIVE_TIME 60
238
+#define DISABLE_INACTIVE_X true
239
+#define DISABLE_INACTIVE_Y true
240
+#define DISABLE_INACTIVE_Z true  // set to false if the nozzle will fall down on your printed part when print has finished.
241
+#define DISABLE_INACTIVE_E true
236 242
 
237 243
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
238 244
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
@@ -344,7 +350,7 @@
344 350
 // @section more
345 351
 
346 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
347
-//#define USE_WATCHDOG
353
+#define USE_WATCHDOG
348 354
 
349 355
 #if ENABLED(USE_WATCHDOG)
350 356
   // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
@@ -380,7 +386,6 @@
380 386
 #if ENABLED(ADVANCE)
381 387
   #define EXTRUDER_ADVANCE_K .0
382 388
   #define D_FILAMENT 2.85
383
-  #define STEPS_MM_E 836
384 389
 #endif
385 390
 
386 391
 // @section extras

+ 5
- 4
Marlin/example_configurations/makibox/Configuration.h View File

@@ -472,7 +472,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
472 472
     #define FRONT_PROBE_BED_POSITION 20
473 473
     #define BACK_PROBE_BED_POSITION 170
474 474
 
475
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
475
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
476 476
 
477 477
     // Set the number of grid points per dimension.
478 478
     // You probably don't need more than 3 (squared=9).
@@ -527,8 +527,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
527 527
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
528 528
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
529 529
 
530
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
531
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
530
+
531
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
532
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
532 533
 
533 534
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
534 535
                           // When defined, it will:
@@ -605,7 +606,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
605 606
 
606 607
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {400, 400, 400, 163}     // default steps per unit for ***** MakiBox A6 *****
607 608
 #define DEFAULT_MAX_FEEDRATE          {60, 60, 20, 45}         // (mm/sec)
608
-#define DEFAULT_MAX_ACCELERATION      {2000,2000,30,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
609
+#define DEFAULT_MAX_ACCELERATION      {2000,2000,30,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
609 610
 
610 611
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
611 612
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts

+ 10
- 6
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -296,10 +296,11 @@
296 296
 
297 297
 #if ENABLED(SDSUPPORT)
298 298
 
299
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
300
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SD_DETECT_PIN
301
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
302
-  // be commented out otherwise
299
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
300
+  // around this by connecting a push button or single throw switch to the pin defined
301
+  // as SD_DETECT_PIN in your board's pins definitions.
302
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
303
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
303 304
   //#define SD_DETECT_INVERTED
304 305
 
305 306
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
@@ -346,7 +347,6 @@
346 347
   //#define USE_SMALL_INFOFONT
347 348
 #endif // DOGLCD
348 349
 
349
-
350 350
 // @section more
351 351
 
352 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -367,6 +367,7 @@
367 367
 //#define BABYSTEPPING
368 368
 #if ENABLED(BABYSTEPPING)
369 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
370 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
371 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
372 373
 #endif
@@ -458,6 +459,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
458 459
     #define FILAMENTCHANGE_ZADD 10
459 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
460 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
461 465
   #endif
462 466
 #endif
463 467
 

+ 4
- 4
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -431,7 +431,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
431 431
 
432 432
 // @section bedlevel
433 433
 
434
-
435 434
 //#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
436 435
 //#define DEBUG_LEVELING_FEATURE
437 436
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
@@ -460,7 +459,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
460 459
     #define FRONT_PROBE_BED_POSITION 20
461 460
     #define BACK_PROBE_BED_POSITION 170
462 461
 
463
-    #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this.
462
+    #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
464 463
 
465 464
     // Set the number of grid points per dimension.
466 465
     // You probably don't need more than 3 (squared=9).
@@ -515,8 +514,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
515 514
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
516 515
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
517 516
 
518
-  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
519
-  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
517
+
518
+  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
519
+  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
520 520
 
521 521
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
522 522
                           // When defined, it will:

+ 5
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -52,7 +52,7 @@
52 52
  * The maximum buffered steps/sec of the extruder motor is called "se".
53 53
  * Start autotemp mode with M109 S<mintemp> B<maxtemp> F<factor>
54 54
  * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
55
- * mintemp and maxtemp. Turn this off by excuting M109 without F*
55
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
56 56
  * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
57 57
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
58 58
  */
@@ -347,7 +347,6 @@
347 347
   //#define USE_SMALL_INFOFONT
348 348
 #endif // DOGLCD
349 349
 
350
-
351 350
 // @section more
352 351
 
353 352
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
@@ -368,6 +367,7 @@
368 367
 //#define BABYSTEPPING
369 368
 #if ENABLED(BABYSTEPPING)
370 369
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
+                       //not implemented for CoreXY and deltabots!
371 371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
372 372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
373 373
 #endif
@@ -459,6 +459,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
459 459
     #define FILAMENTCHANGE_ZADD 10
460 460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
461 461
     #define FILAMENTCHANGE_FINALRETRACT -100
462
+    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
463
+    #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
464
+    #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
462 465
   #endif
463 466
 #endif
464 467
 

Loading…
Cancel
Save