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

fix bug introduced by 2421b788: dda struct requires c member even with no acceleration, it is used for feedrate

This commit is contained in:
Michael Moon 2011-07-08 09:56:43 +10:00
parent 131d7390c0
commit 49e2844213
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dda.h
View File

@ -104,10 +104,8 @@ typedef struct {
/// total number of steps: set to \f$\max(\Delta x, \Delta y, \Delta z, \Delta e)\f$ /// total number of steps: set to \f$\max(\Delta x, \Delta y, \Delta z, \Delta e)\f$
uint32_t total_steps; uint32_t total_steps;
// linear acceleration variables: c and end_c are 24.8 fixed point timer values, n is the tracking variable uint32_t c; ///< time until next step, 24.8 fixed point
#ifndef ACCELERATION_RAMPING
uint32_t c; ///< time until next step
#endif
#ifdef ACCELERATION_REPRAP #ifdef ACCELERATION_REPRAP
uint32_t end_c; ///< time between 2nd last step and last step 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 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