diff options
| author | Manuel Coenen <manuel@duet3d.com> | 2021-02-05 14:44:45 +0300 |
|---|---|---|
| committer | Manuel Coenen <manuel@duet3d.com> | 2021-02-05 17:16:53 +0300 |
| commit | af11d08f91d98c7ce6c5ae15602378043d278260 (patch) | |
| tree | abcff86dbbc21a6893b5afdef587b6aa61c24922 /src/GCodes/RestorePoint.cpp | |
| parent | 6351882b67bede9e19d64f7caa5e965568c1803c (diff) | |
Move spindle creation to M950 (M453 no longer works for this)
Repurpose M568 for tool settings (offsets, temps, spindle speed)
Deprecate setting tool settings via G10
Assign spindle to tool instead of vice versa
Change M3/M4/M5 to primarily work without parameters on the spindle of
the current tool
Remove spindle speed from restore point (no longer needed) together with
M3 Rn
All spindle speeds are now unsigned integers and have to be interpreted
together with new SpindleState (stopped, forward, revers)
Diffstat (limited to 'src/GCodes/RestorePoint.cpp')
| -rw-r--r-- | src/GCodes/RestorePoint.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/GCodes/RestorePoint.cpp b/src/GCodes/RestorePoint.cpp index 02ce653b..559e7be6 100644 --- a/src/GCodes/RestorePoint.cpp +++ b/src/GCodes/RestorePoint.cpp @@ -27,14 +27,6 @@ constexpr ObjectModelArrayDescriptor RestorePoint::coordinatesArrayDescriptor = { return ExpressionValue(((const RestorePoint*)self)->moveCoords[context.GetLastIndex()], 3); } }; -constexpr ObjectModelArrayDescriptor RestorePoint::spindleSpeedsArrayDescriptor = -{ - nullptr, - [] (const ObjectModel *self, const ObjectExplorationContext&) noexcept -> size_t { return MaxSpindles; }, - [] (const ObjectModel *self, ObjectExplorationContext& context) noexcept -> ExpressionValue - { return ExpressionValue(((const RestorePoint*)self)->spindleSpeeds[context.GetLastIndex()]); } -}; - constexpr ObjectModelTableEntry RestorePoint::objectModelTable[] = { // Within each group, these entries must be in alphabetical order @@ -50,11 +42,10 @@ constexpr ObjectModelTableEntry RestorePoint::objectModelTable[] = { "laserPwm", OBJECT_MODEL_FUNC_IF(reprap.GetGCodes().GetMachineType() == MachineType::laser, (float)self->laserPwmOrIoBits.laserPwm/65535.0, 2), ObjectModelEntryFlags::none }, #endif - { "spindleSpeeds", OBJECT_MODEL_FUNC_NOSELF(&spindleSpeedsArrayDescriptor), ObjectModelEntryFlags::none }, { "toolNumber", OBJECT_MODEL_FUNC((int32_t)self->toolNumber), ObjectModelEntryFlags::none }, }; -constexpr uint8_t RestorePoint::objectModelTableDescriptor[] = { 1, 5 + SUPPORT_LASER + SUPPORT_IOBITS }; +constexpr uint8_t RestorePoint::objectModelTableDescriptor[] = { 1, 4 + SUPPORT_LASER + SUPPORT_IOBITS }; DEFINE_GET_OBJECT_MODEL_TABLE(RestorePoint) @@ -79,11 +70,6 @@ void RestorePoint::Init() noexcept initialUserC0 = initialUserC1 = 0.0; toolNumber = -1; - for (size_t i = 0; i < MaxSpindles; ++i) - { - spindleSpeeds[i] = 0; - } - #if SUPPORT_LASER || SUPPORT_IOBITS laserPwmOrIoBits.Clear(); #endif |