|
@@ -69,9 +69,9 @@ volatile long endstops_stepsTotal,endstops_stepsDone;
|
69
|
69
|
static volatile bool endstop_x_hit=false;
|
70
|
70
|
static volatile bool endstop_y_hit=false;
|
71
|
71
|
static volatile bool endstop_z_hit=false;
|
72
|
|
-#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
73
|
|
-bool abort_on_endstop_hit = false;
|
74
|
|
-#endif
|
|
72
|
+#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
73
|
+bool abort_on_endstop_hit = false;
|
|
74
|
+#endif
|
75
|
75
|
|
76
|
76
|
static bool old_x_min_endstop=false;
|
77
|
77
|
static bool old_x_max_endstop=false;
|
|
@@ -184,20 +184,20 @@ void checkHitEndstops()
|
184
|
184
|
SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/axis_steps_per_unit[Z_AXIS]);
|
185
|
185
|
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT "Z");
|
186
|
186
|
}
|
187
|
|
- SERIAL_ECHOLN("");
|
|
187
|
+ SERIAL_ECHOLN("");
|
188
|
188
|
endstop_x_hit=false;
|
189
|
189
|
endstop_y_hit=false;
|
190
|
|
- endstop_z_hit=false;
|
191
|
|
-#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
192
|
|
- if (abort_on_endstop_hit)
|
193
|
|
- {
|
|
190
|
+ endstop_z_hit=false;
|
|
191
|
+#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
192
|
+ if (abort_on_endstop_hit)
|
|
193
|
+ {
|
194
|
194
|
card.sdprinting = false;
|
195
|
195
|
card.closefile();
|
196
|
|
- quickStop();
|
|
196
|
+ quickStop();
|
197
|
197
|
setTargetHotend0(0);
|
198
|
198
|
setTargetHotend1(0);
|
199
|
199
|
setTargetHotend2(0);
|
200
|
|
- }
|
|
200
|
+ }
|
201
|
201
|
#endif
|
202
|
202
|
}
|
203
|
203
|
}
|
|
@@ -879,10 +879,6 @@ void st_init()
|
879
|
879
|
disable_e2();
|
880
|
880
|
#endif
|
881
|
881
|
|
882
|
|
- #ifdef CONTROLLERFAN_PIN
|
883
|
|
- SET_OUTPUT(CONTROLLERFAN_PIN); //Set pin used for driver cooling fan
|
884
|
|
- #endif
|
885
|
|
-
|
886
|
882
|
// waveform generation = 0100 = CTC
|
887
|
883
|
TCCR1B &= ~(1<<WGM13);
|
888
|
884
|
TCCR1B |= (1<<WGM12);
|