0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #8819 from thinkyhead/bf2_reverting_XXXX

Browse source 
[2.0.x] Revert "Initial step correction"
This commit is contained in:
Scott Lahteine 2017-12-17 20:59:41 -06:00 committed by GitHub
parent 957bbab57f 8df5955da4
commit 029333a8eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Marlin/src/module/stepper.cpp
View file

@ -408,13 +408,10 @@ void Stepper::isr() {
} }
// If there is no current block, attempt to pop one from the buffer // If there is no current block, attempt to pop one from the buffer
bool first_step = false;
if (!current_block) { if (!current_block) {
// Anything in the buffer? // Anything in the buffer?
if ((current_block = planner.get_current_block())) { if ((current_block = planner.get_current_block())) {
trapezoid_generator_reset(); trapezoid_generator_reset();
HAL_timer_set_current_count(STEP_TIMER_NUM, 0);
first_step = true;
// Initialize Bresenham counters to 1/2 the ceiling // Initialize Bresenham counters to 1/2 the ceiling
counter_X = counter_Y = counter_Z = counter_E = -(current_block->step_event_count >> 1); counter_X = counter_Y = counter_Z = counter_E = -(current_block->step_event_count >> 1);
@ -669,18 +666,12 @@ void Stepper::isr() {
// Calculate new timer value // Calculate new timer value
if (step_events_completed <= (uint32_t)current_block->accelerate_until) { if (step_events_completed <= (uint32_t)current_block->accelerate_until) {
if (first_step) { #ifdef CPU_32_BIT
acc_step_rate = current_block->initial_rate; MultiU32X24toH32(acc_step_rate, acceleration_time, current_block->acceleration_rate);
acceleration_time = 0; #else
} MultiU24X32toH16(acc_step_rate, acceleration_time, current_block->acceleration_rate);
else { #endif
#ifdef CPU_32_BIT acc_step_rate += current_block->initial_rate;
MultiU32X24toH32(acc_step_rate, acceleration_time, current_block->acceleration_rate);
#else
MultiU24X32toH16(acc_step_rate, acceleration_time, current_block->acceleration_rate);
#endif
acc_step_rate += current_block->initial_rate;
}
// upper limit // upper limit
NOMORE(acc_step_rate, current_block->nominal_rate); NOMORE(acc_step_rate, current_block->nominal_rate);

3
Marlin/src/module/stepper.h
View file

@ -362,6 +362,9 @@ class Stepper {
OCR1A_nominal = calc_timer_interval(current_block->nominal_rate); OCR1A_nominal = calc_timer_interval(current_block->nominal_rate);
// make a note of the number of step loops required at nominal speed // make a note of the number of step loops required at nominal speed
step_loops_nominal = step_loops; step_loops_nominal = step_loops;
acc_step_rate = current_block->initial_rate;
acceleration_time = calc_timer_interval(acc_step_rate);
_NEXT_ISR(acceleration_time);
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
if (current_block->use_advance_lead) { if (current_block->use_advance_lead) {