Explorar el Código

Add a "manual" option for ABL

Scott Lahteine hace 7 años
padre
commit
9e22184936
Se han modificado 25 ficheros con 429 adiciones y 249 borrados
  1. 2
    2
      Marlin/Conditionals_LCD.h
  2. 1
    1
      Marlin/Conditionals_post.h
  3. 18
    9
      Marlin/Configuration.h
  4. 9
    7
      Marlin/SanityCheck.h
  5. 19
    11
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 19
    11
      Marlin/example_configurations/Felix/Configuration.h
  7. 19
    11
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 19
    11
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 19
    11
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 19
    11
      Marlin/example_configurations/K8200/Configuration.h
  11. 19
    11
      Marlin/example_configurations/K8400/Configuration.h
  12. 19
    11
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 19
    11
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 19
    11
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 19
    11
      Marlin/example_configurations/SCARA/Configuration.h
  16. 19
    11
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 19
    11
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 19
    11
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 19
    10
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  20. 19
    11
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 19
    11
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 19
    11
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 19
    11
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 19
    11
      Marlin/example_configurations/makibox/Configuration.h
  25. 19
    11
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 2
- 2
Marlin/Conditionals_LCD.h Ver fichero

@@ -371,12 +371,12 @@
371 371
   /**
372 372
    * Set a flag for any enabled probe
373 373
    */
374
-  #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
374
+  #define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
375 375
 
376 376
   /**
377 377
    * Clear probe pin settings when no probe is selected
378 378
    */
379
-  #if !PROBE_SELECTED
379
+  #if !PROBE_SELECTED || ENABLED(PROBE_MANUALLY)
380 380
     #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
381 381
     #undef Z_MIN_PROBE_ENDSTOP
382 382
   #endif

+ 1
- 1
Marlin/Conditionals_post.h Ver fichero

@@ -589,7 +589,7 @@
589 589
 
590 590
   #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
591 591
 
592
-  #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)
592
+  #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED && DISABLED(PROBE_MANUALLY))
593 593
 
594 594
   #if ENABLED(Z_PROBE_ALLEN_KEY)
595 595
     #define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST

+ 18
- 9
Marlin/Configuration.h Ver fichero

@@ -545,6 +545,11 @@
545 545
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
546 546
 //
547 547
 
548
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
549
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
550
+// or (with LCD_BED_LEVELING) the LCD controller.
551
+//#define PROBE_MANUALLY
552
+
548 553
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
549 554
 // For example an inductive probe, or a setup that uses the nozzle to probe.
550 555
 // An inductive probe must be deactivated to go below
@@ -876,14 +881,18 @@
876 881
 
877 882
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
878 883
 
879
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
880
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
884
+#endif // BED_LEVELING
881 885
 
882
-  #if ENABLED(MANUAL_BED_LEVELING)
883
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
884
-  #endif
886
+/**
887
+ * Use the LCD controller for bed leveling
888
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
889
+ */
890
+//#define LCD_BED_LEVELING
885 891
 
886
-#endif // BED_LEVELING
892
+#if ENABLED(LCD_BED_LEVELING)
893
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
894
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
895
+#endif
887 896
 
888 897
 /**
889 898
  * Commands to execute at the end of G29 probing.
@@ -1432,13 +1441,13 @@
1432 1441
 
1433 1442
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1434 1443
 // be used to mitigate the associated resolution loss. If enabled,
1435
-// some of the PWM cycles are stretched so on average the wanted
1444
+// some of the PWM cycles are stretched so on average the desired
1436 1445
 // duty cycle is attained.
1437 1446
 //#define SOFT_PWM_DITHER
1438 1447
 
1439 1448
 // Temperature status LEDs that display the hotend and bed temperature.
1440
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1441
-// Otherwise the RED led is on. There is 1C hysteresis.
1449
+// If all hotends, bed temperature, and target temperature are under 54C
1450
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1442 1451
 //#define TEMP_STAT_LEDS
1443 1452
 
1444 1453
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 9
- 7
Marlin/SanityCheck.h Ver fichero

@@ -130,8 +130,12 @@
130 130
   #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration."
131 131
 #elif defined(Z_PROBE_DEPLOY_HEIGHT) || defined(Z_PROBE_TRAVEL_HEIGHT)
132 132
   #error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration."
133
+#elif defined(MANUAL_BED_LEVELING)
134
+  #error "MANUAL_BED_LEVELING is now LCD_BED_LEVELING. Please update your configuration."
133 135
 #elif defined(MESH_HOME_SEARCH_Z)
134
-  #error "MESH_HOME_SEARCH_Z is now MANUAL_PROBE_Z_RANGE. Please update your configuration."
136
+  #error "MESH_HOME_SEARCH_Z is now LCD_PROBE_Z_RANGE. Please update your configuration."
137
+#elif defined(MANUAL_PROBE_Z_RANGE)
138
+  #error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE. Please update your configuration."
135 139
 #elif !defined(MIN_STEPS_PER_SEGMENT)
136 140
   #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h.
137 141
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
@@ -408,8 +412,6 @@ static_assert(1 >= 0
408 412
   #elif MESH_NUM_X_POINTS > 9 || MESH_NUM_Y_POINTS > 9
409 413
     #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS must be less than 10."
410 414
   #endif
411
-#elif ENABLED(MANUAL_BED_LEVELING)
412
-  #error "MANUAL_BED_LEVELING only applies to MESH_BED_LEVELING."
413 415
 #endif
414 416
 
415 417
 /**
@@ -492,7 +494,7 @@ static_assert(1 >= 0
492 494
     #if !HAS_Z_MIN_PROBE_PIN
493 495
       #error "Z_MIN_PROBE_ENDSTOP requires the Z_MIN_PROBE_PIN to be defined."
494 496
     #endif
495
-  #else
497
+  #elif DISABLED(PROBE_MANUALLY)
496 498
     #error "You must enable either Z_MIN_PROBE_ENDSTOP or Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use a probe."
497 499
   #endif
498 500
 
@@ -523,10 +525,10 @@ static_assert(1 >= 0
523 525
 #endif
524 526
 
525 527
 /**
526
- * MANUAL_BED_LEVELING requirements
528
+ * LCD_BED_LEVELING requirements
527 529
  */
528
-#if ENABLED(MANUAL_BED_LEVELING) && DISABLED(MESH_BED_LEVELING)
529
-  #error "MANUAL_BED_LEVELING requires MESH_BED_LEVELING."
530
+#if ENABLED(LCD_BED_LEVELING) && DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY))
531
+  #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY."
530 532
 #endif
531 533
 
