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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/Endstops/ZProbe.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Endstops/ZProbe.cpp b/src/Endstops/ZProbe.cpp index 6d6b3283..ae1e97f9 100644 --- a/src/Endstops/ZProbe.cpp +++ b/src/Endstops/ZProbe.cpp @@ -49,6 +49,7 @@ constexpr ObjectModelTableEntry ZProbe::objectModelTable[] = // Within each group, these entries must be in alphabetical order // 0. Probe members { "calibrationTemperature", OBJECT_MODEL_FUNC(self->calibTemperature, 1), ObjectModelEntryFlags::none }, + { "deployedByUser", OBJECT_MODEL_FUNC(self->isDeployedByUser), ObjectModelEntryFlags::none }, { "disablesHeaters", OBJECT_MODEL_FUNC((bool)self->misc.parts.turnHeatersOff), ObjectModelEntryFlags::none }, { "diveHeight", OBJECT_MODEL_FUNC(self->diveHeight, 1), ObjectModelEntryFlags::none }, { "maxProbeCount", OBJECT_MODEL_FUNC((int32_t)self->misc.parts.maxTaps), ObjectModelEntryFlags::none }, @@ -64,13 +65,13 @@ constexpr ObjectModelTableEntry ZProbe::objectModelTable[] = { "value", OBJECT_MODEL_FUNC_NOSELF(&valueArrayDescriptor), ObjectModelEntryFlags::live }, }; -constexpr uint8_t ZProbe::objectModelTableDescriptor[] = { 1, 14 }; +constexpr uint8_t ZProbe::objectModelTableDescriptor[] = { 1, 15 }; DEFINE_GET_OBJECT_MODEL_TABLE(ZProbe) #endif -ZProbe::ZProbe(unsigned int num, ZProbeType p_type) noexcept : EndstopOrZProbe(), number(num) +ZProbe::ZProbe(unsigned int num, ZProbeType p_type) noexcept : EndstopOrZProbe(), number(num), isDeployedByUser(false) { SetDefaults(); type = p_type; |