diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-06-26 11:47:39 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-06-26 11:47:39 +0300 |
| commit | 169dc350b6ebbbc059480a8013e96c4fbc588772 (patch) | |
| tree | 3fe1060f83c7ca3bd6e1601f77ce2f698ff3ff1e | |
| parent | 397f04d0054893d4c98e11ecddaa462d7da27b82 (diff) | |
Reverted probeGrid in OM to return defaultGrid, added liveGrid
| -rw-r--r-- | src/Movement/Move.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Movement/Move.cpp b/src/Movement/Move.cpp index e3f073f9..41b26b2b 100644 --- a/src/Movement/Move.cpp +++ b/src/Movement/Move.cpp @@ -134,8 +134,9 @@ constexpr ObjectModelTableEntry Move::objectModelTable[] = #if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE { "file", OBJECT_MODEL_FUNC_IF(self->usingMesh, self->heightMap.GetFileName()), ObjectModelEntryFlags::none }, #endif + { "liveGrid", OBJECT_MODEL_FUNC_IF(self->usingMesh, (const GridDefinition *)&self->GetGrid()), ObjectModelEntryFlags::none }, { "meshDeviation", OBJECT_MODEL_FUNC_IF(self->usingMesh, self, 7), ObjectModelEntryFlags::none }, - { "probeGrid", OBJECT_MODEL_FUNC((const GridDefinition *)&self->GetGrid()), ObjectModelEntryFlags::none }, + { "probeGrid", OBJECT_MODEL_FUNC_NOSELF((const GridDefinition *)&reprap.GetGCodes().GetDefaultGrid()), ObjectModelEntryFlags::none }, { "skew", OBJECT_MODEL_FUNC(self, 8), ObjectModelEntryFlags::none }, { "type", OBJECT_MODEL_FUNC(self->GetCompensationTypeString()), ObjectModelEntryFlags::none }, @@ -150,7 +151,7 @@ constexpr ObjectModelTableEntry Move::objectModelTable[] = { "tanYZ", OBJECT_MODEL_FUNC(self->tanYZ, 4), ObjectModelEntryFlags::none }, }; -constexpr uint8_t Move::objectModelTableDescriptor[] = { 9, 15, 2, 4 + SUPPORT_LASER, 3, 2, 2, 5 + (HAS_MASS_STORAGE || HAS_LINUX_INTERFACE), 2, 4 }; +constexpr uint8_t Move::objectModelTableDescriptor[] = { 9, 15, 2, 4 + SUPPORT_LASER, 3, 2, 2, 6 + (HAS_MASS_STORAGE || HAS_LINUX_INTERFACE), 2, 4 }; DEFINE_GET_OBJECT_MODEL_TABLE(Move) |