532 534
 /**

+ 19
- 11
Marlin/example_configurations/Cartesio/Configuration.h Ver fichero

@@ -232,7 +232,7 @@
232 232
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
233 233
  *    66 : 4.7M High Temperature thermistor from Dyze Design
234 234
  *    70 : the 100K thermistor found in the bq Hephestos 2
235
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
235
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
236 236
  *
237 237
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
238 238
  *                              (but gives greater accuracy and more stable PID)
@@ -545,6 +545,11 @@
545 545
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
546 546
 //
547 547
 
548
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
549
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
550
+// or (with LCD_BED_LEVELING) the LCD controller.
551
+//#define PROBE_MANUALLY
552
+
548 553
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
549 554
 // For example an inductive probe, or a setup that uses the nozzle to probe.
550 555
 // An inductive probe must be deactivated to go below
@@ -741,7 +746,6 @@
741 746
   #define FILAMENT_RUNOUT_SCRIPT "M600"
742 747
 #endif
743 748
 
744
-
745 749
 //===========================================================================
746 750
 //=============================== Bed Leveling ==============================
747 751
 //===========================================================================
@@ -877,14 +881,18 @@
877 881
 
878 882
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
879 883
 
880
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
881
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
884
+#endif // BED_LEVELING
882 885
 
883
-  #if ENABLED(MANUAL_BED_LEVELING)
884
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
885
-  #endif
886
+/**
887
+ * Use the LCD controller for bed leveling
888
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
889
+ */
890
+//#define LCD_BED_LEVELING
886 891
 
887
-#endif // BED_LEVELING
892
+#if ENABLED(LCD_BED_LEVELING)
893
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
894
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
895
+#endif
888 896
 
889 897
 /**
890 898
  * Commands to execute at the end of G29 probing.
@@ -1433,13 +1441,13 @@
1433 1441
 
1434 1442
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1435 1443
 // be used to mitigate the associated resolution loss. If enabled,
1436
-// some of the PWM cycles are stretched so on average the wanted
1444
+// some of the PWM cycles are stretched so on average the desired
1437 1445
 // duty cycle is attained.
1438 1446
 //#define SOFT_PWM_DITHER
1439 1447
 
1440 1448
 // Temperature status LEDs that display the hotend and bed temperature.
1441
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1442
-// Otherwise the RED led is on. There is 1C hysteresis.
1449
+// If all hotends, bed temperature, and target temperature are under 54C
1450
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1443 1451
 #define TEMP_STAT_LEDS
1444 1452
 
1445 1453
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/Felix/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -528,6 +528,11 @@
528 528
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
529 529
 //
530 530
 
531
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
532
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
533
+// or (with LCD_BED_LEVELING) the LCD controller.
534
+//#define PROBE_MANUALLY
535
+
531 536
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
532 537
 // For example an inductive probe, or a setup that uses the nozzle to probe.
533 538
 // An inductive probe must be deactivated to go below
@@ -724,7 +729,6 @@
724 729
   #define FILAMENT_RUNOUT_SCRIPT "M600"
725 730
 #endif
726 731
 
727
-
728 732
 //===========================================================================
729 733
 //=============================== Bed Leveling ==============================
730 734
 //===========================================================================
@@ -860,14 +864,18 @@
860 864
 
861 865
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
862 866
 
863
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
864
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
867
+#endif // BED_LEVELING
865 868
 
866
-  #if ENABLED(MANUAL_BED_LEVELING)
867
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
868
-  #endif
869
+/**
870
+ * Use the LCD controller for bed leveling
871
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
872
+ */
873
+//#define LCD_BED_LEVELING
869 874
 
870
-#endif // BED_LEVELING
875
+#if ENABLED(LCD_BED_LEVELING)
876
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
877
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
878
+#endif
871 879
 
872 880
 /**
873 881
  * Commands to execute at the end of G29 probing.
@@ -1416,13 +1424,13 @@
1416 1424
 
1417 1425
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1418 1426
 // be used to mitigate the associated resolution loss. If enabled,
1419
-// some of the PWM cycles are stretched so on average the wanted
1427
+// some of the PWM cycles are stretched so on average the desired
1420 1428
 // duty cycle is attained.
1421 1429
 //#define SOFT_PWM_DITHER
1422 1430
 
1423 1431
 // Temperature status LEDs that display the hotend and bed temperature.
1424
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1425
-// Otherwise the RED led is on. There is 1C hysteresis.
1432
+// If all hotends, bed temperature, and target temperature are under 54C
1433
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1426 1434
 //#define TEMP_STAT_LEDS
1427 1435
 
1428 1436
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/Felix/DUAL/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -528,6 +528,11 @@
528 528
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
529 529
 //
530 530
 
531
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
532
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
533
+// or (with LCD_BED_LEVELING) the LCD controller.
534
+//#define PROBE_MANUALLY
535
+
531 536
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
532 537
 // For example an inductive probe, or a setup that uses the nozzle to probe.
533 538
 // An inductive probe must be deactivated to go below
@@ -724,7 +729,6 @@
724 729
   #define FILAMENT_RUNOUT_SCRIPT "M600"
725 730
 #endif
726 731
 
727
-
728 732
 //===========================================================================
729 733
 //=============================== Bed Leveling ==============================
730 734
 //===========================================================================
@@ -860,14 +864,18 @@
860 864
 
861 865
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
862 866
 
863
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
864
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
867
+#endif // BED_LEVELING
865 868
 
866
-  #if ENABLED(MANUAL_BED_LEVELING)
867
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
868
-  #endif
869
+/**
870
+ * Use the LCD controller for bed leveling
871
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
872
+ */
873
+//#define LCD_BED_LEVELING
869 874
 
870
-#endif // BED_LEVELING
875
+#if ENABLED(LCD_BED_LEVELING)
876
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
877
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
878
+#endif
871 879
 
