Permalink
Browse files

fix bug introduced by 2421b78: dda struct requires c member even with…

… no acceleration, it is used for feedrate
  • Loading branch information...
triffid committed Jul 7, 2011
1 parent 131d739 commit 49e2844213fb4e4af2332f0e45347236f7f86b94
Showing with 2 additions and 4 deletions.
  1. +2 −4 dda.h
View
6 dda.h
@@ -104,10 +104,8 @@ typedef struct {
/// total number of steps: set to \f$\max(\Delta x, \Delta y, \Delta z, \Delta e)\f$
uint32_t total_steps;
- // linear acceleration variables: c and end_c are 24.8 fixed point timer values, n is the tracking variable
- #ifndef ACCELERATION_RAMPING
- uint32_t c; ///< time until next step
- #endif
+ uint32_t c; ///< time until next step, 24.8 fixed point
+
#ifdef ACCELERATION_REPRAP
uint32_t end_c; ///< time between 2nd last step and last step
int32_t n; ///< precalculated step time offset variable. At every step we calculate \f$c = c - (2 c / n)\f$; \f$n+=4\f$. See http://www.embedded.com/columns/technicalinsights/56800129?printable=true for full description

0 comments on commit 49e2844

Please sign in to comment.