diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2022-01-28 13:27:17 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2022-01-28 13:27:17 +0300 |
| commit | 3ba83224080865e2f2ea4373a0149c4f2158b391 (patch) | |
| tree | 994c4c092a647323c0b27d7db7dce4905570fd41 /src | |
| parent | 39832238b9fe9ddfaafc664d0aa49f145c2042c0 (diff) | |
Added move.limitAxes and move.noMovesBeforeHoming
Diffstat (limited to 'src')
| -rw-r--r-- | src/GCodes/GCodes.h | 2 | ||||
| -rw-r--r-- | src/Movement/Move.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/GCodes/GCodes.h b/src/GCodes/GCodes.h index 90bf7b4b..9ea4c8b7 100644 --- a/src/GCodes/GCodes.h +++ b/src/GCodes/GCodes.h @@ -168,6 +168,8 @@ public: float GetSimulationTime() const noexcept { return simulationTime; } bool AllAxesAreHomed() const noexcept; // Return true if all axes are homed + bool LimitAxes() const noexcept { return limitAxes; } + bool NoMovesBeforeHoming() const noexcept { return noMovesBeforeHoming; } void MoveStoppedByZProbe() noexcept { zProbeTriggered = true; } // Called from the step ISR when the Z probe is triggered, causing the move to be aborted diff --git a/src/Movement/Move.cpp b/src/Movement/Move.cpp index 2c8678a1..f32f6cc2 100644 --- a/src/Movement/Move.cpp +++ b/src/Movement/Move.cpp @@ -103,6 +103,8 @@ constexpr ObjectModelTableEntry Move::objectModelTable[] = { "extruders", OBJECT_MODEL_FUNC_NOSELF(&extrudersArrayDescriptor), ObjectModelEntryFlags::live }, { "idle", OBJECT_MODEL_FUNC(self, 1), ObjectModelEntryFlags::none }, { "kinematics", OBJECT_MODEL_FUNC(self->kinematics), ObjectModelEntryFlags::none }, + { "limitAxes", OBJECT_MODEL_FUNC_NOSELF(reprap.GetGCodes().LimitAxes()), ObjectModelEntryFlags::none }, + { "noMovesBeforeHoming", OBJECT_MODEL_FUNC_NOSELF(reprap.GetGCodes().NoMovesBeforeHoming()), ObjectModelEntryFlags::none }, { "printingAcceleration", OBJECT_MODEL_FUNC(InverseConvertAcceleration(self->maxPrintingAcceleration), 1), ObjectModelEntryFlags::none }, { "queue", OBJECT_MODEL_FUNC_NOSELF(&queueArrayDescriptor), ObjectModelEntryFlags::none }, #if SUPPORT_COORDINATE_ROTATION @@ -173,7 +175,7 @@ constexpr ObjectModelTableEntry Move::objectModelTable[] = constexpr uint8_t Move::objectModelTableDescriptor[] = { 9 + SUPPORT_COORDINATE_ROTATION, - 15 + SUPPORT_WORKPLACE_COORDINATES, + 17 + SUPPORT_WORKPLACE_COORDINATES, 2, 4 + SUPPORT_LASER, 3, |