From 777abb71b551ed3c8c1924e074d992b6340677c3 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 11 Aug 2020 19:34:23 -0400 Subject: [PATCH] Add missed lines from working branch --- Marlin/src/gcode/calibrate/G34_M422.cpp | 1 - Marlin/src/inc/SanityCheck.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp index 6884d5ee0a..6717d37722 100644 --- a/Marlin/src/gcode/calibrate/G34_M422.cpp +++ b/Marlin/src/gcode/calibrate/G34_M422.cpp @@ -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 diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index eaa9c32688..e4833ebb2a 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -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