Merge pull request #8745 from thinkyhead/bf1_sync_M420_M852
[1.1.x] M852 skew changes position. And, position change reporting.
This commit is contained in:
commit
db204c13f2
@ -373,7 +373,7 @@ void report_current_position();
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||||
void set_z_fade_height(const float zfh);
|
void set_z_fade_height(const float zfh, const bool do_report=true);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(X_DUAL_ENDSTOPS)
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
||||||
|
@ -340,11 +340,6 @@
|
|||||||
#include "ubl.h"
|
#include "ubl.h"
|
||||||
extern bool defer_return_to_status;
|
extern bool defer_return_to_status;
|
||||||
unified_bed_leveling ubl;
|
unified_bed_leveling ubl;
|
||||||
#define UBL_MESH_VALID !( ( ubl.z_values[0][0] == ubl.z_values[0][1] && ubl.z_values[0][1] == ubl.z_values[0][2] \
|
|
||||||
&& ubl.z_values[1][0] == ubl.z_values[1][1] && ubl.z_values[1][1] == ubl.z_values[1][2] \
|
|
||||||
&& ubl.z_values[2][0] == ubl.z_values[2][1] && ubl.z_values[2][1] == ubl.z_values[2][2] \
|
|
||||||
&& ubl.z_values[0][0] == 0 && ubl.z_values[1][0] == 0 && ubl.z_values[2][0] == 0 ) \
|
|
||||||
|| isnan(ubl.z_values[0][0]))
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
||||||
@ -2469,13 +2464,17 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||||
|
|
||||||
void set_z_fade_height(const float zfh) {
|
void set_z_fade_height(const float zfh, const bool do_report/*=true*/) {
|
||||||
|
|
||||||
|
if (planner.z_fade_height == zfh) return; // do nothing if no change
|
||||||
|
|
||||||
const bool level_active = planner.leveling_active;
|
const bool level_active = planner.leveling_active;
|
||||||
|
|
||||||
@ -2486,6 +2485,7 @@ 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[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_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
|
||||||
@ -2496,7 +2496,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 && memcmp(oldpos, current_position, sizeof(oldpos)))
|
||||||
|
report_current_position();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4625,6 +4628,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')
|
||||||
@ -9604,6 +9608,8 @@ void quickstop_stepper() {
|
|||||||
*/
|
*/
|
||||||
inline void gcode_M420() {
|
inline void gcode_M420() {
|
||||||
|
|
||||||
|
const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] };
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
// L to load a mesh from the EEPROM
|
// L to load a mesh from the EEPROM
|
||||||
@ -9638,7 +9644,7 @@ void quickstop_stepper() {
|
|||||||
// L to load a mesh from the EEPROM
|
// L to load a mesh from the EEPROM
|
||||||
if (parser.seen('L') || parser.seen('V')) {
|
if (parser.seen('L') || parser.seen('V')) {
|
||||||
ubl.display_map(0); // Currently only supports one map type
|
ubl.display_map(0); // Currently only supports one map type
|
||||||
SERIAL_ECHOLNPAIR("UBL_MESH_VALID = ", UBL_MESH_VALID);
|
SERIAL_ECHOLNPAIR("ubl.mesh_is_valid = ", ubl.mesh_is_valid());
|
||||||
SERIAL_ECHOLNPAIR("ubl.storage_slot = ", ubl.storage_slot);
|
SERIAL_ECHOLNPAIR("ubl.storage_slot = ", ubl.storage_slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9663,14 +9669,16 @@ void quickstop_stepper() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool to_enable = parser.boolval('S');
|
|
||||||
if (parser.seen('S'))
|
|
||||||
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
|
||||||
|
|
||||||
|
bool to_enable = false;
|
||||||
|
if (parser.seen('S')) {
|
||||||
|
to_enable = parser.value_bool();
|
||||||
|
set_bed_leveling_enabled(to_enable);
|
||||||
|
}
|
||||||
|
|
||||||
const bool new_status = planner.leveling_active;
|
const bool new_status = planner.leveling_active;
|
||||||
|
|
||||||
if (to_enable && !new_status) {
|
if (to_enable && !new_status) {
|
||||||
@ -9689,6 +9697,10 @@ void quickstop_stepper() {
|
|||||||
else
|
else
|
||||||
SERIAL_ECHOLNPGM(MSG_OFF);
|
SERIAL_ECHOLNPGM(MSG_OFF);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Report change in position
|
||||||
|
if (memcmp(oldpos, current_position, sizeof(oldpos)))
|
||||||
|
report_current_position();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -9902,37 +9914,47 @@ inline void gcode_M502() {
|
|||||||
* K[yz_factor] - New YZ skew factor
|
* K[yz_factor] - New YZ skew factor
|
||||||
*/
|
*/
|
||||||
inline void gcode_M852() {
|
inline void gcode_M852() {
|
||||||
const bool ijk = parser.seen('I') || parser.seen('S')
|
uint8_t ijk = 0, badval = 0, setval = 0;
|
||||||
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
|
||||||
|| parser.seen('J') || parser.seen('K')
|
|
||||||
#endif
|
|
||||||
;
|
|
||||||
bool badval = false;
|
|
||||||
|
|
||||||
if (parser.seen('I') || parser.seen('S')) {
|
if (parser.seen('I') || parser.seen('S')) {
|
||||||
|
++ijk;
|
||||||
const float value = parser.value_linear_units();
|
const float value = parser.value_linear_units();
|
||||||
if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX))
|
if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
|
||||||
|
if (planner.xy_skew_factor != value) {
|
||||||
planner.xy_skew_factor = value;
|
planner.xy_skew_factor = value;
|
||||||
|
++setval;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
badval = true;
|
++badval;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
||||||
|
|
||||||
if (parser.seen('J')) {
|
if (parser.seen('J')) {
|
||||||
|
++ijk;
|
||||||
const float value = parser.value_linear_units();
|
const float value = parser.value_linear_units();
|
||||||
if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX))
|
if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
|
||||||
|
if (planner.xz_skew_factor != value) {
|
||||||
planner.xz_skew_factor = value;
|
planner.xz_skew_factor = value;
|
||||||
|
++setval;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
badval = true;
|
++badval;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parser.seen('K')) {
|
if (parser.seen('K')) {
|
||||||
|
++ijk;
|
||||||
const float value = parser.value_linear_units();
|
const float value = parser.value_linear_units();
|
||||||
if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX))
|
if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
|
||||||
|
if (planner.yz_skew_factor != value) {
|
||||||
planner.yz_skew_factor = value;
|
planner.yz_skew_factor = value;
|
||||||
|
++setval;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
badval = true;
|
++badval;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@ -9940,6 +9962,13 @@ inline void gcode_M502() {
|
|||||||
if (badval)
|
if (badval)
|
||||||
SERIAL_ECHOLNPGM(MSG_SKEW_MIN " " STRINGIFY(SKEW_FACTOR_MIN) " " MSG_SKEW_MAX " " STRINGIFY(SKEW_FACTOR_MAX));
|
SERIAL_ECHOLNPGM(MSG_SKEW_MIN " " STRINGIFY(SKEW_FACTOR_MIN) " " MSG_SKEW_MAX " " STRINGIFY(SKEW_FACTOR_MAX));
|
||||||
|
|
||||||
|
// When skew is changed the current position changes
|
||||||
|
if (setval) {
|
||||||
|
set_current_from_steppers_for_axis(ALL_AXES);
|
||||||
|
SYNC_PLAN_POSITION_KINEMATIC();
|
||||||
|
report_current_position();
|
||||||
|
}
|
||||||
|
|
||||||
if (!ijk) {
|
if (!ijk) {
|
||||||
SERIAL_ECHO_START();
|
SERIAL_ECHO_START();
|
||||||
SERIAL_ECHOPAIR(MSG_SKEW_FACTOR " XY: ", planner.xy_skew_factor);
|
SERIAL_ECHOPAIR(MSG_SKEW_FACTOR " XY: ", planner.xy_skew_factor);
|
||||||
@ -12391,6 +12420,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();
|
||||||
|
@ -215,14 +215,12 @@ MarlinSettings settings;
|
|||||||
float new_z_fade_height;
|
float new_z_fade_height;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
|
||||||
bool position_changed;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Post-process after Retrieve or Reset
|
* Post-process after Retrieve or Reset
|
||||||
*/
|
*/
|
||||||
void MarlinSettings::postprocess() {
|
void MarlinSettings::postprocess() {
|
||||||
|
const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] };
|
||||||
|
|
||||||
// steps per s2 needs to be updated to agree with units per s2
|
// steps per s2 needs to be updated to agree with units per s2
|
||||||
planner.reset_acceleration_rates();
|
planner.reset_acceleration_rates();
|
||||||
|
|
||||||
@ -232,10 +230,6 @@ void MarlinSettings::postprocess() {
|
|||||||
recalc_delta_settings();
|
recalc_delta_settings();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
|
|
||||||
// and init stepper.count[], planner.position[] with current_position
|
|
||||||
planner.refresh_positioning();
|
|
||||||
|
|
||||||
#if ENABLED(PIDTEMP)
|
#if ENABLED(PIDTEMP)
|
||||||
thermalManager.updatePID();
|
thermalManager.updatePID();
|
||||||
#endif
|
#endif
|
||||||
@ -248,7 +242,7 @@ void MarlinSettings::postprocess() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||||
set_z_fade_height(new_z_fade_height);
|
set_z_fade_height(new_z_fade_height, false); // false = no report
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
@ -260,12 +254,13 @@ void MarlinSettings::postprocess() {
|
|||||||
stepper.refresh_motor_power();
|
stepper.refresh_motor_power();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
// Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
|
||||||
if (position_changed) {
|
// and init stepper.count[], planner.position[] with current_position
|
||||||
|
planner.refresh_positioning();
|
||||||
|
|
||||||
|
// Various factors can change the current position
|
||||||
|
if (memcmp(oldpos, current_position, sizeof(oldpos)))
|
||||||
report_current_position();
|
report_current_position();
|
||||||
position_changed = false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(EEPROM_SETTINGS)
|
#if ENABLED(EEPROM_SETTINGS)
|
||||||
@ -1121,7 +1116,7 @@ void MarlinSettings::postprocess() {
|
|||||||
//
|
//
|
||||||
|
|
||||||
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
||||||
position_changed = select_coordinate_system(-1); // Go back to machine space
|
(void)select_coordinate_system(-1); // Go back to machine space
|
||||||
EEPROM_READ(coordinate_system); // 27 floats
|
EEPROM_READ(coordinate_system); // 27 floats
|
||||||
#else
|
#else
|
||||||
for (uint8_t q = 27; q--;) EEPROM_READ(dummy);
|
for (uint8_t q = 27; q--;) EEPROM_READ(dummy);
|
||||||
|
@ -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() {
|
||||||
|
Loading…
Reference in New Issue
Block a user