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

Merge pull request #535 from PavelSindler/x_axis_fix

Browse Source 
Dont use homing currents in axis selftest
This commit is contained in:
XPila 2018-03-07 20:46:34 +01:00 committed by GitHub
commit fb5b7e9f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/ultralcd.cpp
View File

@ -6057,14 +6057,12 @@ static bool lcd_selfcheck_axis_sg(char axis) {
} }
// first axis length measurement begin // first axis length measurement begin
tmc2130_home_enter(X_AXIS_MASK << axis);
current_position[axis] -= (axis_length + margin); current_position[axis] -= (axis_length + margin);
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder);
st_synchronize(); st_synchronize();
tmc2130_home_exit();
tmc2130_sg_meassure_start(axis); tmc2130_sg_meassure_start(axis);
@ -6077,9 +6075,7 @@ static bool lcd_selfcheck_axis_sg(char axis) {
current_position[axis] += axis_length; current_position[axis] += axis_length;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder);
tmc2130_home_enter(X_AXIS_MASK << axis);
st_synchronize(); st_synchronize();
tmc2130_home_exit();
uint16_t sg1 = tmc2130_sg_meassure_stop(); uint16_t sg1 = tmc2130_sg_meassure_stop();
printf_P(PSTR("%c AXIS SG1=%d\n"), 'X'+axis, sg1); printf_P(PSTR("%c AXIS SG1=%d\n"), 'X'+axis, sg1);
@ -6096,12 +6092,10 @@ static bool lcd_selfcheck_axis_sg(char axis) {
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder);
st_synchronize(); st_synchronize();
tmc2130_home_enter(X_AXIS_MASK << axis);
current_position[axis] -= (axis_length + margin); current_position[axis] -= (axis_length + margin);
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder);
st_synchronize(); st_synchronize();
tmc2130_home_exit();
current_position_init = st_get_position_mm(axis); current_position_init = st_get_position_mm(axis);
@ -6109,7 +6103,7 @@ static bool lcd_selfcheck_axis_sg(char axis) {
//end of second measurement, now check for possible errors: //end of second measurement, now check for possible errors:
for(int i = 0; i < 2; i++){ //check if measured axis length corresponds to expected length for(int i = 0; i < 2; i++){ //check if measured axis length corresponds to expected length
SERIAL_ECHOPGM("Measured axis length:"); SERIAL_ECHOPGM("Measured axis length:");
MYSERIAL.println(measured_axis_length[i]); MYSERIAL.println(measured_axis_length[i]);