Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2020-01-18 18:21:02 +0300
committerDavid Crocker <dcrocker@eschertech.com>2020-01-18 18:21:02 +0300
commite0bbf71357b07c22e6d43be3cca5c7422163be32 (patch)
treeca83dbb87348e51c735b106900b69142f5c058f5 /src/Endstops/ZProbe.h
parentd577af1d5874392d28c65427afbf4006f8a6d521 (diff)
Lock ZProbes when accessing them and added more items to OM
Diffstat (limited to 'src/Endstops/ZProbe.h')
-rw-r--r--src/Endstops/ZProbe.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Endstops/ZProbe.h b/src/Endstops/ZProbe.h
index 0e2b6801..364cd6bd 100644
--- a/src/Endstops/ZProbe.h
+++ b/src/Endstops/ZProbe.h
@@ -47,7 +47,7 @@ public:
void SetProbingAway(const bool probingAway) noexcept { misc.parts.probingAway = probingAway; }
int GetReading() const noexcept;
- int GetSecondaryValues(int& v1, int& v2) noexcept;
+ int GetSecondaryValues(int& v1) const noexcept;
GCodeResult HandleG31(GCodeBuffer& gb, const StringRef& reply) THROWS_GCODE_EXCEPTION;
void SetTriggerHeight(float height) noexcept { triggerHeight = height; }
@@ -60,6 +60,10 @@ public:
static constexpr unsigned int MaxTapsLimit = 31; // must be low enough to fit in the maxTaps field
protected:
+ DECLARE_OBJECT_MODEL
+ OBJECT_MODEL_ARRAY(offsets)
+ OBJECT_MODEL_ARRAY(value)
+
uint8_t number;
ZProbeType type;
int8_t sensor; // the sensor number used for temperature calibration