From 045ee28c50a98189ba6dd81f4589d0d171d43218 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 21 Mar 2018 05:15:25 -0500
Subject: [PATCH] Tweaks to M915
---
Marlin/src/gcode/feature/trinamic/M911-M915.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M915.cpp b/Marlin/src/gcode/feature/trinamic/M911-M915.cpp
index fa02aaadff..c86b59fa6c 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M915.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M915.cpp
@@ -258,8 +258,8 @@ void GcodeSuite::M912() {
*/
#if ENABLED(TMC_Z_CALIBRATION)
void GcodeSuite::M915() {
- uint16_t _rms = parser.seenval('S') ? parser.value_int() : CALIBRATION_CURRENT;
- uint16_t _z = parser.seenval('Z') ? parser.value_int() : CALIBRATION_EXTRA_HEIGHT;
+ const uint16_t _rms = parser.seenval('S') ? parser.value_int() : CALIBRATION_CURRENT,
+ _z = parser.seenval('Z') ? parser.value_linear_units() : CALIBRATION_EXTRA_HEIGHT;
if (!axis_known_position[Z_AXIS]) {
SERIAL_ECHOLNPGM("\nPlease home Z axis first");
@@ -267,11 +267,11 @@ void GcodeSuite::M912() {
}
#if Z_IS_TRINAMIC
- uint16_t Z_current_1 = stepperZ.getCurrent();
+ const uint16_t Z_current_1 = stepperZ.getCurrent();
stepperZ.setCurrent(_rms, R_SENSE, HOLD_MULTIPLIER);
#endif
#if Z2_IS_TRINAMIC
- uint16_t Z2_current_1 = stepperZ2.getCurrent();
+ const uint16_t Z2_current_1 = stepperZ2.getCurrent();
stepperZ2.setCurrent(_rms, R_SENSE, HOLD_MULTIPLIER);
#endif
--
GitLab