josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug

This commit is contained in:
PavelSindler 2018-02-28 11:09:34 +01:00
parent 0d1cafded5
commit 98f0efbc66
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration_prusa.h
View File

@ -468,6 +468,6 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#define M600_TIMEOUT 600 //seconds #define M600_TIMEOUT 600 //seconds
//#define SUPPORT_VERBOSITY #define SUPPORT_VERBOSITY
#endif //__CONFIGURATION_PRUSA_H #endif //__CONFIGURATION_PRUSA_H

14
Firmware/mesh_bed_calibration.cpp
View File

@ -983,6 +983,10 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level)
SERIAL_ECHO("; Z: "); SERIAL_ECHO("; Z: ");
MYSERIAL.println(current_position[Z_AXIS]); MYSERIAL.println(current_position[Z_AXIS]);
lcd_show_fullscreen_message_and_wait_P(PSTR("First hit"));
lcd_update_enable(true);
//scan //scan
//if (current_position[X_AXIS] > 100 && current_position[Y_AXIS] > 100) { //if (current_position[X_AXIS] > 100 && current_position[Y_AXIS] > 100) {
// scan(); // scan();
@ -1011,6 +1015,8 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level)
found = false; found = false;
for (i = 0, dir_positive = true; i < (nsteps_y - 1); current_position[Y_AXIS] += (y1 - y0) / float(nsteps_y - 1), ++ i, dir_positive = ! dir_positive) { for (i = 0, dir_positive = true; i < (nsteps_y - 1); current_position[Y_AXIS] += (y1 - y0) / float(nsteps_y - 1), ++ i, dir_positive = ! dir_positive) {
go_xy(dir_positive ? x1 : x0, current_position[Y_AXIS], feedrate); go_xy(dir_positive ? x1 : x0, current_position[Y_AXIS], feedrate);
SERIAL_ECHOPGM("current position Z: ");
MYSERIAL.println(current_position[Z_AXIS]);
if (endstop_z_hit_on_purpose()) { if (endstop_z_hit_on_purpose()) {
found = true; found = true;
break; break;
@ -1018,7 +1024,7 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level)
} }
update_current_position_xyz(); update_current_position_xyz();
if (! found) { if (! found) {
// SERIAL_ECHOLN("Search in Y - not found"); SERIAL_ECHOLN("Search in Y - not found");
continue; continue;
} }
// SERIAL_ECHOLN("Search in Y - found"); // SERIAL_ECHOLN("Search in Y - found");
@ -1031,14 +1037,16 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level)
found = false; found = false;
for (i = 0, dir_positive = true; i < (nsteps_y - 1); current_position[Y_AXIS] -= (y1 - y0) / float(nsteps_y - 1), ++ i, dir_positive = ! dir_positive) { for (i = 0, dir_positive = true; i < (nsteps_y - 1); current_position[Y_AXIS] -= (y1 - y0) / float(nsteps_y - 1), ++ i, dir_positive = ! dir_positive) {
go_xy(dir_positive ? x1 : x0, current_position[Y_AXIS], feedrate); go_xy(dir_positive ? x1 : x0, current_position[Y_AXIS], feedrate);
if (endstop_z_hit_on_purpose()) { SERIAL_ECHOPGM("current position Z: ");
MYSERIAL.println(current_position[Z_AXIS]);
if (endstop_z_hit_on_purpose()) {
found = true; found = true;
break; break;
} }
} }
update_current_position_xyz(); update_current_position_xyz();
if (! found) { if (! found) {
// SERIAL_ECHOLN("Search in Y2 - not found"); SERIAL_ECHOLN("Search in Y2 - not found");
continue; continue;
} }
// SERIAL_ECHOLN("Search in Y2 - found"); // SERIAL_ECHOLN("Search in Y2 - found");