872 880
 /**
873 881
  * Commands to execute at the end of G29 probing.
@@ -1416,13 +1424,13 @@
1416 1424
 
1417 1425
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1418 1426
 // be used to mitigate the associated resolution loss. If enabled,
1419
-// some of the PWM cycles are stretched so on average the wanted
1427
+// some of the PWM cycles are stretched so on average the desired
1420 1428
 // duty cycle is attained.
1421 1429
 //#define SOFT_PWM_DITHER
1422 1430
 
1423 1431
 // Temperature status LEDs that display the hotend and bed temperature.
1424
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1425
-// Otherwise the RED led is on. There is 1C hysteresis.
1432
+// If all hotends, bed temperature, and target temperature are under 54C
1433
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1426 1434
 //#define TEMP_STAT_LEDS
1427 1435
 
1428 1436
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/Hephestos/Configuration.h Ver fichero

@@ -234,7 +234,7 @@
234 234
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
235 235
  *    66 : 4.7M High Temperature thermistor from Dyze Design
236 236
  *    70 : the 100K thermistor found in the bq Hephestos 2
237
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
237
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
238 238
  *
239 239
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
240 240
  *                              (but gives greater accuracy and more stable PID)
@@ -537,6 +537,11 @@
537 537
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
538 538
 //
539 539
 
540
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
541
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
542
+// or (with LCD_BED_LEVELING) the LCD controller.
543
+//#define PROBE_MANUALLY
544
+
540 545
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
541 546
 // For example an inductive probe, or a setup that uses the nozzle to probe.
542 547
 // An inductive probe must be deactivated to go below
@@ -733,7 +738,6 @@
733 738
   #define FILAMENT_RUNOUT_SCRIPT "M600"
734 739
 #endif
735 740
 
736
-
737 741
 //===========================================================================
738 742
 //=============================== Bed Leveling ==============================
739 743
 //===========================================================================
@@ -869,14 +873,18 @@
869 873
 
870 874
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
871 875
 
872
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
873
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
876
+#endif // BED_LEVELING
874 877
 
875
-  #if ENABLED(MANUAL_BED_LEVELING)
876
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
877
-  #endif
878
+/**
879
+ * Use the LCD controller for bed leveling
880
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
881
+ */
882
+//#define LCD_BED_LEVELING
878 883
 
879
-#endif // BED_LEVELING
884
+#if ENABLED(LCD_BED_LEVELING)
885
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
886
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
887
+#endif
880 888
 
881 889
 /**
882 890
  * Commands to execute at the end of G29 probing.
@@ -1425,13 +1433,13 @@
1425 1433
 
1426 1434
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1427 1435
 // be used to mitigate the associated resolution loss. If enabled,
1428
-// some of the PWM cycles are stretched so on average the wanted
1436
+// some of the PWM cycles are stretched so on average the desired
1429 1437
 // duty cycle is attained.
1430 1438
 //#define SOFT_PWM_DITHER
1431 1439
 
1432 1440
 // Temperature status LEDs that display the hotend and bed temperature.
1433
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1434
-// Otherwise the RED led is on. There is 1C hysteresis.
1441
+// If all hotends, bed temperature, and target temperature are under 54C
1442
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1435 1443
 //#define TEMP_STAT_LEDS
1436 1444
 
1437 1445
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/Hephestos_2/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -539,6 +539,11 @@
539 539
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
540 540
 //
541 541
 
542
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
543
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
544
+// or (with LCD_BED_LEVELING) the LCD controller.
545
+//#define PROBE_MANUALLY
546
+
542 547
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
543 548
 // For example an inductive probe, or a setup that uses the nozzle to probe.
544 549
 // An inductive probe must be deactivated to go below
@@ -735,7 +740,6 @@
735 740
   #define FILAMENT_RUNOUT_SCRIPT "M600"
736 741
 #endif
737 742
 
738
-
739 743
 //===========================================================================
740 744
 //=============================== Bed Leveling ==============================
741 745
 //===========================================================================
@@ -871,14 +875,18 @@
871 875
 
872 876
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
873 877
 
874
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
875
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
878
+#endif // BED_LEVELING
876 879
 
877
-  #if ENABLED(MANUAL_BED_LEVELING)
878
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
879
-  #endif
880
+/**
881
+ * Use the LCD controller for bed leveling
882
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
883
+ */
884
+//#define LCD_BED_LEVELING
880 885
 
881
-#endif // BED_LEVELING
886
+#if ENABLED(LCD_BED_LEVELING)
887
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
888
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
889
+#endif
882 890
 
883 891
 /**
884 892
  * Commands to execute at the end of G29 probing.
@@ -1427,13 +1435,13 @@
1427 1435
 
1428 1436
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1429 1437
 // be used to mitigate the associated resolution loss. If enabled,
1430
-// some of the PWM cycles are stretched so on average the wanted
1438
+// some of the PWM cycles are stretched so on average the desired
1431 1439
 // duty cycle is attained.
1432 1440
 //#define SOFT_PWM_DITHER
1433 1441
 
1434 1442
 // Temperature status LEDs that display the hotend and bed temperature.
1435
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1436
-// Otherwise the RED led is on. There is 1C hysteresis.
1443
+// If all hotends, bed temperature, and target temperature are under 54C
1444
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1437 1445
 //#define TEMP_STAT_LEDS
1438 1446
 
1439 1447
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/K8200/Configuration.h Ver fichero

@@ -251,7 +251,7 @@
251 251
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
252 252
  *    66 : 4.7M High Temperature thermistor from Dyze Design
253 253
  *    70 : the 100K thermistor found in the bq Hephestos 2
254
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
254
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
255 255
  *
256 256
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
257 257
  *                              (but gives greater accuracy and more stable PID)
@@ -574,6 +574,11 @@
574 574
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
575 575
 //
576 576
 
577
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
578
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
579
+// or (with LCD_BED_LEVELING) the LCD controller.
580
+//#define PROBE_MANUALLY
581
+
577 582
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
578 583
 // For example an inductive probe, or a setup that uses the nozzle to probe.
579 584
 // An inductive probe must be deactivated to go below
@@ -770,7 +775,6 @@
770 775
   #define FILAMENT_RUNOUT_SCRIPT "M600"
771 776
 #endif
772 777
 
773
-
774 778
 //===========================================================================
775 779
 //=============================== Bed Leveling ==============================
776 780
 //===========================================================================
@@ -906,14 +910,18 @@
906 910
 
907 911
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
908 912
 
909
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
910
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
913
+#endif // BED_LEVELING
911 914
 
912
-  #if ENABLED(MANUAL_BED_LEVELING)
913
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
914
-  #endif
915
+/**
916
+ * Use the LCD controller for bed leveling
917
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
918
+ */
919
+//#define LCD_BED_LEVELING
915 920
 
916
-#endif // BED_LEVELING
921
+#if ENABLED(LCD_BED_LEVELING)
922
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
923
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
924
+#endif
917 925
 
