SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Try bool for direction instead of long

Browse source
This commit is contained in:
Scott Lahteine 2016-09-02 11:28:48 -05:00
parent ad659b5f91
commit 42b5616327
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/stepper.cpp
View file

@ -392,12 +392,12 @@ void Stepper::isr() {
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
// Step mixing steppers proportionally // Step mixing steppers proportionally
long dir = motor_direction(E_AXIS) ? -1 : 1; bool dir = motor_direction(E_AXIS);
MIXING_STEPPERS_LOOP(j) { MIXING_STEPPERS_LOOP(j) {
counter_m[j] += current_block->steps[E_AXIS]; counter_m[j] += current_block->steps[E_AXIS];
if (counter_m[j] > 0) { if (counter_m[j] > 0) {
counter_m[j] -= current_block->mix_event_count[j]; counter_m[j] -= current_block->mix_event_count[j];
e_steps[j] += dir; dir ? --e_steps[j] : ++e_steps[j];
} }
} }
#endif #endif
@ -433,12 +433,12 @@ void Stepper::isr() {
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
// Step mixing steppers proportionally // Step mixing steppers proportionally
long dir = motor_direction(E_AXIS) ? -1 : 1; bool dir = motor_direction(E_AXIS);
MIXING_STEPPERS_LOOP(j) { MIXING_STEPPERS_LOOP(j) {
counter_m[j] += current_block->steps[E_AXIS]; counter_m[j] += current_block->steps[E_AXIS];
if (counter_m[j] > 0) { if (counter_m[j] > 0) {
counter_m[j] -= current_block->mix_event_count[j]; counter_m[j] -= current_block->mix_event_count[j];
e_steps[j] += dir; dir ? --e_steps[j] : ++e_steps[j];
} }
} }
@ -691,7 +691,7 @@ void Stepper::isr() {
#define STOP_E_PULSE(INDEX) \ #define STOP_E_PULSE(INDEX) \
if (e_steps[INDEX]) { \ if (e_steps[INDEX]) { \
e_steps[INDEX] < 0 ? ++e_steps[INDEX] : --e_steps[INDEX]; \ e_steps[INDEX] <= 0 ? ++e_steps[INDEX] : --e_steps[INDEX]; \
E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); \ E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); \
} }