diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-03-08 23:29:10 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-03-08 23:29:10 +0300 |
| commit | d6c387ceb68cc7b56eb371834b5698a702acb3f4 (patch) | |
| tree | 769b97e210bb500889f0072b3de7e07a3848848d /src/Endstops/ZProbe.h | |
| parent | 8586a96c969594bd31cc9b2275e54b41e179a74b (diff) | |
Z probe changes and per-tool M208 changes
M208 is now configured and reported per tool instead of globally
Partial refactoring to support multiple Z probes, including new P
parameter to M401 and m402
Diffstat (limited to 'src/Endstops/ZProbe.h')
| -rw-r--r-- | src/Endstops/ZProbe.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Endstops/ZProbe.h b/src/Endstops/ZProbe.h index 9d43476e..363ac91e 100644 --- a/src/Endstops/ZProbe.h +++ b/src/Endstops/ZProbe.h @@ -49,14 +49,15 @@ public: bool GetSaveToConfigOverride() const noexcept { return misc.parts.saveToConfigOverride; } int GetAdcValue() const noexcept { return adcValue; } unsigned int GetMaxTaps() const { return misc.parts.maxTaps; } - void SetProbingAway(const bool probingAway) noexcept { misc.parts.probingAway = probingAway; } - int GetReading() const noexcept; int GetSecondaryValues(int& v1) const noexcept; + bool IsDeployedByUser() const noexcept { return isDeployedByUser; } + void SetProbingAway(const bool probingAway) noexcept { misc.parts.probingAway = probingAway; } GCodeResult HandleG31(GCodeBuffer& gb, const StringRef& reply) THROWS_GCODE_EXCEPTION; void SetTriggerHeight(float height) noexcept { triggerHeight = height; } void SetSaveToConfigOverride() noexcept { misc.parts.saveToConfigOverride = true; } + void SetDeployedByUser(bool b) noexcept { isDeployedByUser = b; } #if HAS_MASS_STORAGE bool WriteParameters(FileStore *f, unsigned int probeNumber) const noexcept; @@ -93,6 +94,8 @@ protected: float travelSpeed; // the speed at which we travel to the probe point float recoveryTime; // Z probe recovery time float tolerance; // maximum difference between probe heights when doing >1 taps + + bool isDeployedByUser; // true if the user has used the M401 command to deploy this probe and not sent M402 to retract it }; // MotorStall Z probes have no port, also in a CAN environment the local and remote proxy versions are the same |