|
@@ -115,7 +115,7 @@ volatile long Stepper::count_position[NUM_AXIS] = { 0 };
|
115
|
115
|
volatile signed char Stepper::count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
|
116
|
116
|
|
117
|
117
|
#if ENABLED(MIXING_EXTRUDER)
|
118
|
|
- long Stepper::counter_M[MIXING_STEPPERS];
|
|
118
|
+ long Stepper::counter_m[MIXING_STEPPERS];
|
119
|
119
|
#endif
|
120
|
120
|
|
121
|
121
|
unsigned short Stepper::acc_step_rate; // needed for deceleration start point
|
|
@@ -340,7 +340,7 @@ void Stepper::isr() {
|
340
|
340
|
|
341
|
341
|
#if ENABLED(MIXING_EXTRUDER)
|
342
|
342
|
MIXING_STEPPERS_LOOP(i)
|
343
|
|
- counter_M[i] = -(current_block->mix_event_count[i] >> 1);
|
|
343
|
+ counter_m[i] = -(current_block->mix_event_count[i] >> 1);
|
344
|
344
|
#endif
|
345
|
345
|
|
346
|
346
|
step_events_completed = 0;
|
|
@@ -487,9 +487,9 @@ void Stepper::isr() {
|
487
|
487
|
// Tick the counters used for this mix
|
488
|
488
|
MIXING_STEPPERS_LOOP(j) {
|
489
|
489
|
// Step mixing steppers (proportionally)
|
490
|
|
- counter_M[j] += current_block->steps[E_AXIS];
|
|
490
|
+ counter_m[j] += current_block->steps[E_AXIS];
|
491
|
491
|
// Step when the counter goes over zero
|
492
|
|
- if (counter_M[j] > 0) En_STEP_WRITE(j, !INVERT_E_STEP_PIN);
|
|
492
|
+ if (counter_m[j] > 0) En_STEP_WRITE(j, !INVERT_E_STEP_PIN);
|
493
|
493
|
}
|
494
|
494
|
#else // !MIXING_EXTRUDER
|
495
|
495
|
PULSE_START(E);
|
|
@@ -520,8 +520,8 @@ void Stepper::isr() {
|
520
|
520
|
count_position[E_AXIS] += count_direction[E_AXIS];
|
521
|
521
|
}
|
522
|
522
|
MIXING_STEPPERS_LOOP(j) {
|
523
|
|
- if (counter_M[j] > 0) {
|
524
|
|
- counter_M[j] -= current_block->mix_event_count[j];
|
|
523
|
+ if (counter_m[j] > 0) {
|
|
524
|
+ counter_m[j] -= current_block->mix_event_count[j];
|
525
|
525
|
En_STEP_WRITE(j, INVERT_E_STEP_PIN);
|
526
|
526
|
}
|
527
|
527
|
}
|