Browse Source

Merge pull request #3802 from thinkyhead/rc_epatel_g28_rest_pos

MBL: Add option to configure G28 resting position for all axes
Scott Lahteine 9 years ago
parent
commit
88291d1656

+ 6
- 0
.travis.yml View File

94
   - opt_enable ENABLE_AUTO_BED_LEVELING DEBUG_LEVELING_FEATURE
94
   - opt_enable ENABLE_AUTO_BED_LEVELING DEBUG_LEVELING_FEATURE
95
   - build_marlin
95
   - build_marlin
96
   #
96
   #
97
+  # Test MESH_BED_LEVELING feature, with LCD
98
+  #
99
+  - restore_configs
100
+  - opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN MANUAL_BED_LEVELING ULTIMAKERCONTROLLER
101
+  - build_marlin
102
+  #
97
   # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos
103
   # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos
98
   #
104
   #
99
   - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
105
   - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE

+ 2
- 0
Marlin/Configuration.h View File

525
   #define MESH_NUM_Y_POINTS 3
525
   #define MESH_NUM_Y_POINTS 3
526
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
526
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
527
 
527
 
528
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
529
+
528
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
530
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
529
 
531
 
530
   #if ENABLED(MANUAL_BED_LEVELING)
532
   #if ENABLED(MANUAL_BED_LEVELING)

+ 8
- 6
Marlin/Marlin_main.cpp View File

2918
     #endif
2918
     #endif
2919
   #endif
2919
   #endif
2920
 
2920
 
2921
-  // For mesh leveling move back to Z=0
2921
+  // Enable mesh leveling again
2922
   #if ENABLED(MESH_BED_LEVELING)
2922
   #if ENABLED(MESH_BED_LEVELING)
