diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index fa6f71f8b..bdf919601 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -324,8 +324,8 @@ #define LULZBOT_LCD_TOOLHEAD_NAME "Dual Extruder 3" // 16 chars max ^^^^^^^^^^^^^^^ #define LULZBOT_M115_EXTRUDER_TYPE "DualExtruder v3" - #define LULZBOT_MOTOR_CURRENT_E0 875 // mA - #define LULZBOT_MOTOR_CURRENT_E1 875 // mA + #define LULZBOT_MOTOR_CURRENT_E0 177 // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) + #define LULZBOT_MOTOR_CURRENT_E1 177 // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #define LULZBOT_EXTRUDERS 2 #define LULZBOT_TEMP_SENSOR_1 5 #define LULZBOT_DISTINCT_E_FACTORS @@ -377,7 +377,6 @@ #if defined(LULZBOT_UNIVERSAL_TOOLHEAD) || ANY(TOOLHEAD_SK285,TOOLHEAD_SK175,TOOLHEAD_M175,TOOLHEAD_H175,TOOLHEAD_SL_SE_HE, TOOLHEAD_HS_HSPLUS) #define LULZBOT_UNIVERSAL_MOUNT #define LULZBOT_EXTRUDERS 1 - #define LULZBOT_MOTOR_CURRENT_E 960 // mA #define LULZBOT_M115_EXTRUDER_TYPE "Universal" #define LULZBOT_TOOLHEAD_X_MAX_ADJ 0 #define LULZBOT_TOOLHEAD_X_MIN_ADJ 0 @@ -385,6 +384,11 @@ #define LULZBOT_TOOLHEAD_Y_MIN_ADJ 0 #define LULZBOT_TOOLHEAD_Z_MAX_ADJ 0 #define LULZBOT_TOOLHEAD_Z_MIN_ADJ 0 + #if ANY(TAZ6, Workhorse) + #define LULZBOT_MOTOR_CURRENT_E0 177 // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) + #else + #define LULZBOT_MOTOR_CURRENT_E0 960 // mA + #endif #endif #if defined(TOOLHEAD_SL_SE_HE) #undef LULZBOT_M115_EXTRUDER_TYPE diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index dce80154f..7375e8fcf 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1194,10 +1194,14 @@ * M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2 */ //#define PWM_MOTOR_CURRENT { 1300, 1300, 1250 } // Values in milliamps +#if !defined(LULZBOT_MOTOR_CURRENT_E1) + #define LULZBOT_MOTOR_CURRENT_E1 0 +#endif + #if ENABLED(TAZ6) - #define DIGIPOT_MOTOR_CURRENT { 175,175,200,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) + #define DIGIPOT_MOTOR_CURRENT { 175,175,200,LULZBOT_MOTOR_CURRENT_E0, LULZBOT_MOTOR_CURRENT_E1 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #elif ENABLED(Workhorse) - #define DIGIPOT_MOTOR_CURRENT {175, 175, 180, 177, 177} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) + #define DIGIPOT_MOTOR_CURRENT {175, 175, 180, LULZBOT_MOTOR_CURRENT_E0, LULZBOT_MOTOR_CURRENT_E1} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #endif //#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis @@ -2739,7 +2743,7 @@ #endif #if AXIS_IS_TMC(E0) - #define E0_CURRENT 800 + #define E0_CURRENT LULZBOT_MOTOR_CURRENT_E0 #define E0_MICROSTEPS 16 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 @@ -2747,7 +2751,7 @@ #endif #if AXIS_IS_TMC(E1) - #define E1_CURRENT 800 + #define E1_CURRENT LULZBOT_MOTOR_CURRENT_E1 #define E1_MICROSTEPS E0_MICROSTEPS #define E1_RSENSE 0.11 #define E1_CHAIN_POS -1