From 9bf78ef46567b2aed71ca7575fe6a81b50cb7f95 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Sep 2016 11:31:45 -0500 Subject: [PATCH] Fix capitalization of counter_m --- Marlin/stepper.cpp | 12 ++++++------ Marlin/stepper.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index c03ea4a2c..53d174f31 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -115,7 +115,7 @@ volatile long Stepper::count_position[NUM_AXIS] = { 0 }; volatile signed char Stepper::count_direction[NUM_AXIS] = { 1, 1, 1, 1 }; #if ENABLED(MIXING_EXTRUDER) - long Stepper::counter_M[MIXING_STEPPERS]; + long Stepper::counter_m[MIXING_STEPPERS]; #endif unsigned short Stepper::acc_step_rate; // needed for deceleration start point @@ -340,7 +340,7 @@ void Stepper::isr() { #if ENABLED(MIXING_EXTRUDER) MIXING_STEPPERS_LOOP(i) - counter_M[i] = -(current_block->mix_event_count[i] >> 1); + counter_m[i] = -(current_block->mix_event_count[i] >> 1); #endif step_events_completed = 0; @@ -487,9 +487,9 @@ void Stepper::isr() { // Tick the counters used for this mix MIXING_STEPPERS_LOOP(j) { // Step mixing steppers (proportionally) - counter_M[j] += current_block->steps[E_AXIS]; + counter_m[j] += current_block->steps[E_AXIS]; // Step when the counter goes over zero - if (counter_M[j] > 0) En_STEP_WRITE(j, !INVERT_E_STEP_PIN); + if (counter_m[j] > 0) En_STEP_WRITE(j, !INVERT_E_STEP_PIN); } #else // !MIXING_EXTRUDER PULSE_START(E); @@ -520,8 +520,8 @@ void Stepper::isr() { count_position[E_AXIS] += count_direction[E_AXIS]; } MIXING_STEPPERS_LOOP(j) { - if (counter_M[j] > 0) { - counter_M[j] -= current_block->mix_event_count[j]; + if (counter_m[j] > 0) { + counter_m[j] -= current_block->mix_event_count[j]; En_STEP_WRITE(j, INVERT_E_STEP_PIN); } } diff --git a/Marlin/stepper.h b/Marlin/stepper.h index b38b0e8f4..4a2287c7d 100644 --- a/Marlin/stepper.h +++ b/Marlin/stepper.h @@ -152,7 +152,7 @@ class Stepper { // Mixing extruder mix counters // #if ENABLED(MIXING_EXTRUDER) - static long counter_M[MIXING_STEPPERS]; + static long counter_m[MIXING_STEPPERS]; #define MIXING_STEPPERS_LOOP(VAR) \ for (uint8_t VAR = 0; VAR < MIXING_STEPPERS; VAR++) \ if (current_block->mix_event_count[VAR])