|
|
|
@ -69,9 +69,9 @@ volatile long endstops_stepsTotal,endstops_stepsDone;
|
|
|
|
|
static volatile bool endstop_x_hit=false;
|
|
|
|
|
static volatile bool endstop_y_hit=false;
|
|
|
|
|
static volatile bool endstop_z_hit=false;
|
|
|
|
|
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
|
|
|
bool abort_on_endstop_hit = false;
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
|
|
|
bool abort_on_endstop_hit = false;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static bool old_x_min_endstop=false;
|
|
|
|
|
static bool old_x_max_endstop=false;
|
|
|
|
@ -184,20 +184,20 @@ void checkHitEndstops()
|
|
|
|
|
SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/axis_steps_per_unit[Z_AXIS]);
|
|
|
|
|
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT "Z");
|
|
|
|
|
}
|
|
|
|
|
SERIAL_ECHOLN("");
|
|
|
|
|
SERIAL_ECHOLN("");
|
|
|
|
|
endstop_x_hit=false;
|
|
|
|
|
endstop_y_hit=false;
|
|
|
|
|
endstop_z_hit=false;
|
|
|
|
|
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
|
|
|
if (abort_on_endstop_hit)
|
|
|
|
|
{
|
|
|
|
|
endstop_z_hit=false;
|
|
|
|
|
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
|
|
|
if (abort_on_endstop_hit)
|
|
|
|
|
{
|
|
|
|
|
card.sdprinting = false;
|
|
|
|
|
card.closefile();
|
|
|
|
|
quickStop();
|
|
|
|
|
quickStop();
|
|
|
|
|
setTargetHotend0(0);
|
|
|
|
|
setTargetHotend1(0);
|
|
|
|
|
setTargetHotend2(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -879,10 +879,6 @@ void st_init()
|
|
|
|
|
disable_e2();
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef CONTROLLERFAN_PIN
|
|
|
|
|
SET_OUTPUT(CONTROLLERFAN_PIN); //Set pin used for driver cooling fan
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// waveform generation = 0100 = CTC
|
|
|
|
|
TCCR1B &= ~(1<<WGM13);
|
|
|
|
|
TCCR1B |= (1<<WGM12);
|
|
|
|
|