Browse Source

Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical

Fix manual leveling coordinates
Scott Lahteine 8 years ago
parent
commit
0908329d96

+ 1
- 1
Marlin/Configuration.h View File

492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
493
 
493
 
494
 /**
494
 /**
495
- * Defult Jerk (mm/s)
495
+ * Default Jerk (mm/s)
496
  *
496
  *
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
498
  * When changing speed and direction, if the difference is less than the
498
  * When changing speed and direction, if the difference is less than the

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

492
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
492
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
493
 
493
 
494
 /**
494
 /**
495
- * Defult Jerk (mm/s)
495
+ * Default Jerk (mm/s)
496
  *
496
  *
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
498
  * When changing speed and direction, if the difference is less than the
498
  * When changing speed and direction, if the difference is less than the

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

475
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
475
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
476
 
476
 
477
 /**
477
 /**
478
- * Defult Jerk (mm/s)
478
+ * Default Jerk (mm/s)
479
  *
479
  *
480
  * "Jerk" specifies the minimum speed change that requires acceleration.
480
  * "Jerk" specifies the minimum speed change that requires acceleration.
481
  * When changing speed and direction, if the difference is less than the
481
  * When changing speed and direction, if the difference is less than the

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

475
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
475
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
476
 
476
 
477
 /**
477
 /**
478
- * Defult Jerk (mm/s)
478
+ * Default Jerk (mm/s)
479
  *
479
  *
480
  * "Jerk" specifies the minimum speed change that requires acceleration.
480
  * "Jerk" specifies the minimum speed change that requires acceleration.
481
  * When changing speed and direction, if the difference is less than the
481
  * When changing speed and direction, if the difference is less than the

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

484
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
484
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
485
 
485
 
486
 /**
486
 /**
487
- * Defult Jerk (mm/s)
487
+ * Default Jerk (mm/s)
488
  *
488
  *
489
  * "Jerk" specifies the minimum speed change that requires acceleration.
489
  * "Jerk" specifies the minimum speed change that requires acceleration.
490
  * When changing speed and direction, if the difference is less than the
490
  * When changing speed and direction, if the difference is less than the

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

486
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
486
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
487
 
487
 
488
 /**
488
 /**
489
- * Defult Jerk (mm/s)
489
+ * Default Jerk (mm/s)
490
  *
490
  *
491
  * "Jerk" specifies the minimum speed change that requires acceleration.
491
  * "Jerk" specifies the minimum speed change that requires acceleration.
492
  * When changing speed and direction, if the difference is less than the
492
  * When changing speed and direction, if the difference is less than the

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

509
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
509
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
510
 
510
 
511
 /**
511
 /**
512
- * Defult Jerk (mm/s)
512
+ * Default Jerk (mm/s)
513
  *
513
  *
514
  * "Jerk" specifies the minimum speed change that requires acceleration.
514
  * "Jerk" specifies the minimum speed change that requires acceleration.
515
  * When changing speed and direction, if the difference is less than the
515
  * When changing speed and direction, if the difference is less than the

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

492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
493
 
493
 
494
 /**
494
 /**
495
- * Defult Jerk (mm/s)
495
+ * Default Jerk (mm/s)
496
  *
496
  *
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
498
  * When changing speed and direction, if the difference is less than the
498
  * When changing speed and direction, if the difference is less than the

+ 1
- 1
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File

492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
493
 
493
 
494
 /**
494
 /**
495
- * Defult Jerk (mm/s)
495
+ * Default Jerk (mm/s)
496
  *
496
  *
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
498
  * When changing speed and direction, if the difference is less than the
498
  * When changing speed and direction, if the difference is less than the

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

492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
493
 
493
 
494
 /**
494
 /**
495
- * Defult Jerk (mm/s)
495
+ * Default Jerk (mm/s)
496
  *
496
  *
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
498
  * When changing speed and direction, if the difference is less than the
498
  * When changing speed and direction, if the difference is less than the

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

490
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
490
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
491
 
491
 
492
 /**
492
 /**
493
- * Defult Jerk (mm/s)
493
+ * Default Jerk (mm/s)
494
  *
494
  *
495
  * "Jerk" specifies the minimum speed change that requires acceleration.
495
  * "Jerk" specifies the minimum speed change that requires acceleration.
496
  * When changing speed and direction, if the difference is less than the
496
  * When changing speed and direction, if the difference is less than the

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

507
 #define DEFAULT_TRAVEL_ACCELERATION   400    // X, Y, Z acceleration for travel (non printing) moves
507
 #define DEFAULT_TRAVEL_ACCELERATION   400    // X, Y, Z acceleration for travel (non printing) moves
508
 
508
 
509
 /**
509
 /**
510
- * Defult Jerk (mm/s)
510
+ * Default Jerk (mm/s)
511
  *
511
  *
512
  * "Jerk" specifies the minimum speed change that requires acceleration.
512
  * "Jerk" specifies the minimum speed change that requires acceleration.
513
  * When changing speed and direction, if the difference is less than the
513
  * When changing speed and direction, if the difference is less than the

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

513
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
513
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
514
 
514
 
515
 /**
515
 /**
516
- * Defult Jerk (mm/s)
516
+ * Default Jerk (mm/s)
517
  *
517
  *
518
  * "Jerk" specifies the minimum speed change that requires acceleration.
518
  * "Jerk" specifies the minimum speed change that requires acceleration.
519
  * When changing speed and direction, if the difference is less than the
519
  * When changing speed and direction, if the difference is less than the

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

484
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
484
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
485
 
485
 
486
 /**
486
 /**
487
- * Defult Jerk (mm/s)
487
+ * Default Jerk (mm/s)
488
  *
488
  *
489
  * "Jerk" specifies the minimum speed change that requires acceleration.
489
  * "Jerk" specifies the minimum speed change that requires acceleration.
490
  * When changing speed and direction, if the difference is less than the
490
  * When changing speed and direction, if the difference is less than the

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

492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
492
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
493
 
493
 
494
 /**
494
 /**
495
- * Defult Jerk (mm/s)
495
+ * Default Jerk (mm/s)
496
  *
496
  *
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
497
  * "Jerk" specifies the minimum speed change that requires acceleration.
498
  * When changing speed and direction, if the difference is less than the
498
  * When changing speed and direction, if the difference is less than the

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

537
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
537
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
538
 
538
 
539
 /**
539
 /**
540
- * Defult Jerk (mm/s)
540
+ * Default Jerk (mm/s)
541
  *
541
  *
542
  * "Jerk" specifies the minimum speed change that requires acceleration.
542
  * "Jerk" specifies the minimum speed change that requires acceleration.
543
  * When changing speed and direction, if the difference is less than the
543
  * When changing speed and direction, if the difference is less than the

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

537
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
537
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
538
 
538
 
539
 /**
539
 /**
540
- * Defult Jerk (mm/s)
540
+ * Default Jerk (mm/s)
541
  *
541
  *
542
  * "Jerk" specifies the minimum speed change that requires acceleration.
542
  * "Jerk" specifies the minimum speed change that requires acceleration.
543
  * When changing speed and direction, if the difference is less than the
543
  * When changing speed and direction, if the difference is less than the

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

537
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
537
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
538
 
538
 
539
 /**
539
 /**
540
- * Defult Jerk (mm/s)
540
+ * Default Jerk (mm/s)
541
  *
541
  *
542
  * "Jerk" specifies the minimum speed change that requires acceleration.
542
  * "Jerk" specifies the minimum speed change that requires acceleration.
543
  * When changing speed and direction, if the difference is less than the
543
  * When changing speed and direction, if the difference is less than the

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

533
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
533
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
534
 
534
 
535
 /**
535
 /**
536
- * Defult Jerk (mm/s)
536
+ * Default Jerk (mm/s)
537
  *
537
  *
538
  * "Jerk" specifies the minimum speed change that requires acceleration.
538
  * "Jerk" specifies the minimum speed change that requires acceleration.
539
  * When changing speed and direction, if the difference is less than the
539
  * When changing speed and direction, if the difference is less than the

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

543
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
543
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
544
 
544
 
545
 /**
545
 /**
546
- * Defult Jerk (mm/s)
546
+ * Default Jerk (mm/s)
547
  *
547
  *
548
  * "Jerk" specifies the minimum speed change that requires acceleration.
548
  * "Jerk" specifies the minimum speed change that requires acceleration.
549
  * When changing speed and direction, if the difference is less than the
549
  * When changing speed and direction, if the difference is less than the

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

495
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
495
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
496
 
496
 
497
 /**
497
 /**
498
- * Defult Jerk (mm/s)
498
+ * Default Jerk (mm/s)
499
  *
499
  *
500
  * "Jerk" specifies the minimum speed change that requires acceleration.
500
  * "Jerk" specifies the minimum speed change that requires acceleration.
501
  * When changing speed and direction, if the difference is less than the
501
  * When changing speed and direction, if the difference is less than the

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

488
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
488
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
489
 
489
 
490
 /**
490
 /**
491
- * Defult Jerk (mm/s)
491
+ * Default Jerk (mm/s)
492
  *
492
  *
493
  * "Jerk" specifies the minimum speed change that requires acceleration.
493
  * "Jerk" specifies the minimum speed change that requires acceleration.
494
  * When changing speed and direction, if the difference is less than the
494
  * When changing speed and direction, if the difference is less than the

+ 4
- 4
Marlin/ultralcd.cpp View File

1038
     // Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z
1038
     // Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z
1039
     // Z position will be restored with the final action, a G28
1039
     // Z position will be restored with the final action, a G28
1040
     inline void _mbl_goto_xy(float x, float y) {
1040
     inline void _mbl_goto_xy(float x, float y) {
1041
-      current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT;
1041
+      current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT);
1042
       line_to_current(Z_AXIS);
1042
       line_to_current(Z_AXIS);
1043
-      current_position[X_AXIS] = x + home_offset[X_AXIS];
1044
-      current_position[Y_AXIS] = y + home_offset[Y_AXIS];
1043
+      current_position[X_AXIS] = LOGICAL_X_POSITION(x);
1044
+      current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
1045
       line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS);
1045
       line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS);
1046
       #if Z_HOMING_HEIGHT > 0
1046
       #if Z_HOMING_HEIGHT > 0
1047
-        current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; // How do condition and action match?
1047
+        current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
1048
         line_to_current(Z_AXIS);
1048
         line_to_current(Z_AXIS);
1049
       #endif
1049
       #endif
1050
       stepper.synchronize();
1050
       stepper.synchronize();

Loading…
Cancel
Save