diff options
author | David Crocker <dcrocker@eschertech.com> | 2020-01-18 18:21:02 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2020-01-18 18:21:02 +0300 |
commit | e0bbf71357b07c22e6d43be3cca5c7422163be32 (patch) | |
tree | ca83dbb87348e51c735b106900b69142f5c058f5 /src/Endstops/Endstop.h | |
parent | d577af1d5874392d28c65427afbf4006f8a6d521 (diff) |
Lock ZProbes when accessing them and added more items to OM
Diffstat (limited to 'src/Endstops/Endstop.h')
-rw-r--r-- | src/Endstops/Endstop.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Endstops/Endstop.h b/src/Endstops/Endstop.h index fc84de1c..d4c8ee17 100644 --- a/src/Endstops/Endstop.h +++ b/src/Endstops/Endstop.h @@ -8,16 +8,17 @@ #ifndef SRC_ENDSTOPS_ENDSTOP_H_ #define SRC_ENDSTOPS_ENDSTOP_H_ -#include "RepRapFirmware.h" +#include <RepRapFirmware.h> +#include <ObjectModel/ObjectModel.h> #include "EndstopDefs.h" -#include "Hardware/IoPorts.h" +#include <Hardware/IoPorts.h> #include <General/FreelistManager.h> class AxisDriversConfig; class CanMessageBuffer; // This is the base class for all types of endstops and for ZProbe. -class EndstopOrZProbe +class EndstopOrZProbe INHERIT_OBJECT_MODEL { public: EndstopOrZProbe() noexcept : next(nullptr) {} @@ -72,6 +73,7 @@ public: protected: Endstop(uint8_t axis, EndStopPosition pos) noexcept; + DECLARE_OBJECT_MODEL private: uint8_t axis; // which axis this endstop is on |