CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '21-motor-current' into 'master'

Browse Source 
Resolve "Motor Current"

Closes #21

See merge request lulzbot3d/marlin!13
This commit is contained in:
Robert Henderson 2021-09-15 16:41:33 +00:00
commit 688c231fd0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Configuration.h
View File

@ -324,8 +324,8 @@
#define LULZBOT_LCD_TOOLHEAD_NAME "Dual Extruder 3" #define LULZBOT_LCD_TOOLHEAD_NAME "Dual Extruder 3"
// 16 chars max ^^^^^^^^^^^^^^^ // 16 chars max ^^^^^^^^^^^^^^^
#define LULZBOT_M115_EXTRUDER_TYPE "DualExtruder v3" #define LULZBOT_M115_EXTRUDER_TYPE "DualExtruder v3"
#define LULZBOT_MOTOR_CURRENT_E0 875 // mA #define LULZBOT_MOTOR_CURRENT_E0 177 // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#define LULZBOT_MOTOR_CURRENT_E1 875 // mA #define LULZBOT_MOTOR_CURRENT_E1 177 // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#define LULZBOT_EXTRUDERS 2 #define LULZBOT_EXTRUDERS 2
#define LULZBOT_TEMP_SENSOR_1 5 #define LULZBOT_TEMP_SENSOR_1 5
#define LULZBOT_DISTINCT_E_FACTORS #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) #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_UNIVERSAL_MOUNT
#define LULZBOT_EXTRUDERS 1 #define LULZBOT_EXTRUDERS 1
#define LULZBOT_MOTOR_CURRENT_E 960 // mA
#define LULZBOT_M115_EXTRUDER_TYPE "Universal" #define LULZBOT_M115_EXTRUDER_TYPE "Universal"
#define LULZBOT_TOOLHEAD_X_MAX_ADJ 0 #define LULZBOT_TOOLHEAD_X_MAX_ADJ 0
#define LULZBOT_TOOLHEAD_X_MIN_ADJ 0 #define LULZBOT_TOOLHEAD_X_MIN_ADJ 0
@ -385,6 +384,11 @@
#define LULZBOT_TOOLHEAD_Y_MIN_ADJ 0 #define LULZBOT_TOOLHEAD_Y_MIN_ADJ 0
#define LULZBOT_TOOLHEAD_Z_MAX_ADJ 0 #define LULZBOT_TOOLHEAD_Z_MAX_ADJ 0
#define LULZBOT_TOOLHEAD_Z_MIN_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 #endif
#if defined(TOOLHEAD_SL_SE_HE) #if defined(TOOLHEAD_SL_SE_HE)
#undef LULZBOT_M115_EXTRUDER_TYPE #undef LULZBOT_M115_EXTRUDER_TYPE

12
Marlin/Configuration_adv.h
View File

@ -1199,10 +1199,14 @@
* M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2 * M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2
*/ */
//#define PWM_MOTOR_CURRENT { 1300, 1300, 1250 } // Values in milliamps //#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) #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) #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 #endif
//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis //#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
@ -2744,7 +2748,7 @@
#endif #endif
#if AXIS_IS_TMC(E0) #if AXIS_IS_TMC(E0)
#define E0_CURRENT 800 #define E0_CURRENT LULZBOT_MOTOR_CURRENT_E0
#define E0_MICROSTEPS 16 #define E0_MICROSTEPS 16
#define E0_RSENSE 0.11 #define E0_RSENSE 0.11
#define E0_CHAIN_POS -1 #define E0_CHAIN_POS -1
@ -2752,7 +2756,7 @@
#endif #endif
#if AXIS_IS_TMC(E1) #if AXIS_IS_TMC(E1)
#define E1_CURRENT 800 #define E1_CURRENT LULZBOT_MOTOR_CURRENT_E1
#define E1_MICROSTEPS E0_MICROSTEPS #define E1_MICROSTEPS E0_MICROSTEPS
#define E1_RSENSE 0.11 #define E1_RSENSE 0.11
#define E1_CHAIN_POS -1 #define E1_CHAIN_POS -1