918 926
 /**
919 927
  * Commands to execute at the end of G29 probing.
@@ -1467,13 +1475,13 @@
1467 1475
 
1468 1476
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1469 1477
 // be used to mitigate the associated resolution loss. If enabled,
1470
-// some of the PWM cycles are stretched so on average the wanted
1478
+// some of the PWM cycles are stretched so on average the desired
1471 1479
 // duty cycle is attained.
1472 1480
 //#define SOFT_PWM_DITHER
1473 1481
 
1474 1482
 // Temperature status LEDs that display the hotend and bed temperature.
1475
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1476
-// Otherwise the RED led is on. There is 1C hysteresis.
1483
+// If all hotends, bed temperature, and target temperature are under 54C
1484
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1477 1485
 //#define TEMP_STAT_LEDS
1478 1486
 
1479 1487
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/K8400/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -545,6 +545,11 @@
545 545
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
546 546
 //
547 547
 
548
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
549
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
550
+// or (with LCD_BED_LEVELING) the LCD controller.
551
+//#define PROBE_MANUALLY
552
+
548 553
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
549 554
 // For example an inductive probe, or a setup that uses the nozzle to probe.
550 555
 // An inductive probe must be deactivated to go below
@@ -741,7 +746,6 @@
741 746
   #define FILAMENT_RUNOUT_SCRIPT "M600"
742 747
 #endif
743 748
 
744
-
745 749
 //===========================================================================
746 750
 //=============================== Bed Leveling ==============================
747 751
 //===========================================================================
@@ -877,14 +881,18 @@
877 881
 
878 882
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
879 883
 
880
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
881
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
884
+#endif // BED_LEVELING
882 885
 
883
-  #if ENABLED(MANUAL_BED_LEVELING)
884
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
885
-  #endif
886
+/**
887
+ * Use the LCD controller for bed leveling
888
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
889
+ */
890
+//#define LCD_BED_LEVELING
886 891
 
887
-#endif // BED_LEVELING
892
+#if ENABLED(LCD_BED_LEVELING)
893
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
894
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
895
+#endif
888 896
 
889 897
 /**
890 898
  * Commands to execute at the end of G29 probing.
@@ -1433,13 +1441,13 @@
1433 1441
 
1434 1442
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1435 1443
 // be used to mitigate the associated resolution loss. If enabled,
1436
-// some of the PWM cycles are stretched so on average the wanted
1444
+// some of the PWM cycles are stretched so on average the desired
1437 1445
 // duty cycle is attained.
1438 1446
 //#define SOFT_PWM_DITHER
1439 1447
 
1440 1448
 // Temperature status LEDs that display the hotend and bed temperature.
1441
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1442
-// Otherwise the RED led is on. There is 1C hysteresis.
1449
+// If all hotends, bed temperature, and target temperature are under 54C
1450
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1443 1451
 //#define TEMP_STAT_LEDS
1444 1452
 
1445 1453
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/K8400/Dual-head/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -545,6 +545,11 @@
545 545
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
546 546
 //
547 547
 
548
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
549
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
550
+// or (with LCD_BED_LEVELING) the LCD controller.
551
+//#define PROBE_MANUALLY
552
+
548 553
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
549 554
 // For example an inductive probe, or a setup that uses the nozzle to probe.
550 555
 // An inductive probe must be deactivated to go below
@@ -741,7 +746,6 @@
741 746
   #define FILAMENT_RUNOUT_SCRIPT "M600"
742 747
 #endif
743 748
 
744
-
745 749
 //===========================================================================
746 750
 //=============================== Bed Leveling ==============================
747 751
 //===========================================================================
@@ -877,14 +881,18 @@
877 881
 
878 882
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
879 883
 
880
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
881
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
884
+#endif // BED_LEVELING
882 885
 
883
-  #if ENABLED(MANUAL_BED_LEVELING)
884
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
885
-  #endif
886
+/**
887
+ * Use the LCD controller for bed leveling
888
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
889
+ */
890
+//#define LCD_BED_LEVELING
886 891
 
887
-#endif // BED_LEVELING
892
+#if ENABLED(LCD_BED_LEVELING)
893
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
894
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
895
+#endif
888 896
 
889 897
 /**
890 898
  * Commands to execute at the end of G29 probing.
@@ -1433,13 +1441,13 @@
1433 1441
 
1434 1442
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1435 1443
 // be used to mitigate the associated resolution loss. If enabled,
1436
-// some of the PWM cycles are stretched so on average the wanted
1444
+// some of the PWM cycles are stretched so on average the desired
1437 1445
 // duty cycle is attained.
1438 1446
 //#define SOFT_PWM_DITHER
1439 1447
 
1440 1448
 // Temperature status LEDs that display the hotend and bed temperature.
1441
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1442
-// Otherwise the RED led is on. There is 1C hysteresis.
1449
+// If all hotends, bed temperature, and target temperature are under 54C
1450
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1443 1451
 //#define TEMP_STAT_LEDS
1444 1452
 
1445 1453
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -545,6 +545,11 @@
545 545
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
546 546
 //
547 547
 
548
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
549
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
550
+// or (with LCD_BED_LEVELING) the LCD controller.
551
+//#define PROBE_MANUALLY
552
+
548 553
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
549 554
 // For example an inductive probe, or a setup that uses the nozzle to probe.
550 555
 // An inductive probe must be deactivated to go below
@@ -741,7 +746,6 @@
741 746
   #define FILAMENT_RUNOUT_SCRIPT "M600"
742 747
 #endif
743 748
 
744
-
745 749
 //===========================================================================
746 750
 //=============================== Bed Leveling ==============================
747 751
 //===========================================================================
@@ -877,14 +881,18 @@
877 881
 
878 882
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
879 883
 
880
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
881
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
884
+#endif // BED_LEVELING
882 885
 
883
-  #if ENABLED(MANUAL_BED_LEVELING)
884
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
885
-  #endif
886
+/**
887
+ * Use the LCD controller for bed leveling
888
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
889
+ */
890
+//#define LCD_BED_LEVELING
886 891
 
887
-#endif // BED_LEVELING
892
+#if ENABLED(LCD_BED_LEVELING)
893
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
894
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
895
+#endif
888 896
 
