josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dda_lookahead.c: simplify bailout condition tests. 

We have the nullmove flag already and the current move can't be
a nullmove, because in this case we wouldn't enter the function.
This commit is contained in:
Markus Hitter 2013-10-25 12:55:54 +02:00
parent ed6a66c25d
commit fe985a18d3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dda.c
View File

@ -382,7 +382,7 @@ void dda_create(DDA *dda, TARGET *target, DDA *prev_dda) {
if (dda->c < c_limit) if (dda->c < c_limit)
dda->c = c_limit; dda->c = c_limit;
#endif #endif
} } /* ! dda->total_steps == 0 */
if (DEBUG_DDA && (debug_flags & DEBUG_DDA)) if (DEBUG_DDA && (debug_flags & DEBUG_DDA))
serial_writestr_P(PSTR("] }\n")); serial_writestr_P(PSTR("] }\n"));

10
dda_lookahead.c
View File

@ -185,9 +185,9 @@ void dda_join_moves(DDA *prev, DDA *current) {
moveno++; moveno++;
#endif #endif
// Sanity: if the previous move or this one has no actual movement, bail now. (e.g. G1 F1500) // Bail out if there's nothing to join (e.g. G1 F1500).
if(prev->delta.X==0 && prev->delta.Y==0 && prev->delta.Z==0 && prev->delta.E==0) return; if ( ! prev || prev->nullmove)
if(current->delta.X==0 && current->delta.Y==0 && current->delta.Z==0 && current->delta.E==0) return; return;
serprintf(PSTR("Current Delta: %ld,%ld,%ld E:%ld Live:%d\r\n"), current->delta.X, current->delta.Y, current->delta.Z, current->delta.E, current->live); serprintf(PSTR("Current Delta: %ld,%ld,%ld E:%ld Live:%d\r\n"), current->delta.X, current->delta.Y, current->delta.Z, current->delta.E, current->live);
serprintf(PSTR("Prev Delta: %ld,%ld,%ld E:%ld Live:%d\r\n"), prev->delta.X, prev->delta.Y, prev->delta.Z, prev->delta.E, prev->live); serprintf(PSTR("Prev Delta: %ld,%ld,%ld E:%ld Live:%d\r\n"), prev->delta.X, prev->delta.Y, prev->delta.Z, prev->delta.E, prev->live);
@ -196,7 +196,7 @@ void dda_join_moves(DDA *prev, DDA *current) {
// Note: moves are only modified after the calculations are complete. // Note: moves are only modified after the calculations are complete.
// Only prepare for look-ahead if we have 2 available moves to // Only prepare for look-ahead if we have 2 available moves to
// join and the Z axis is unused (for now, Z axis moves are NOT joined). // join and the Z axis is unused (for now, Z axis moves are NOT joined).
if(prev!=NULL && prev->live==0 && prev->delta.Z==current->delta.Z) { if (prev->live == 0 && prev->delta.Z == current->delta.Z) {
// Calculate the jerk if the previous move and this move would be joined // Calculate the jerk if the previous move and this move would be joined
// together at full speed. // together at full speed.
jerk = dda_jerk_size_2d(prev->delta.X, prev->delta.Y, prev->endpoint.F, jerk = dda_jerk_size_2d(prev->delta.X, prev->delta.Y, prev->endpoint.F,
@ -210,7 +210,7 @@ void dda_join_moves(DDA *prev, DDA *current) {
} }
// Make sure we have 2 moves and the previous move is not already active // Make sure we have 2 moves and the previous move is not already active
if(prev!=NULL && prev->live==0) { if (prev->live == 0) {
// Perform an atomic copy to preserve volatile parameters during the calculations // Perform an atomic copy to preserve volatile parameters during the calculations
ATOMIC_START ATOMIC_START
prev_id = prev->id; prev_id = prev->id;