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

MK2.x: move away from endstops after lcd_selfcheck_pulleys() (#2617)

Browse source 
* Removed duplicate #defines
cleaned up display routine

* Change to raise_z_above()

* Better display handling

* Ditch charswitch, show ... for measuring

* Pull in changes from #5

* Fix printf()s

* revert feedrates

* typo

* MK2.x: move away from endstops after lcd_selfcheck_pulleys()


amend

* Use absolute coordinates

Co-authored-by: vintagepc <53943260+vintagepc@users.noreply.github.com>
This commit is contained in:
Alex Voinea 2020-04-20 10:55:14 +03:00 committed by GitHub
parent 32fa7b5496
commit 8ef87d76ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Firmware/ultralcd.cpp
View file

@ -7705,8 +7705,8 @@ bool lcd_selftest()
//homeaxis(X_AXIS); //homeaxis(X_AXIS);
//homeaxis(Y_AXIS); //homeaxis(Y_AXIS);
current_position[X_AXIS] += pgm_read_float(bed_ref_points_4); current_position[X_AXIS] = pgm_read_float(bed_ref_points_4);
current_position[Y_AXIS] += pgm_read_float(bed_ref_points_4+1); current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4+1);
#ifdef TMC2130 #ifdef TMC2130
//current_position[X_AXIS] += 0; //current_position[X_AXIS] += 0;
current_position[Y_AXIS] += 4; current_position[Y_AXIS] += 4;
@ -8099,6 +8099,9 @@ static bool lcd_selfcheck_pulleys(int axis)
((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1)) { ((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1)) {
endstop_triggered = true; endstop_triggered = true;
if (current_position_init - 1 <= current_position[axis] && current_position_init + 1 >= current_position[axis]) { if (current_position_init - 1 <= current_position[axis] && current_position_init + 1 >= current_position[axis]) {
current_position[axis] += 10;
plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder);
st_synchronize();
return(true); return(true);
} }
else { else {