889 897
 /**
890 898
  * Commands to execute at the end of G29 probing.
@@ -1433,13 +1441,13 @@
1433 1441
 
1434 1442
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1435 1443
 // be used to mitigate the associated resolution loss. If enabled,
1436
-// some of the PWM cycles are stretched so on average the wanted
1444
+// some of the PWM cycles are stretched so on average the desired
1437 1445
 // duty cycle is attained.
1438 1446
 //#define SOFT_PWM_DITHER
1439 1447
 
1440 1448
 // Temperature status LEDs that display the hotend and bed temperature.
1441
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1442
-// Otherwise the RED led is on. There is 1C hysteresis.
1449
+// If all hotends, bed temperature, and target temperature are under 54C
1450
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1443 1451
 //#define TEMP_STAT_LEDS
1444 1452
 
1445 1453
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/RigidBot/Configuration.h Ver fichero

@@ -234,7 +234,7 @@
234 234
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
235 235
  *    66 : 4.7M High Temperature thermistor from Dyze Design
236 236
  *    70 : the 100K thermistor found in the bq Hephestos 2
237
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
237
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
238 238
  *
239 239
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
240 240
  *                              (but gives greater accuracy and more stable PID)
@@ -544,6 +544,11 @@
544 544
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
545 545
 //
546 546
 
547
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
548
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
549
+// or (with LCD_BED_LEVELING) the LCD controller.
550
+//#define PROBE_MANUALLY
551
+
547 552
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
548 553
 // For example an inductive probe, or a setup that uses the nozzle to probe.
549 554
 // An inductive probe must be deactivated to go below
@@ -740,7 +745,6 @@
740 745
   #define FILAMENT_RUNOUT_SCRIPT "M600"
741 746
 #endif
742 747
 
743
-
744 748
 //===========================================================================
745 749
 //=============================== Bed Leveling ==============================
746 750
 //===========================================================================
@@ -876,14 +880,18 @@
876 880
 
877 881
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
878 882
 
879
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
880
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
883
+#endif // BED_LEVELING
881 884
 
882
-  #if ENABLED(MANUAL_BED_LEVELING)
883
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
884
-  #endif
885
+/**
886
+ * Use the LCD controller for bed leveling
887
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
888
+ */
889
+//#define LCD_BED_LEVELING
885 890
 
886
-#endif // BED_LEVELING
891
+#if ENABLED(LCD_BED_LEVELING)
892
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
893
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
894
+#endif
887 895
 
888 896
 /**
889 897
  * Commands to execute at the end of G29 probing.
@@ -1434,13 +1442,13 @@
1434 1442
 
1435 1443
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1436 1444
 // be used to mitigate the associated resolution loss. If enabled,
1437
-// some of the PWM cycles are stretched so on average the wanted
1445
+// some of the PWM cycles are stretched so on average the desired
1438 1446
 // duty cycle is attained.
1439 1447
 //#define SOFT_PWM_DITHER
1440 1448
 
1441 1449
 // Temperature status LEDs that display the hotend and bed temperature.
1442
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1443
-// Otherwise the RED led is on. There is 1C hysteresis.
1450
+// If all hotends, bed temperature, and target temperature are under 54C
1451
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1444 1452
 //#define TEMP_STAT_LEDS
1445 1453
 
1446 1454
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/SCARA/Configuration.h Ver fichero

@@ -263,7 +263,7 @@
263 263
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
264 264
  *    66 : 4.7M High Temperature thermistor from Dyze Design
265 265
  *    70 : the 100K thermistor found in the bq Hephestos 2
266
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
266
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
267 267
  *
268 268
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
269 269
  *                              (but gives greater accuracy and more stable PID)
@@ -560,6 +560,11 @@
560 560
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
561 561
 //
562 562
 
563
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
564
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
565
+// or (with LCD_BED_LEVELING) the LCD controller.
566
+//#define PROBE_MANUALLY
567
+
563 568
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
564 569
 // For example an inductive probe, or a setup that uses the nozzle to probe.
565 570
 // An inductive probe must be deactivated to go below
@@ -756,7 +761,6 @@
756 761
   #define FILAMENT_RUNOUT_SCRIPT "M600"
757 762
 #endif
758 763
 
759
-
760 764
 //===========================================================================
761 765
 //=============================== Bed Leveling ==============================
762 766
 //===========================================================================
@@ -892,14 +896,18 @@
892 896
 
893 897
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
894 898
 
895
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
896
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
899
+#endif // BED_LEVELING
897 900
 
898
-  #if ENABLED(MANUAL_BED_LEVELING)
899
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
900
-  #endif
901
+/**
902
+ * Use the LCD controller for bed leveling
903
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
904
+ */
905
+//#define LCD_BED_LEVELING
901 906
 
902
-#endif // BED_LEVELING
907
+#if ENABLED(LCD_BED_LEVELING)
908
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
909
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
910
+#endif
903 911
 
904 912
 /**
905 913
  * Commands to execute at the end of G29 probing.
@@ -1448,13 +1456,13 @@
1448 1456
 
1449 1457
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1450 1458
 // be used to mitigate the associated resolution loss. If enabled,
1451
-// some of the PWM cycles are stretched so on average the wanted
1459
+// some of the PWM cycles are stretched so on average the desired
1452 1460
 // duty cycle is attained.
1453 1461
 //#define SOFT_PWM_DITHER
1454 1462
 
1455 1463
 // Temperature status LEDs that display the hotend and bed temperature.
1456
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1457
-// Otherwise the RED led is on. There is 1C hysteresis.
1464
+// If all hotends, bed temperature, and target temperature are under 54C
1465
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1458 1466
 //#define TEMP_STAT_LEDS
1459 1467
 
1460 1468
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/TAZ4/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -566,6 +566,11 @@
566 566
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
567 567
 //
568 568
 
569
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
570
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
571
+// or (with LCD_BED_LEVELING) the LCD controller.
572
+//#define PROBE_MANUALLY
573
+
569 574
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
570 575
 // For example an inductive probe, or a setup that uses the nozzle to probe.
571 576
 // An inductive probe must be deactivated to go below
@@ -762,7 +767,6 @@
762 767
   #define FILAMENT_RUNOUT_SCRIPT "M600"
763 768
 #endif
764 769
 
765
-
766 770
 //===========================================================================
767 771
 //=============================== Bed Leveling ==============================
768 772
 //===========================================================================
@@ -898,14 +902,18 @@
898 902
 
899 903
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
900 904
 
901
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
902
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
905
+#endif // BED_LEVELING
903 906
 
904
-  #if ENABLED(MANUAL_BED_LEVELING)
905
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
906
-  #endif
907
+/**
908
+ * Use the LCD controller for bed leveling
909
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
910
+ */
911
+//#define LCD_BED_LEVELING
907 912
 
908
-#endif // BED_LEVELING
913
+#if ENABLED(LCD_BED_LEVELING)
914
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
915
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
916
+#endif
909 917
 
