jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missed lines from working branch

Browse Source
This commit is contained in:
InsanityAutomation
2020-08-11 19:34:23 -04:00
committed by InsanityAutomation
parent ac4ffdb4e5
commit 777abb71b5
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/gcode/calibrate/G34_M422.cpp
-1
View File
@@ -609,7 +609,6 @@ void GcodeSuite::M422() {
#elif ENABLED(HAS_I2C_DIGIPOT)
digipot_i2c_set_current(Z_AXIS, previous_current)
#elif HAS_TRINAMIC_CONFIG
static uint16_t previous_current_arr[NUM_Z_STEPPER_DRIVERS];
#if AXIS_IS_TMC(Z)
stepperZ.rms_current(previous_current_arr[0]);
#endif
Marlin/src/inc/SanityCheck.h
+1 -1
View File
@@ -2765,7 +2765,7 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#endif
#if ENABLED(MECHANICAL_GANTRY_CALIBRATION)
#if NONE(DAC_STEPPER_CURRENT, HAS_DIGIPOTSS, DAC_STEPPER_CURRENT, HAS_TRINAMIC_CONFIG)
#if NONE(DAC_STEPPER_CURRENT, HAS_DIGIPOTSS, DAC_STEPPER_CURRENT, HAS_TRINAMIC_CONFIG, HAS_MOTOR_CURRENT_PWM)
#error "It is highly reccomended to have adjustable current drivers to prevent damage. Disable this line to continue anyway."
#else
#ifndef GANTRY_CALIBRATION_CURRENT