bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix 5 mixing steppers

Browse Source
This commit is contained in:
Jeonghwan Roh
2018-08-27 16:25:47 +09:00
committed by Scott Lahteine
parent 2a2e8c314e
commit 59cf217e77
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/Marlin.h
View File

@@ -80,7 +80,10 @@ void manage_inactivity(const bool ignore_stepper_queue=false);
/** /**
* Mixing steppers synchronize their enable (and direction) together * Mixing steppers synchronize their enable (and direction) together
*/ */
#if MIXING_STEPPERS > 3 #if MIXING_STEPPERS > 4
#define enable_E0() { E0_ENABLE_WRITE( E_ENABLE_ON); E1_ENABLE_WRITE( E_ENABLE_ON); E2_ENABLE_WRITE( E_ENABLE_ON); E3_ENABLE_WRITE( E_ENABLE_ON); E4_ENABLE_WRITE( E_ENABLE_ON); }
#define disable_E0() { E0_ENABLE_WRITE(!E_ENABLE_ON); E1_ENABLE_WRITE(!E_ENABLE_ON); E2_ENABLE_WRITE(!E_ENABLE_ON); E3_ENABLE_WRITE(!E_ENABLE_ON); E4_ENABLE_WRITE(!E_ENABLE_ON); }
#elif MIXING_STEPPERS > 3
#define enable_E0() { E0_ENABLE_WRITE( E_ENABLE_ON); E1_ENABLE_WRITE( E_ENABLE_ON); E2_ENABLE_WRITE( E_ENABLE_ON); E3_ENABLE_WRITE( E_ENABLE_ON); } #define enable_E0() { E0_ENABLE_WRITE( E_ENABLE_ON); E1_ENABLE_WRITE( E_ENABLE_ON); E2_ENABLE_WRITE( E_ENABLE_ON); E3_ENABLE_WRITE( E_ENABLE_ON); }
#define disable_E0() { E0_ENABLE_WRITE(!E_ENABLE_ON); E1_ENABLE_WRITE(!E_ENABLE_ON); E2_ENABLE_WRITE(!E_ENABLE_ON); E3_ENABLE_WRITE(!E_ENABLE_ON); } #define disable_E0() { E0_ENABLE_WRITE(!E_ENABLE_ON); E1_ENABLE_WRITE(!E_ENABLE_ON); E2_ENABLE_WRITE(!E_ENABLE_ON); E3_ENABLE_WRITE(!E_ENABLE_ON); }
#elif MIXING_STEPPERS > 2 #elif MIXING_STEPPERS > 2

18
Marlin/src/feature/power.cpp
View File

@@ -50,20 +50,30 @@ bool Power::is_power_needed() {
if (controllerFanSpeed > 0) return true; if (controllerFanSpeed > 0) return true;
#endif #endif
// If any of the drivers or the bed are enabled...
if (X_ENABLE_READ == X_ENABLE_ON || Y_ENABLE_READ == Y_ENABLE_ON || Z_ENABLE_READ == Z_ENABLE_ON if (X_ENABLE_READ == X_ENABLE_ON || Y_ENABLE_READ == Y_ENABLE_ON || Z_ENABLE_READ == Z_ENABLE_ON
#if HAS_HEATED_BED #if HAS_HEATED_BED
|| thermalManager.soft_pwm_amount_bed > 0 || thermalManager.soft_pwm_amount_bed > 0
#endif #endif
|| E0_ENABLE_READ == E_ENABLE_ON // If any of the drivers are enabled... #if HAS_X2_ENABLE
|| X2_ENABLE_READ == X_ENABLE_ON
#endif
#if HAS_Y2_ENABLE
|| Y2_ENABLE_READ == Y_ENABLE_ON
#endif
#if HAS_Z2_ENABLE
|| Z2_ENABLE_READ == Z_ENABLE_ON
#endif
|| E0_ENABLE_READ == E_ENABLE_ON
#if E_STEPPERS > 1 #if E_STEPPERS > 1
|| E1_ENABLE_READ == E_ENABLE_ON || E1_ENABLE_READ == E_ENABLE_ON
#if HAS_X2_ENABLE
|| X2_ENABLE_READ == X_ENABLE_ON
#endif
#if E_STEPPERS > 2 #if E_STEPPERS > 2
|| E2_ENABLE_READ == E_ENABLE_ON || E2_ENABLE_READ == E_ENABLE_ON
#if E_STEPPERS > 3 #if E_STEPPERS > 3
|| E3_ENABLE_READ == E_ENABLE_ON || E3_ENABLE_READ == E_ENABLE_ON
#if E_STEPPERS > 4
|| E4_ENABLE_READ == E_ENABLE_ON
#endif
#endif #endif
#endif #endif
#endif #endif