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

Merge pull request #3597 from thinkyhead/rc_fix_g29_debug

Browse Source 
Move G29 debug output before matrix.set_to_identity()
This commit is contained in:
Scott Lahteine 2016-04-22 21:21:00 -07:00
commit 2bb56ef6de
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/Marlin_main.cpp
View File

@ -3196,14 +3196,7 @@ inline void gcode_G28() {
if (!dryrun) { if (!dryrun) {
// make sure the bed_level_rotation_matrix is identity or the planner will get it wrong #if ENABLED(DEBUG_LEVELING_FEATURE) && DISABLED(DELTA)
plan_bed_level_matrix.set_to_identity();
#if ENABLED(DELTA)
reset_bed_level();
#else //!DELTA
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
vector_3 corrected_position = plan_get_position(); vector_3 corrected_position = plan_get_position();
DEBUG_POS("BEFORE matrix.set_to_identity", corrected_position); DEBUG_POS("BEFORE matrix.set_to_identity", corrected_position);
@ -3211,6 +3204,13 @@ inline void gcode_G28() {
} }
#endif #endif
// make sure the bed_level_rotation_matrix is identity or the planner will get it wrong
plan_bed_level_matrix.set_to_identity();
#if ENABLED(DELTA)
reset_bed_level();
#else //!DELTA
//vector_3 corrected_position = plan_get_position(); //vector_3 corrected_position = plan_get_position();
//corrected_position.debug("position before G29"); //corrected_position.debug("position before G29");
vector_3 uncorrected_position = plan_get_position(); vector_3 uncorrected_position = plan_get_position();