3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

max_feedrate and max_acceleration limitation fix (M201, M203)

Browse source
This commit is contained in:
Robert Pelnar 2018-07-21 12:24:57 +02:00
parent 980c044dac
commit f07d08697a
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Firmware/Marlin_main.cpp
View file

@ -5748,18 +5748,19 @@ Sigma_Exit:
{
int val = code_value();
#ifdef TMC2130
int val_silent = val;
if ((i == X_AXIS) || (i == Y_AXIS))
{
int max_val = 0;
if (tmc2130_mode == TMC2130_MODE_NORMAL)
max_val = NORMAL_MAX_ACCEL_XY;
else if (tmc2130_mode == TMC2130_MODE_SILENT)
max_val = SILENT_MAX_ACCEL_XY;
if (val > max_val)
val = max_val;
if (val > NORMAL_MAX_ACCEL_XY)
val = NORMAL_MAX_ACCEL_XY;
if (val_silent > SILENT_MAX_ACCEL_XY)
val_silent = SILENT_MAX_ACCEL_XY;
}
#endif
max_acceleration_units_per_sq_second_normal[i] = val;
max_acceleration_units_per_sq_second_silent[i] = val_silent;
#else //TMC2130
max_acceleration_units_per_sq_second[i] = val;
#endif //TMC2130
}
}
// steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner)
@ -5779,18 +5780,19 @@ Sigma_Exit:
{
float val = code_value();
#ifdef TMC2130
float val_silent = val;
if ((i == X_AXIS) || (i == Y_AXIS))
{
float max_val = 0;
if (tmc2130_mode == TMC2130_MODE_NORMAL)
max_val = NORMAL_MAX_FEEDRATE_XY;
else if (tmc2130_mode == TMC2130_MODE_SILENT)
max_val = SILENT_MAX_FEEDRATE_XY;
if (val > max_val)
val = max_val;
if (val > NORMAL_MAX_FEEDRATE_XY)
val = NORMAL_MAX_FEEDRATE_XY;
if (val_silent > SILENT_MAX_FEEDRATE_XY)
val_silent = SILENT_MAX_FEEDRATE_XY;
}
#endif //TMC2130
max_feedrate_normal[i] = val;
max_feedrate_silent[i] = val_silent;
#else //TMC2130
max_feedrate[i] = val;
#endif //TMC2130
}
}
break;