diff --git a/gcode.c b/gcode.c index 43b7dae..27e6e76 100644 --- a/gcode.c +++ b/gcode.c @@ -2242,12 +2242,12 @@ status_code_t gc_execute_block (char *block) break; case NonModal_SetAccelerationProfile: - if (!gc_block.values.p) - gc_block.values.p = 1.0f; - else if (gc_block.values.p < 1.0f) - FAIL(Status_NegativeValue); - else if (gc_block.values.p > 5.0f) - FAIL(Status_GcodeValueOutOfRange); + if (!gc_block.values.p){ + gc_block.values.p = 1.0f;} + else if (gc_block.values.p < 1.0f){ + FAIL(Status_NegativeValue);} + else if (gc_block.values.p > 5.0f){ + FAIL(Status_GcodeValueOutOfRange);} uint8_t idx = N_AXIS; do { idx--; diff --git a/settings.c b/settings.c index faab20f..d5827ac 100644 --- a/settings.c +++ b/settings.c @@ -871,7 +871,7 @@ bool settings_override_acceleration (uint8_t axis, float acceleration, float jer } else { if(!override_backup.valid) save_override_backup(); - settings.axis[axis].acceleration = (override_backup.acceleration[axis] >= (acceleration * 60.0f * 60.0f)) ? (acceleration * 60.0f * 60.0f) : override_backup.aceceleration[axis]; // Limited to max setting value + settings.axis[axis].acceleration = (override_backup.acceleration[axis] >= (acceleration * 60.0f * 60.0f)) ? (acceleration * 60.0f * 60.0f) : override_backup.acceleration[axis]; // Limited to max setting value } if(jerk <= 0.0f) { if(override_backup.valid) diff --git a/settings.h b/settings.h index f5ecbc3..5868ffb 100644 --- a/settings.h +++ b/settings.h @@ -958,7 +958,7 @@ void settings_write_coord_data(coord_system_id_t id, float (*coord_data)[N_AXIS] bool settings_read_coord_data(coord_system_id_t id, float (*coord_data)[N_AXIS]); // Temporarily override acceleration, if 0 restore to configured setting value -bool settings_override_acceleration (uint8_t axis, float acceleration); +bool settings_override_acceleration (uint8_t axis, float acceleration, float jerk); void settings_register (setting_details_t *details); setting_details_t *settings_get_details (void);