diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-07-24 13:04:13 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-24 13:04:13 +0300 |
| commit | 745c9baea0c8d6b3987d0a8795c74afa5ae4da03 (patch) | |
| tree | 0e1f2f27d7c5f2585e809ec5deb2eb4d5966ebc7 /src/Endstops | |
| parent | 107551283f1f69e607125b75bb8cfebf4cb8cd5d (diff) | |
Finished converting time units to step clocks, pending testing
Diffstat (limited to 'src/Endstops')
| -rw-r--r-- | src/Endstops/ZProbe.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Endstops/ZProbe.cpp b/src/Endstops/ZProbe.cpp index 293bcde8..2147b664 100644 --- a/src/Endstops/ZProbe.cpp +++ b/src/Endstops/ZProbe.cpp @@ -56,7 +56,7 @@ constexpr ObjectModelArrayDescriptor ZProbe::speedsArrayDescriptor = nullptr, [] (const ObjectModel *self, const ObjectExplorationContext&) noexcept -> size_t { return ARRAY_SIZE(ZProbe::probeSpeeds); }, [] (const ObjectModel *self, ObjectExplorationContext& context) noexcept -> ExpressionValue - { return ExpressionValue(GCodeBuffer::InverseConvertSpeedToMm(((const ZProbe*)self)->probeSpeeds[context.GetLastIndex()], false), 1); } + { return ExpressionValue(InverseConvertSpeedToMmPerMin(((const ZProbe*)self)->probeSpeeds[context.GetLastIndex()]), 1); } }; constexpr ObjectModelTableEntry ZProbe::objectModelTable[] = @@ -71,13 +71,13 @@ constexpr ObjectModelTableEntry ZProbe::objectModelTable[] = { "maxProbeCount", OBJECT_MODEL_FUNC((int32_t)self->misc.parts.maxTaps), ObjectModelEntryFlags::none }, { "offsets", OBJECT_MODEL_FUNC_NOSELF(&offsetsArrayDescriptor), ObjectModelEntryFlags::none }, { "recoveryTime", OBJECT_MODEL_FUNC(self->recoveryTime, 1), ObjectModelEntryFlags::none }, - { "speed", OBJECT_MODEL_FUNC(GCodeBuffer::InverseConvertSpeedToMm(self->probeSpeeds[1], false), 1), ObjectModelEntryFlags::obsolete }, + { "speed", OBJECT_MODEL_FUNC(InverseConvertSpeedToMmPerMin(self->probeSpeeds[1]), 1), ObjectModelEntryFlags::obsolete }, { "speeds", OBJECT_MODEL_FUNC_NOSELF(&speedsArrayDescriptor), ObjectModelEntryFlags::none }, { "temperatureCoefficient", OBJECT_MODEL_FUNC(self->temperatureCoefficients[0], 5), ObjectModelEntryFlags::obsolete }, { "temperatureCoefficients", OBJECT_MODEL_FUNC_NOSELF(&temperatureCoefficientsArrayDescriptor), ObjectModelEntryFlags::none }, { "threshold", OBJECT_MODEL_FUNC((int32_t)self->adcValue), ObjectModelEntryFlags::none }, { "tolerance", OBJECT_MODEL_FUNC(self->tolerance, 3), ObjectModelEntryFlags::none }, - { "travelSpeed", OBJECT_MODEL_FUNC(GCodeBuffer::InverseConvertSpeedToMm(self->travelSpeed, false), 1), ObjectModelEntryFlags::none }, + { "travelSpeed", OBJECT_MODEL_FUNC(InverseConvertSpeedToMmPerMin(self->travelSpeed), 1), ObjectModelEntryFlags::none }, { "triggerHeight", OBJECT_MODEL_FUNC(-self->offsets[Z_AXIS], 3), ObjectModelEntryFlags::none }, { "type", OBJECT_MODEL_FUNC((int32_t)self->type), ObjectModelEntryFlags::none }, { "value", OBJECT_MODEL_FUNC_NOSELF(&valueArrayDescriptor), ObjectModelEntryFlags::live }, @@ -386,8 +386,8 @@ GCodeResult ZProbe::Configure(GCodeBuffer& gb, const StringRef &reply, bool& see float userProbeSpeeds[2]; size_t numSpeeds = 2; gb.GetFloatArray(userProbeSpeeds, numSpeeds, true); - probeSpeeds[0] = GCodeBuffer::ConvertSpeedFromMm(userProbeSpeeds[0], false); - probeSpeeds[1] = GCodeBuffer::ConvertSpeedFromMm(userProbeSpeeds[1], false); + probeSpeeds[0] = ConvertSpeedFromMmPerMin(userProbeSpeeds[0]); + probeSpeeds[1] = ConvertSpeedFromMmPerMin(userProbeSpeeds[1]); seen = true; } @@ -422,9 +422,9 @@ GCodeResult ZProbe::Configure(GCodeBuffer& gb, const StringRef &reply, bool& see const GCodeResult rslt = AppendPinNames(reply); reply.catf(", dive height %.1fmm, probe speeds %d,%dmm/min, travel speed %dmm/min, recovery time %.2f sec, heaters %s, max taps %u, max diff %.2f", (double)diveHeight, - (int)GCodeBuffer::InverseConvertSpeedToMm(probeSpeeds[0], false), - (int)GCodeBuffer::InverseConvertSpeedToMm(probeSpeeds[1], false), - (int)GCodeBuffer::InverseConvertSpeedToMm(travelSpeed, false), + (int)InverseConvertSpeedToMmPerMin(probeSpeeds[0]), + (int)InverseConvertSpeedToMmPerMin(probeSpeeds[1]), + (int)InverseConvertSpeedToMmPerMin(travelSpeed), (double)recoveryTime, (misc.parts.turnHeatersOff) ? "suspended" : "normal", misc.parts.maxTaps, (double)tolerance); |