MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync and report changed position

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-10 20:49:45 -06:00
parent ccca1ade2d
commit 684692091e
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/Marlin_main.cpp
View File

@ -2469,6 +2469,8 @@ static void clean_up_after_endstop_or_probe_move() {
// so compensation will give the right stepper counts. // so compensation will give the right stepper counts.
planner.unapply_leveling(current_position); planner.unapply_leveling(current_position);
SYNC_PLAN_POSITION_KINEMATIC();
#endif // ABL #endif // ABL
} }
} }
@ -2488,6 +2490,10 @@ static void clean_up_after_endstop_or_probe_move() {
planner.set_z_fade_height(zfh); planner.set_z_fade_height(zfh);
if (level_active) { if (level_active) {
const float oldpos[XYZE] = {
current_position[X_AXIS], current_position[Y_AXIS],
current_position[Z_AXIS], current_position[E_AXIS]
};
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
set_bed_leveling_enabled(true); // turn back on after changing fade height set_bed_leveling_enabled(true); // turn back on after changing fade height
#else #else
@ -2498,8 +2504,10 @@ static void clean_up_after_endstop_or_probe_move() {
Z_AXIS Z_AXIS
#endif #endif
); );
SYNC_PLAN_POSITION_KINEMATIC();
#endif #endif
if (do_report) report_current_position(); if (do_report && memcmp(oldpos, current_position, sizeof(oldpos)))
report_current_position();
} }
} }
@ -4628,6 +4636,7 @@ void home_all_axes() { gcode_G28(true); }
bed_level_virt_interpolate(); bed_level_virt_interpolate();
#endif #endif
set_bed_leveling_enabled(abl_should_enable); set_bed_leveling_enabled(abl_should_enable);
report_current_position();
} }
return; return;
} // parser.seen('W') } // parser.seen('W')
@ -9671,7 +9680,7 @@ void quickstop_stepper() {
set_bed_leveling_enabled(to_enable); set_bed_leveling_enabled(to_enable);
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
if (parser.seen('Z')) set_z_fade_height(parser.value_linear_units()); if (parser.seen('Z')) set_z_fade_height(parser.value_linear_units(), false);
#endif #endif
const bool new_status = planner.leveling_active; const bool new_status = planner.leveling_active;
@ -12394,6 +12403,12 @@ void get_cartesian_from_steppers() {
* Set the current_position for an axis based on * Set the current_position for an axis based on
* the stepper positions, removing any leveling that * the stepper positions, removing any leveling that
* may have been applied. * may have been applied.
*
* To prevent small shifts in axis position always call
* SYNC_PLAN_POSITION_KINEMATIC after updating axes with this.
*
* To keep hosts in sync, always call report_current_position
* after updating the current_position.
*/ */
void set_current_from_steppers_for_axis(const AxisEnum axis) { void set_current_from_steppers_for_axis(const AxisEnum axis) {
get_cartesian_from_steppers(); get_cartesian_from_steppers();

4
Marlin/ubl.cpp
View File

@ -67,17 +67,19 @@
volatile int unified_bed_leveling::encoder_diff; volatile int unified_bed_leveling::encoder_diff;
unified_bed_leveling::unified_bed_leveling() { unified_bed_leveling::unified_bed_leveling() {
ubl_cnt++; // Debug counter to insure we only have one UBL object present in memory. We can eliminate this (and all references to ubl_cnt) very soon. ubl_cnt++; // Debug counter to ensure we only have one UBL object present in memory. We can eliminate this (and all references to ubl_cnt) very soon.
reset(); reset();
} }
void unified_bed_leveling::reset() { void unified_bed_leveling::reset() {
const bool was_enabled = planner.leveling_active;
set_bed_leveling_enabled(false); set_bed_leveling_enabled(false);
storage_slot = -1; storage_slot = -1;
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
planner.set_z_fade_height(10.0); planner.set_z_fade_height(10.0);
#endif #endif
ZERO(z_values); ZERO(z_values);
if (was_enabled) report_current_position();
} }
void unified_bed_leveling::invalidate() { void unified_bed_leveling::invalidate() {