Browse Source

Fix capitalization of counter_m

Scott Lahteine 9 years ago
parent
commit
9bf78ef465
2 changed files with 7 additions and 7 deletions
  1. 6
    6
      Marlin/stepper.cpp
  2. 1
    1
      Marlin/stepper.h

+ 6
- 6
Marlin/stepper.cpp View File

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

+ 1
- 1
Marlin/stepper.h View File

152
     // Mixing extruder mix counters
152
     // Mixing extruder mix counters
153
     //
153
     //
154
     #if ENABLED(MIXING_EXTRUDER)
154
     #if ENABLED(MIXING_EXTRUDER)
155
-      static long counter_M[MIXING_STEPPERS];
155
+      static long counter_m[MIXING_STEPPERS];
156
       #define MIXING_STEPPERS_LOOP(VAR) \
156
       #define MIXING_STEPPERS_LOOP(VAR) \
157
         for (uint8_t VAR = 0; VAR < MIXING_STEPPERS; VAR++) \
157
         for (uint8_t VAR = 0; VAR < MIXING_STEPPERS; VAR++) \
158
           if (current_block->mix_event_count[VAR])
158
           if (current_block->mix_event_count[VAR])

Loading…
Cancel
Save