Skip to content

Planner: Acceleration parity with 1.1.0 and some optimizations #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thinkyhead wants to merge 2 commits into from
Closed

Planner: Acceleration parity with 1.1.0 and some optimizations #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dbf324
Optimize planner, utilize updated acceleration limit code
thinkyhead Oct 11, 2016
dde3944
Adjust some spacing & syntax in planner.cpp
thinkyhead Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Firmware/Marlin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,17 @@ void setPwmFrequency(uint8_t pin, int val);
#define CRITICAL_SECTION_END SREG = _sreg;
#endif //CRITICAL_SECTION_START

// Array sizes
#define ABC 3
#define XYZ 3
#define ABCE 4
#define ABZE 4
#define XYZE 4

// Macros to contrain values
#define NOLESS(v,n) do{ if (v < n) v = n; }while(0)
#define NOMORE(v,n) do{ if (v > n) v = n; }while(0)

extern float homing_feedrate[];
extern bool axis_relative_modes[];
extern int feedmultiply;
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3665,7 +3665,7 @@ SERIAL_PROTOCOLPGM("\n\n");
float factor = axis_steps_per_unit[i] / value; // increase e constants if M92 E14 is given for netfab.
max_jerk[E_AXIS] *= factor;
max_feedrate[i] *= factor;
axis_steps_per_sqr_second[i] *= factor;
max_acceleration_steps_per_s2[i] *= factor;
}
axis_steps_per_unit[i] = value;
}
Expand Down
Loading