910 918
 /**
911 919
  * Commands to execute at the end of G29 probing.
@@ -1454,13 +1462,13 @@
1454 1462
 
1455 1463
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1456 1464
 // be used to mitigate the associated resolution loss. If enabled,
1457
-// some of the PWM cycles are stretched so on average the wanted
1465
+// some of the PWM cycles are stretched so on average the desired
1458 1466
 // duty cycle is attained.
1459 1467
 //#define SOFT_PWM_DITHER
1460 1468
 
1461 1469
 // Temperature status LEDs that display the hotend and bed temperature.
1462
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1463
-// Otherwise the RED led is on. There is 1C hysteresis.
1470
+// If all hotends, bed temperature, and target temperature are under 54C
1471
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1464 1472
 //#define TEMP_STAT_LEDS
1465 1473
 
1466 1474
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/WITBOX/Configuration.h Ver fichero

@@ -234,7 +234,7 @@
234 234
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
235 235
  *    66 : 4.7M High Temperature thermistor from Dyze Design
236 236
  *    70 : the 100K thermistor found in the bq Hephestos 2
237
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
237
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
238 238
  *
239 239
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
240 240
  *                              (but gives greater accuracy and more stable PID)
@@ -537,6 +537,11 @@
537 537
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
538 538
 //
539 539
 
540
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
541
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
542
+// or (with LCD_BED_LEVELING) the LCD controller.
543
+//#define PROBE_MANUALLY
544
+
540 545
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
541 546
 // For example an inductive probe, or a setup that uses the nozzle to probe.
542 547
 // An inductive probe must be deactivated to go below
@@ -733,7 +738,6 @@
733 738
   #define FILAMENT_RUNOUT_SCRIPT "M600"
734 739
 #endif
735 740
 
736
-
737 741
 //===========================================================================
738 742
 //=============================== Bed Leveling ==============================
739 743
 //===========================================================================
@@ -869,14 +873,18 @@
869 873
 
870 874
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
871 875
 
872
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
873
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
876
+#endif // BED_LEVELING
874 877
 
875
-  #if ENABLED(MANUAL_BED_LEVELING)
876
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
877
-  #endif
878
+/**
879
+ * Use the LCD controller for bed leveling
880
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
881
+ */
882
+//#define LCD_BED_LEVELING
878 883
 
879
-#endif // BED_LEVELING
884
+#if ENABLED(LCD_BED_LEVELING)
885
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
886
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
887
+#endif
880 888
 
881 889
 /**
882 890
  * Commands to execute at the end of G29 probing.
@@ -1425,13 +1433,13 @@
1425 1433
 
1426 1434
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1427 1435
 // be used to mitigate the associated resolution loss. If enabled,
1428
-// some of the PWM cycles are stretched so on average the wanted
1436
+// some of the PWM cycles are stretched so on average the desired
1429 1437
 // duty cycle is attained.
1430 1438
 //#define SOFT_PWM_DITHER
1431 1439
 
1432 1440
 // Temperature status LEDs that display the hotend and bed temperature.
1433
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1434
-// Otherwise the RED led is on. There is 1C hysteresis.
1441
+// If all hotends, bed temperature, and target temperature are under 54C
1442
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1435 1443
 //#define TEMP_STAT_LEDS
1436 1444
 
1437 1445
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/adafruit/ST7565/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -545,6 +545,11 @@
545 545
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
546 546
 //
547 547
 
548
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
549
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
550
+// or (with LCD_BED_LEVELING) the LCD controller.
551
+//#define PROBE_MANUALLY
552
+
548 553
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
549 554
 // For example an inductive probe, or a setup that uses the nozzle to probe.
550 555
 // An inductive probe must be deactivated to go below
@@ -741,7 +746,6 @@
741 746
   #define FILAMENT_RUNOUT_SCRIPT "M600"
742 747
 #endif
743 748
 
744
-
745 749
 //===========================================================================
746 750
 //=============================== Bed Leveling ==============================
747 751
 //===========================================================================
@@ -877,14 +881,18 @@
877 881
 
878 882
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
879 883
 
880
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
881
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
884
+#endif // BED_LEVELING
882 885
 
883
-  #if ENABLED(MANUAL_BED_LEVELING)
884
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
885
-  #endif
886
+/**
887
+ * Use the LCD controller for bed leveling
888
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
889
+ */
890
+//#define LCD_BED_LEVELING
886 891
 
887
-#endif // BED_LEVELING
892
+#if ENABLED(LCD_BED_LEVELING)
893
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
894
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
895
+#endif
888 896
 
889 897
 /**
890 898
  * Commands to execute at the end of G29 probing.
@@ -1433,13 +1441,13 @@
1433 1441
 
1434 1442
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1435 1443
 // be used to mitigate the associated resolution loss. If enabled,
1436
-// some of the PWM cycles are stretched so on average the wanted
1444
+// some of the PWM cycles are stretched so on average the desired
1437 1445
 // duty cycle is attained.
1438 1446
 //#define SOFT_PWM_DITHER
1439 1447
 
1440 1448
 // Temperature status LEDs that display the hotend and bed temperature.
1441
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1442
-// Otherwise the RED led is on. There is 1C hysteresis.
1449
+// If all hotends, bed temperature, and target temperature are under 54C
1450
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1443 1451
 //#define TEMP_STAT_LEDS
1444 1452
 
1445 1453
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 10
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -603,6 +603,11 @@
603 603
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
604 604
 //
605 605
 
606
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
607
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
608
+// or (with LCD_BED_LEVELING) the LCD controller.
609
+//#define PROBE_MANUALLY
610
+
606 611
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
607 612
 // For example an inductive probe, or a setup that uses the nozzle to probe.
608 613
 // An inductive probe must be deactivated to go below
@@ -982,14 +987,18 @@
982 987
 
983 988
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
984 989
 
985
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
986
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
990
+#endif // BED_LEVELING
987 991
 
988
-  #if ENABLED(MANUAL_BED_LEVELING)
989
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
990
-  #endif
992
+/**
993
+ * Use the LCD controller for bed leveling
994
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
995
+ */
996
+//#define LCD_BED_LEVELING
991 997
 
992
-#endif // BED_LEVELING
998
+#if ENABLED(LCD_BED_LEVELING)
999
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
1000
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
1001
+#endif
993 1002
 
994 1003
 /**
995 1004
  * Commands to execute at the end of G29 probing.
@@ -1538,13 +1547,13 @@
1538 1547
 
1539 1548
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1540 1549
 // be used to mitigate the associated resolution loss. If enabled,
1541
-// some of the PWM cycles are stretched so on average the wanted
1550
+// some of the PWM cycles are stretched so on average the desired
1542 1551
 // duty cycle is attained.
1543 1552
 //#define SOFT_PWM_DITHER
1544 1553
 
1545 1554
 // Temperature status LEDs that display the hotend and bed temperature.
1546
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1547
-// Otherwise the RED led is on. There is 1C hysteresis.
1555
+// If all hotends, bed temperature, and target temperature are under 54C
1556
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1548 1557
 //#define TEMP_STAT_LEDS
1549 1558
 
1550 1559
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/delta/generic/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -590,6 +590,11 @@
590 590
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
591 591
 //
592 592
 
593
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
594
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
595
+// or (with LCD_BED_LEVELING) the LCD controller.
596
+//#define PROBE_MANUALLY
597
+
593 598
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
594 599
 // For example an inductive probe, or a setup that uses the nozzle to probe.
595 600
 // An inductive probe must be deactivated to go below
@@ -831,7 +836,6 @@
831 836
   #define FILAMENT_RUNOUT_SCRIPT "M600"
832 837
 #endif
833 838
 
834
-
835 839
 //===========================================================================
836 840
 //=============================== Bed Leveling ==============================
837 841
 //===========================================================================
@@ -968,14 +972,18 @@
968 972
 
969 973
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
970 974
 
971
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
972
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
975
+#endif // BED_LEVELING
973 976
 
974
-  #if ENABLED(MANUAL_BED_LEVELING)
975
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
976
-  #endif
977
+/**
978
+ * Use the LCD controller for bed leveling
979
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
980
+ */
981
+//#define LCD_BED_LEVELING
977 982
 