2923
     if (mbl_was_active && home_all_axis) {
2923
     if (mbl_was_active && home_all_axis) {
2924
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2924
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2925
       sync_plan_position();
2925
       sync_plan_position();
2926
       mbl.active = 1;
2926
       mbl.active = 1;
2927
-      current_position[Z_AXIS] = 0.0;
2928
-      set_destination_to_current();
2929
-      feedrate = homing_feedrate[Z_AXIS];
2930
-      line_to_destination();
2931
-      stepper.synchronize();
2927
+      #if ENABLED(MESH_G28_REST_ORIGIN)
2928
+        current_position[Z_AXIS] = 0.0;
2929
+        set_destination_to_current();
2930
+        feedrate = homing_feedrate[Z_AXIS];
2931
+        line_to_destination();
2932
+        stepper.synchronize();
2933
+      #endif
2932
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2934
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2933
         if (DEBUGGING(LEVELING)) DEBUG_POS("mbl_was_active", current_position);
2935
         if (DEBUGGING(LEVELING)) DEBUG_POS("mbl_was_active", current_position);
2934
       #endif
2936
       #endif

+ 2
- 0
Marlin/example_configurations/Felix/Configuration.h View File

507
   #define MESH_NUM_Y_POINTS 3
507
   #define MESH_NUM_Y_POINTS 3
508
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
508
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
509
 
509
 
510
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
511
+
510
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
512
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
511
 
513
 
512
   #if ENABLED(MANUAL_BED_LEVELING)
514
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

505
   #define MESH_NUM_Y_POINTS 3
505
   #define MESH_NUM_Y_POINTS 3
506
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
506
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
507
 
507
 
508
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
509
+
508
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
510
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
509
 
511
 
510
   #if ENABLED(MANUAL_BED_LEVELING)
512
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/Hephestos/Configuration.h View File

517
   #define MESH_NUM_Y_POINTS 3
517
   #define MESH_NUM_Y_POINTS 3
518
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
518
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
519
 
519
 
520
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
521
+
520
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
522
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
521
 
523
 
522
   #if ENABLED(MANUAL_BED_LEVELING)
524
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/Hephestos_2/Configuration.h View File

519
   #define MESH_NUM_Y_POINTS 3
519
   #define MESH_NUM_Y_POINTS 3
520
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
520
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
521
 
521
 
522
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
523
+
522
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
524
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
523
 
525
 
524
   #if ENABLED(MANUAL_BED_LEVELING)
526
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/K8200/Configuration.h View File

542
   #define MESH_NUM_Y_POINTS 3
542
   #define MESH_NUM_Y_POINTS 3
543
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
543
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
544
 
544
 
545
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
546
+
545
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
547
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
546
 
548
 
547
   #if ENABLED(MANUAL_BED_LEVELING)
549
   #if ENABLED(MANUAL_BED_LEVELING)

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

525
   #define MESH_NUM_Y_POINTS 3
525
   #define MESH_NUM_Y_POINTS 3
526
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
526
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
527
 
527
 
528
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
529
+
528
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
530
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
529
 
531
 
530
   #if ENABLED(MANUAL_BED_LEVELING)
532
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/RigidBot/Configuration.h View File

519
   #define MESH_NUM_Y_POINTS 3
519
   #define MESH_NUM_Y_POINTS 3
520
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
520
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
521
 
521
 
522
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
523
+
522
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
524
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
523
 
525
 
524
   #if ENABLED(MANUAL_BED_LEVELING)
526
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

533
   #define MESH_NUM_Y_POINTS 3
533
   #define MESH_NUM_Y_POINTS 3
534
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
534
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
535
 
535
 
536
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
537
+
536
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
538
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
537
 
539
 
538
   #if ENABLED(MANUAL_BED_LEVELING)
540
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/TAZ4/Configuration.h View File

546
   #define MESH_NUM_Y_POINTS 3
546
   #define MESH_NUM_Y_POINTS 3
547
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
547
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
548
 
548
 
549
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
550
+
549
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
551
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
550
 
552
 
551
   #if ENABLED(MANUAL_BED_LEVELING)
553
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

517
   #define MESH_NUM_Y_POINTS 3
517
   #define MESH_NUM_Y_POINTS 3
518
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
518
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
519
 
519
 
520
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
521
+
520
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
522
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
521
 
523
 
522
   #if ENABLED(MANUAL_BED_LEVELING)
524
   #if ENABLED(MANUAL_BED_LEVELING)

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

525
   #define MESH_NUM_Y_POINTS 3
525
   #define MESH_NUM_Y_POINTS 3
526
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
526
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
527
 
527
 
528
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
529
+
528
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
530
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
529
 
531
 
530
   #if ENABLED(MANUAL_BED_LEVELING)
532
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

567
   #define MESH_NUM_Y_POINTS 3
567
   #define MESH_NUM_Y_POINTS 3
568
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
568
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
569
 
569
 
570
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
571
+
570
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
572
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
571
 
573
 
572
   #if ENABLED(MANUAL_BED_LEVELING)
574
   #if ENABLED(MANUAL_BED_LEVELING)

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

567
   #define MESH_NUM_Y_POINTS 3
567
   #define MESH_NUM_Y_POINTS 3
568
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
568
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
569
 
569
 
570
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
571
+
570
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
572
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
571
 
573
 
572
   #if ENABLED(MANUAL_BED_LEVELING)
574
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

567
   #define MESH_NUM_Y_POINTS 3
567
   #define MESH_NUM_Y_POINTS 3
568
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
568
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
569
 
569
 
570
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
571
+
570
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
572
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
571
 
573
 
572
   #if ENABLED(MANUAL_BED_LEVELING)
574
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

556
   #define MESH_NUM_Y_POINTS 3
556
   #define MESH_NUM_Y_POINTS 3
557
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
557
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
558
 
558
 
559
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
560
+
559
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
561
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
560
 
562
 
561
   #if ENABLED(MANUAL_BED_LEVELING)
563
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

565
   #define MESH_NUM_Y_POINTS 3
565
   #define MESH_NUM_Y_POINTS 3
566
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
566
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
567
 
567
 
568
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
569
+
568
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
570
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
569
 
571
 
570
   #if ENABLED(MANUAL_BED_LEVELING)
572
   #if ENABLED(MANUAL_BED_LEVELING)

+ 2
- 0
Marlin/example_configurations/makibox/Configuration.h View File

528
   #define MESH_NUM_Y_POINTS 3
528
   #define MESH_NUM_Y_POINTS 3
529
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
529
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
530
 
530
 
531
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
532
+
531
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
533
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
532
 
534
 
533
   #if ENABLED(MANUAL_BED_LEVELING)
535
   #if ENABLED(MANUAL_BED_LEVELING)

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

515
   #define MESH_NUM_Y_POINTS 3
515
   #define MESH_NUM_Y_POINTS 3
516
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
516
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
517
 
517
 
518
+  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
519
+
518
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
520
   //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
519
 
521
 
520
   #if ENABLED(MANUAL_BED_LEVELING)
522
   #if ENABLED(MANUAL_BED_LEVELING)

Loading…
Cancel
Save