3d-print/anadyr-marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Configurable Max Accel, Max Feedrate, Max Jerk edit limits (#13929)

Browse Source
This commit is contained in:
InsanityAutomation
2019-10-01 20:59:48 -04:00
committed by Scott Lahteine
parent f9400b6a3c
commit 438835f6a5
130 changed files with 1912 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@@ -577,12 +577,11 @@ namespace ExtUI {
}
void setAxisMaxFeedrate_mm_s(const feedRate_t value, const axis_t axis) {
planner.settings.max_feedrate_mm_s[axis] = value;
planner.set_max_feedrate(axis, value);
}
void setAxisMaxFeedrate_mm_s(const feedRate_t value, const extruder_t extruder) {
UNUSED_E(extruder);
planner.settings.max_feedrate_mm_s[E_AXIS_N(axis - E0)] = value;
planner.set_max_feedrate(E_AXIS_N(extruder - E0), value);
}
float getAxisMaxAcceleration_mm_s2(const axis_t axis) {
@@ -595,12 +594,11 @@ namespace ExtUI {
}
void setAxisMaxAcceleration_mm_s2(const float value, const axis_t axis) {
planner.settings.max_acceleration_mm_per_s2[axis] = value;
planner.set_max_acceleration(axis, value);
}
void setAxisMaxAcceleration_mm_s2(const float value, const extruder_t extruder) {
UNUSED_E(extruder);
planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(extruder - E0)] = value;
planner.set_max_acceleration(E_AXIS_N(extruder - E0), value);
}
#if HAS_FILAMENT_SENSOR
@@ -648,11 +646,11 @@ namespace ExtUI {
}
void setAxisMaxJerk_mm_s(const float value, const axis_t axis) {
planner.max_jerk[axis] = value;
planner.set_max_jerk((AxisEnum)axis, value);
}
void setAxisMaxJerk_mm_s(const float value, const extruder_t) {
planner.max_jerk.e = value;
planner.set_max_jerk(E_AXIS, value);
}
#endif