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

dda.c: c_limit calculation is only for non-temporal configs 

no functional change, but saves 24 bytes when using acceleration temporal
This commit is contained in:
Nico Tonnhofer 2016-12-18 19:41:44 +01:00
parent a1cca9bdad
commit 104cc0b757
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dda.c
View File

@ -152,7 +152,10 @@ void dda_new_startpoint(void) {
void dda_create(DDA *dda, const TARGET *target) { void dda_create(DDA *dda, const TARGET *target) {
axes_uint32_t delta_um; axes_uint32_t delta_um;
axes_int32_t steps; axes_int32_t steps;
uint32_t distance, c_limit, c_limit_calc; uint32_t distance;
#ifndef ACCELERATION_TEMPORAL
uint32_t c_limit, c_limit_calc;
#endif
enum axis_e i; enum axis_e i;
#ifdef ACCELERATION_RAMPING #ifdef ACCELERATION_RAMPING
// Number the moves to identify them; allowed to overflow. // Number the moves to identify them; allowed to overflow.
@ -313,7 +316,6 @@ void dda_create(DDA *dda, const TARGET *target) {
// changed distance * 6000 .. * F_CPU / 100000 to // changed distance * 6000 .. * F_CPU / 100000 to
// distance * 2400 .. * F_CPU / 40000 so we can move a distance of up to 1800mm without overflowing // distance * 2400 .. * F_CPU / 40000 so we can move a distance of up to 1800mm without overflowing
uint32_t move_duration = ((distance * 2400) / dda->total_steps) * (F_CPU / 40000); uint32_t move_duration = ((distance * 2400) / dda->total_steps) * (F_CPU / 40000);
#endif
// similarly, find out how fast we can run our axes. // similarly, find out how fast we can run our axes.
// do this for each axis individually, as the combined speed of two or more axes can be higher than the capabilities of a single one. // do this for each axis individually, as the combined speed of two or more axes can be higher than the capabilities of a single one.
@ -329,7 +331,7 @@ void dda_create(DDA *dda, const TARGET *target) {
if (c_limit_calc > c_limit) if (c_limit_calc > c_limit)
c_limit = c_limit_calc; c_limit = c_limit_calc;
} }
#endif
#ifdef ACCELERATION_REPRAP #ifdef ACCELERATION_REPRAP
// c is initial step time in IOclk ticks // c is initial step time in IOclk ticks
dda->c = move_duration / startpoint.F; dda->c = move_duration / startpoint.F;