diff options
author | David Crocker <dcrocker@eschertech.com> | 2019-05-15 14:02:42 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2019-05-15 14:02:42 +0300 |
commit | eec350695520a49e443689b2dd776ffad81e3167 (patch) | |
tree | fe17ec28ddd6495dd831b1b44eae4e0988a3d50d /src/Endstops/EndstopsManager.h | |
parent | 4dd972d2c0f37d60691da1e2258da0b727d7ec4e (diff) |
Various
Changed to get it building again after merge
Fixed issue with G1 H3 moves and M585 moves that use endstop switches
Diffstat (limited to 'src/Endstops/EndstopsManager.h')
-rw-r--r-- | src/Endstops/EndstopsManager.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Endstops/EndstopsManager.h b/src/Endstops/EndstopsManager.h index 3eecc28a..55a31964 100644 --- a/src/Endstops/EndstopsManager.h +++ b/src/Endstops/EndstopsManager.h @@ -22,7 +22,7 @@ public: void Init(); // Set up the active endstop list according to the axes commanded to move in a G0/G1 S1/S3 command - void EnableAxisEndstops(AxesBitmap axes); + void EnableAxisEndstops(AxesBitmap axes, bool forHoming); // Set up the active endstops for Z probing void EnableZProbe(size_t probeNumber); @@ -66,13 +66,15 @@ private: // Translate end stop result to text static const char *TranslateEndStopResult(EndStopHit es, bool atHighEnd); - EndstopOrZProbe * volatile activeEndstops; // linked list of endstops and Z probes that are active for the current move + EndstopOrZProbe * volatile activeEndstops; // linked list of endstops and Z probes that are active for the current move size_t currentZProbeNumber; // which Z probe we are using Endstop *axisEndstops[MaxAxes]; // the endstops assigned to each axis (each one may have several switches), each may be null ZProbe *zProbes[MaxZProbes]; // the Z probes used. The first one is always non-null. ZProbeProgrammer zProbeProg; + + bool isHomingMove; // true if calls to CheckEndstops are for the purpose of homing }; #endif /* SRC_ENDSTOPS_ENDSTOPMANAGER_H_ */ |