bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Enabled separate Z Probe and Z Axis endstop use at same time.

Browse Source 
Typo fixes in comments in existing code.
This commit is contained in:
Chris Roadfeldt
2015-03-28 04:31:51 -05:00
parent b14be7235e
commit 9f3ff14008
4 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Marlin/stepper.cpp
View File

@ -97,6 +97,9 @@ static bool old_x_min_endstop = false,
old_z2_min_endstop = false,
old_z2_max_endstop = false;
#endif
#if defined Z_PROBE_AND_ENDSTOP
old_z_probe_endstop = false;
#endif
static bool check_endstops = true;
@ -520,6 +523,26 @@ ISR(TIMER1_COMPA_vect) {
old_z2_min_endstop = z2_min_endstop;
#endif
#endif
#if defined(Z_PROBE_PIN) && Z_PROBE_PIN > -1
UPDATE_ENDSTOP(z, Z, probe, PROBE);
bool z_probe_endstop(READ(Z_PROBE_PIN) != Z_MIN_ENDSTOP_INVERTING);
if(z_probe_endstop && old_z_probe_endstop)
{
endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
endstop_z_hit=true;
// if (z_probe_endstop && old_z_probe_endstop) SERIAL_ECHOLN("z_probe_endstop = true");
if (!(performing_homing)) //if not performing home
{
step_events_completed = current_block->step_event_count;
}
}
old_z_probe_endstop = z_probe_endstop;
old_z2_probe_endstop = z2_probe_endstop;
#endif
}
}
else { // +direction
@ -554,6 +577,26 @@ ISR(TIMER1_COMPA_vect) {
old_z2_max_endstop = z2_max_endstop;
#endif
#endif
#if defined(Z_PROBE_PIN) && Z_PROBE_PIN > -1
UPDATE_ENDSTOP(z, Z, probe, PROBE);
bool z_probe_endstop(READ(Z_PROBE_PIN) != Z_MAX_ENDSTOP_INVERTING);
if(z_probe_endstop && old_z_probe_endstop)
{
endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
endstop_z_hit=true;
// if (z_probe_endstop && old_z_probe_endstop) SERIAL_ECHOLN("z_probe_endstop = true");
if (!(performing_homing)) //if not performing home
{
step_events_completed = current_block->step_event_count;
}
}
old_z_probe_endstop = z_probe_endstop;
old_z2_probe_endstop = z2_probe_endstop;
#endif
}
}
@ -635,7 +678,7 @@ ISR(TIMER1_COMPA_vect) {
step_events_completed++;
if (step_events_completed >= current_block->step_event_count) break;
}
// Calculare new timer value
// Calculate new timer value
unsigned short timer;
unsigned short step_rate;
if (step_events_completed <= (unsigned long int)current_block->accelerate_until) {
@ -918,6 +961,13 @@ void st_init() {
#endif
#endif
#if defined(Z_PROBE_PIN) && Z_PROBE_PIN >= 0
SET_INPUT(Z_PROBE_PIN);
#ifdef ENDSTOPPULLUP_ZPROBE
WRITE(Z_PROBE_PIN,HIGH);
#endif
#endif
#define AXIS_INIT(axis, AXIS, PIN) \
AXIS ##_STEP_INIT; \
AXIS ##_STEP_WRITE(INVERT_## PIN ##_STEP_PIN); \