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

Use ENABLED with DISABLE_[INACTIVE_][XYZ]

Browse Source
This commit is contained in:
Scott Lahteine 2016-03-13 22:15:45 -07:00
parent 73a59a4e45
commit 4b648793f2
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -6999,16 +6999,16 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
if (stepper_inactive_time && ms > previous_cmd_ms + stepper_inactive_time
&& !ignore_stepper_queue && !blocks_queued()) {
#if DISABLE_INACTIVE_X == true
#if ENABLED(DISABLE_INACTIVE_X)
disable_x();
#endif
#if DISABLE_INACTIVE_Y == true
#if ENABLED(DISABLE_INACTIVE_Y)
disable_y();
#endif
#if DISABLE_INACTIVE_Z == true
#if ENABLED(DISABLE_INACTIVE_Z)
disable_z();
#endif
#if DISABLE_INACTIVE_E == true
#if ENABLED(DISABLE_INACTIVE_E)
disable_e0();
disable_e1();
disable_e2();

26
Marlin/planner.cpp
View File

@ -421,15 +421,23 @@ void check_axes_activity() {
block_index = next_block_index(block_index);
}
}
if (DISABLE_X && !axis_active[X_AXIS]) disable_x();
if (DISABLE_Y && !axis_active[Y_AXIS]) disable_y();
if (DISABLE_Z && !axis_active[Z_AXIS]) disable_z();
if (DISABLE_E && !axis_active[E_AXIS]) {
disable_e0();
disable_e1();
disable_e2();
disable_e3();
}
#if ENABLED(DISABLE_X)
if (!axis_active[X_AXIS]) disable_x();
#endif
#if ENABLED(DISABLE_Y)
if (!axis_active[Y_AXIS]) disable_y();
#endif
#if ENABLED(DISABLE_Z)
if (!axis_active[Z_AXIS]) disable_z();
#endif
#if ENABLED(DISABLE_E)
if (!axis_active[E_AXIS]) {
disable_e0();
disable_e1();
disable_e2();
disable_e3();
}
#endif
#if HAS_FAN
#ifdef FAN_KICKSTART_TIME