MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweaks to M915

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-21 05:13:12 -05:00
parent ec46336df7
commit ba55602462
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -10865,8 +10865,8 @@ inline void gcode_M502() {
*/ */
#if ENABLED(TMC_Z_CALIBRATION) #if ENABLED(TMC_Z_CALIBRATION)
inline void gcode_M915() { inline void gcode_M915() {
uint16_t _rms = parser.seenval('S') ? parser.value_int() : CALIBRATION_CURRENT; const uint16_t _rms = parser.seenval('S') ? parser.value_int() : CALIBRATION_CURRENT,
uint16_t _z = parser.seenval('Z') ? parser.value_int() : CALIBRATION_EXTRA_HEIGHT; _z = parser.seenval('Z') ? parser.value_linear_units() : CALIBRATION_EXTRA_HEIGHT;
if (!axis_known_position[Z_AXIS]) { if (!axis_known_position[Z_AXIS]) {
SERIAL_ECHOLNPGM("\nPlease home Z axis first"); SERIAL_ECHOLNPGM("\nPlease home Z axis first");
@ -10874,11 +10874,11 @@ inline void gcode_M502() {
} }
#if Z_IS_TRINAMIC #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); stepperZ.setCurrent(_rms, R_SENSE, HOLD_MULTIPLIER);
#endif #endif
#if Z2_IS_TRINAMIC #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); stepperZ2.setCurrent(_rms, R_SENSE, HOLD_MULTIPLIER);
#endif #endif