978
-#endif // BED_LEVELING
983
+#if ENABLED(LCD_BED_LEVELING)
984
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
985
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
986
+#endif
979 987
 
980 988
 /**
981 989
  * Commands to execute at the end of G29 probing.
@@ -1523,13 +1531,13 @@
1523 1531
 
1524 1532
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1525 1533
 // be used to mitigate the associated resolution loss. If enabled,
1526
-// some of the PWM cycles are stretched so on average the wanted
1534
+// some of the PWM cycles are stretched so on average the desired
1527 1535
 // duty cycle is attained.
1528 1536
 //#define SOFT_PWM_DITHER
1529 1537
 
1530 1538
 // Temperature status LEDs that display the hotend and bed temperature.
1531
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1532
-// Otherwise the RED led is on. There is 1C hysteresis.
1539
+// If all hotends, bed temperature, and target temperature are under 54C
1540
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1533 1541
 //#define TEMP_STAT_LEDS
1534 1542
 
1535 1543
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/delta/kossel_mini/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -590,6 +590,11 @@
590 590
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
591 591
 //
592 592
 
593
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
594
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
595
+// or (with LCD_BED_LEVELING) the LCD controller.
596
+//#define PROBE_MANUALLY
597
+
593 598
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
594 599
 // For example an inductive probe, or a setup that uses the nozzle to probe.
595 600
 // An inductive probe must be deactivated to go below
@@ -834,7 +839,6 @@
834 839
   #define FILAMENT_RUNOUT_SCRIPT "M600"
835 840
 #endif
836 841
 
837
-
838 842
 //===========================================================================
839 843
 //=============================== Bed Leveling ==============================
840 844
 //===========================================================================
@@ -972,14 +976,18 @@
972 976
 
973 977
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
974 978
 
975
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
976
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
979
+#endif // BED_LEVELING
977 980
 
978
-  #if ENABLED(MANUAL_BED_LEVELING)
979
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
980
-  #endif
981
+/**
982
+ * Use the LCD controller for bed leveling
983
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
984
+ */
985
+//#define LCD_BED_LEVELING
981 986
 
982
-#endif // BED_LEVELING
987
+#if ENABLED(LCD_BED_LEVELING)
988
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
989
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
990
+#endif
983 991
 
984 992
 /**
985 993
  * Commands to execute at the end of G29 probing.
@@ -1527,13 +1535,13 @@
1527 1535
 
1528 1536
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1529 1537
 // be used to mitigate the associated resolution loss. If enabled,
1530
-// some of the PWM cycles are stretched so on average the wanted
1538
+// some of the PWM cycles are stretched so on average the desired
1531 1539
 // duty cycle is attained.
1532 1540
 //#define SOFT_PWM_DITHER
1533 1541
 
1534 1542
 // Temperature status LEDs that display the hotend and bed temperature.
1535
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1536
-// Otherwise the RED led is on. There is 1C hysteresis.
1543
+// If all hotends, bed temperature, and target temperature are under 54C
1544
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1537 1545
 //#define TEMP_STAT_LEDS
1538 1546
 
1539 1547
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/delta/kossel_pro/Configuration.h Ver fichero

@@ -235,7 +235,7 @@
235 235
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
236 236
  *    66 : 4.7M High Temperature thermistor from Dyze Design
237 237
  *    70 : the 100K thermistor found in the bq Hephestos 2
238
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
238
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
239 239
  *
240 240
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
241 241
  *                              (but gives greater accuracy and more stable PID)
@@ -584,6 +584,11 @@
584 584
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
585 585
 //
586 586
 
587
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
588
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
589
+// or (with LCD_BED_LEVELING) the LCD controller.
590
+//#define PROBE_MANUALLY
591
+
587 592
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
588 593
 // For example an inductive probe, or a setup that uses the nozzle to probe.
589 594
 // An inductive probe must be deactivated to go below
@@ -833,7 +838,6 @@
833 838
   #define FILAMENT_RUNOUT_SCRIPT "M600"
834 839
 #endif
835 840
 
836
-
837 841
 //===========================================================================
838 842
 //=============================== Bed Leveling ==============================
839 843
 //===========================================================================
@@ -971,14 +975,18 @@
971 975
 
972 976
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
973 977
 
974
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
975
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
978
+#endif // BED_LEVELING
976 979
 
977
-  #if ENABLED(MANUAL_BED_LEVELING)
978
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
979
-  #endif
980
+/**
981
+ * Use the LCD controller for bed leveling
982
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
983
+ */
984
+//#define LCD_BED_LEVELING
980 985
 
981
-#endif // BED_LEVELING
986
+#if ENABLED(LCD_BED_LEVELING)
987
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
988
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
989
+#endif
982 990
 
983 991
 /**
984 992
  * Commands to execute at the end of G29 probing.
@@ -1526,13 +1534,13 @@
1526 1534
 
1527 1535
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1528 1536
 // be used to mitigate the associated resolution loss. If enabled,
1529
-// some of the PWM cycles are stretched so on average the wanted
1537
+// some of the PWM cycles are stretched so on average the desired
1530 1538
 // duty cycle is attained.
1531 1539
 //#define SOFT_PWM_DITHER
1532 1540
 
1533 1541
 // Temperature status LEDs that display the hotend and bed temperature.
1534
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1535
-// Otherwise the RED led is on. There is 1C hysteresis.
1542
+// If all hotends, bed temperature, and target temperature are under 54C
1543
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1536 1544
 //#define TEMP_STAT_LEDS
1537 1545
 
1538 1546
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/delta/kossel_xl/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -603,6 +603,11 @@
603 603
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
604 604
 //
605 605
 
606
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
607
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
608
+// or (with LCD_BED_LEVELING) the LCD controller.
609
+//#define PROBE_MANUALLY
610
+
606 611
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
607 612
 // For example an inductive probe, or a setup that uses the nozzle to probe.
608 613
 // An inductive probe must be deactivated to go below
@@ -844,7 +849,6 @@
844 849
   #define FILAMENT_RUNOUT_SCRIPT "M600"
845 850
 #endif
846 851
 
847
-
848 852
 //===========================================================================
849 853
 //=============================== Bed Leveling ==============================
850 854
 //===========================================================================
@@ -981,14 +985,18 @@
981 985
 
982 986
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
983 987
 
984
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
985
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
988
+#endif // BED_LEVELING
986 989
 
987
-  #if ENABLED(MANUAL_BED_LEVELING)
988
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
989
-  #endif
990
+/**
991
+ * Use the LCD controller for bed leveling
992
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
993
+ */
994
+//#define LCD_BED_LEVELING
990 995
 
