|
@@ -54,7 +54,7 @@ static unsigned int cleaning_buffer_counter;
|
54
|
54
|
locked_z2_motor = false;
|
55
|
55
|
#endif
|
56
|
56
|
|
57
|
|
-// Counter variables for the bresenham line tracer
|
|
57
|
+// Counter variables for the Bresenham line tracer
|
58
|
58
|
static long counter_x, counter_y, counter_z, counter_e;
|
59
|
59
|
volatile static unsigned long step_events_completed; // The number of step events executed in the current block
|
60
|
60
|
|
|
@@ -66,7 +66,7 @@ volatile static unsigned long step_events_completed; // The number of step event
|
66
|
66
|
|
67
|
67
|
static long acceleration_time, deceleration_time;
|
68
|
68
|
//static unsigned long accelerate_until, decelerate_after, acceleration_rate, initial_rate, final_rate, nominal_rate;
|
69
|
|
-static unsigned short acc_step_rate; // needed for deccelaration start point
|
|
69
|
+static unsigned short acc_step_rate; // needed for deceleration start point
|
70
|
70
|
static char step_loops;
|
71
|
71
|
static unsigned short OCR1A_nominal;
|
72
|
72
|
static unsigned short step_loops_nominal;
|
|
@@ -484,7 +484,7 @@ ISR(TIMER1_COMPA_vect) {
|
484
|
484
|
if ((current_block->steps[A_AXIS] != current_block->steps[B_AXIS]) || (TEST(out_bits, A_AXIS) == TEST(out_bits, B_AXIS))) {
|
485
|
485
|
if (TEST(out_bits, X_HEAD))
|
486
|
486
|
#else
|
487
|
|
- if (TEST(out_bits, X_AXIS)) // stepping along -X axis (regular cartesians bot)
|
|
487
|
+ if (TEST(out_bits, X_AXIS)) // stepping along -X axis (regular Cartesian bot)
|
488
|
488
|
#endif
|
489
|
489
|
{ // -direction
|
490
|
490
|
#ifdef DUAL_X_CARRIAGE
|