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

🎨 Misc. cleanup, comments

Browse Source
This commit is contained in:
Scott Lahteine
2022-01-06 05:07:47 -06:00
committed by Scott Lahteine
parent 2690bb1bc2
commit d7b7b570c7
10 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/module/endstops.cpp
View File

@ -593,9 +593,6 @@ void _O2 Endstops::report_states() {
} // Endstops::report_states
// The following routines are called from an ISR context. It could be the temperature ISR, the
// endstop ISR or the Stepper ISR.
#if HAS_DELTA_SENSORLESS_PROBING
#define __ENDSTOP(AXIS, ...) AXIS ##_MAX
#define _ENDSTOP_PIN(AXIS, ...) AXIS ##_MAX_PIN
@ -607,13 +604,18 @@ void _O2 Endstops::report_states() {
#endif
#define _ENDSTOP(AXIS, MINMAX) __ENDSTOP(AXIS, MINMAX)
// Check endstops - Could be called from Temperature ISR!
/**
* Called from interrupt context by the Endstop ISR or Stepper ISR!
* Read endstops to get their current states, register hits for all
* axes moving in the direction of their endstops, and abort moves.
*/
void Endstops::update() {
#if !ENDSTOP_NOISE_THRESHOLD
if (!abort_enabled()) return;
#if !ENDSTOP_NOISE_THRESHOLD // If not debouncing...
if (!abort_enabled()) return; // ...and not enabled, exit.
#endif
// Macros to update / copy the live_state
#define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
#define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
@ -1107,6 +1109,7 @@ void Endstops::update() {
#if ENABLED(SPI_ENDSTOPS)
// Called from idle() to read Trinamic stall states
bool Endstops::tmc_spi_homing_check() {
bool hit = false;
#if X_SPI_SENSORLESS

10
Marlin/src/module/stepper.cpp
View File

@ -2346,13 +2346,9 @@ uint32_t Stepper::block_phase_isr() {
#endif
#endif // LASER_POWER_INLINE
// At this point, we must ensure the movement about to execute isn't
// trying to force the head against a limit switch. If using interrupt-
// driven change detection, and already against a limit then no call to
// the endstop_triggered method will be done and the movement will be
// done against the endstop. So, check the limits here: If the movement
// is against the limits, the block will be marked as to be killed, and
// on the next call to this ISR, will be discarded.
// If the endstop is already pressed, endstop interrupts won't invoke
// endstop_triggered and the move will grind. So check here for a
// triggered endstop, which marks the block for discard on the next ISR.
endstops.update();
#if ENABLED(Z_LATE_ENABLE)