991
-#endif // BED_LEVELING
996
+#if ENABLED(LCD_BED_LEVELING)
997
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
998
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
999
+#endif
992 1000
 
993 1001
 /**
994 1002
  * Commands to execute at the end of G29 probing.
@@ -1536,13 +1544,13 @@
1536 1544
 
1537 1545
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1538 1546
 // be used to mitigate the associated resolution loss. If enabled,
1539
-// some of the PWM cycles are stretched so on average the wanted
1547
+// some of the PWM cycles are stretched so on average the desired
1540 1548
 // duty cycle is attained.
1541 1549
 //#define SOFT_PWM_DITHER
1542 1550
 
1543 1551
 // Temperature status LEDs that display the hotend and bed temperature.
1544
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1545
-// Otherwise the RED led is on. There is 1C hysteresis.
1552
+// If all hotends, bed temperature, and target temperature are under 54C
1553
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1546 1554
 //#define TEMP_STAT_LEDS
1547 1555
 
1548 1556
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/makibox/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -548,6 +548,11 @@
548 548
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
549 549
 //
550 550
 
551
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
552
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
553
+// or (with LCD_BED_LEVELING) the LCD controller.
554
+//#define PROBE_MANUALLY
555
+
551 556
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
552 557
 // For example an inductive probe, or a setup that uses the nozzle to probe.
553 558
 // An inductive probe must be deactivated to go below
@@ -744,7 +749,6 @@
744 749
   #define FILAMENT_RUNOUT_SCRIPT "M600"
745 750
 #endif
746 751
 
747
-
748 752
 //===========================================================================
749 753
 //=============================== Bed Leveling ==============================
750 754
 //===========================================================================
@@ -880,14 +884,18 @@
880 884
 
881 885
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
882 886
 
883
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
884
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
887
+#endif // BED_LEVELING
885 888
 
886
-  #if ENABLED(MANUAL_BED_LEVELING)
887
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
888
-  #endif
889
+/**
890
+ * Use the LCD controller for bed leveling
891
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
892
+ */
893
+//#define LCD_BED_LEVELING
889 894
 
890
-#endif // BED_LEVELING
895
+#if ENABLED(LCD_BED_LEVELING)
896
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
897
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
898
+#endif
891 899
 
892 900
 /**
893 901
  * Commands to execute at the end of G29 probing.
@@ -1436,13 +1444,13 @@
1436 1444
 
1437 1445
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1438 1446
 // be used to mitigate the associated resolution loss. If enabled,
1439
-// some of the PWM cycles are stretched so on average the wanted
1447
+// some of the PWM cycles are stretched so on average the desired
1440 1448
 // duty cycle is attained.
1441 1449
 //#define SOFT_PWM_DITHER
1442 1450
 
1443 1451
 // Temperature status LEDs that display the hotend and bed temperature.
1444
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1445
-// Otherwise the RED led is on. There is 1C hysteresis.
1452
+// If all hotends, bed temperature, and target temperature are under 54C
1453
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1446 1454
 //#define TEMP_STAT_LEDS
1447 1455
 
1448 1456
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

+ 19
- 11
Marlin/example_configurations/tvrrug/Round2/Configuration.h Ver fichero

@@ -231,7 +231,7 @@
231 231
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232 232
  *    66 : 4.7M High Temperature thermistor from Dyze Design
233 233
  *    70 : the 100K thermistor found in the bq Hephestos 2
234
- *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
234
+ *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
235 235
  *
236 236
  *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
237 237
  *                              (but gives greater accuracy and more stable PID)
@@ -541,6 +541,11 @@
541 541
 // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
542 542
 //
543 543
 
544
+// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
545
+// Use G29 repeatedly, adjusting the Z height at each point with movement commands
546
+// or (with LCD_BED_LEVELING) the LCD controller.
547
+//#define PROBE_MANUALLY
548
+
544 549
 // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
545 550
 // For example an inductive probe, or a setup that uses the nozzle to probe.
546 551
 // An inductive probe must be deactivated to go below
@@ -737,7 +742,6 @@
737 742
   #define FILAMENT_RUNOUT_SCRIPT "M600"
738 743
 #endif
739 744
 
740
-
741 745
 //===========================================================================
742 746
 //=============================== Bed Leveling ==============================
743 747
 //===========================================================================
@@ -873,14 +877,18 @@
873 877
 
874 878
   //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
875 879
 
876
-  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
877
-  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
880
+#endif // BED_LEVELING
878 881
 
879
-  #if ENABLED(MANUAL_BED_LEVELING)
880
-    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
881
-  #endif
882
+/**
883
+ * Use the LCD controller for bed leveling
884
+ * Requires MESH_BED_LEVELING or PROBE_MANUALLY
885
+ */
886
+//#define LCD_BED_LEVELING
882 887
 
883
-#endif // BED_LEVELING
888
+#if ENABLED(LCD_BED_LEVELING)
889
+  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
890
+  #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
891
+#endif
884 892
 
885 893
 /**
886 894
  * Commands to execute at the end of G29 probing.
@@ -1429,13 +1437,13 @@
1429 1437
 
1430 1438
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
1431 1439
 // be used to mitigate the associated resolution loss. If enabled,
1432
-// some of the PWM cycles are stretched so on average the wanted
1440
+// some of the PWM cycles are stretched so on average the desired
1433 1441
 // duty cycle is attained.
1434 1442
 //#define SOFT_PWM_DITHER
1435 1443
 
1436 1444
 // Temperature status LEDs that display the hotend and bed temperature.
1437
-// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
1438
-// Otherwise the RED led is on. There is 1C hysteresis.
1445
+// If all hotends, bed temperature, and target temperature are under 54C
1446
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
1439 1447
 //#define TEMP_STAT_LEDS
1440 1448
 
1441 1449
 // M240  Triggers a camera by emulating a Canon RC-1 Remote

Loading…
Cancelar
Guardar