diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 3c439df68..d5a5d10da 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -34,8 +34,8 @@ void Config_PrintSettings(uint8_t level) echomagic, echomagic, cs.axis_ustep_resolution[X_AXIS], cs.axis_ustep_resolution[Y_AXIS], cs.axis_ustep_resolution[Z_AXIS], cs.axis_ustep_resolution[E_AXIS], echomagic, echomagic, cs.max_feedrate_normal[X_AXIS], cs.max_feedrate_normal[Y_AXIS], cs.max_feedrate_normal[Z_AXIS], cs.max_feedrate_normal[E_AXIS], echomagic, echomagic, cs.max_feedrate_silent[X_AXIS], cs.max_feedrate_silent[Y_AXIS], cs.max_feedrate_silent[Z_AXIS], cs.max_feedrate_silent[E_AXIS], - echomagic, echomagic, cs.max_acceleration_units_per_sq_second_normal[X_AXIS], cs.max_acceleration_units_per_sq_second_normal[Y_AXIS], cs.max_acceleration_units_per_sq_second_normal[Z_AXIS], cs.max_acceleration_units_per_sq_second_normal[E_AXIS], - echomagic, echomagic, cs.max_acceleration_units_per_sq_second_silent[X_AXIS], cs.max_acceleration_units_per_sq_second_silent[Y_AXIS], cs.max_acceleration_units_per_sq_second_silent[Z_AXIS], cs.max_acceleration_units_per_sq_second_silent[E_AXIS], + echomagic, echomagic, cs.max_acceleration_mm_per_s2_normal[X_AXIS], cs.max_acceleration_mm_per_s2_normal[Y_AXIS], cs.max_acceleration_mm_per_s2_normal[Z_AXIS], cs.max_acceleration_mm_per_s2_normal[E_AXIS], + echomagic, echomagic, cs.max_acceleration_mm_per_s2_silent[X_AXIS], cs.max_acceleration_mm_per_s2_silent[Y_AXIS], cs.max_acceleration_mm_per_s2_silent[Z_AXIS], cs.max_acceleration_mm_per_s2_silent[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.minsegmenttime, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS] @@ -50,7 +50,7 @@ void Config_PrintSettings(uint8_t level) ), echomagic, echomagic, cs.axis_steps_per_mm[X_AXIS], cs.axis_steps_per_mm[Y_AXIS], cs.axis_steps_per_mm[Z_AXIS], cs.axis_steps_per_mm[E_AXIS], echomagic, echomagic, max_feedrate[X_AXIS], max_feedrate[Y_AXIS], max_feedrate[Z_AXIS], max_feedrate[E_AXIS], - echomagic, echomagic, max_acceleration_units_per_sq_second[X_AXIS], max_acceleration_units_per_sq_second[Y_AXIS], max_acceleration_units_per_sq_second[Z_AXIS], max_acceleration_units_per_sq_second[E_AXIS], + echomagic, echomagic, max_acceleration_mm_per_s2[X_AXIS], max_acceleration_mm_per_s2[Y_AXIS], max_acceleration_mm_per_s2[Z_AXIS], max_acceleration_mm_per_s2[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.minsegmenttime, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS] @@ -114,8 +114,8 @@ void Config_PrintSettings(uint8_t level) static_assert (EXTRUDERS == 1, "ConfigurationStore M500_conf not implemented for more extruders, fix filament_size array size."); static_assert (NUM_AXIS == 4, "ConfigurationStore M500_conf not implemented for more axis." - "Fix axis_steps_per_mm max_feedrate_normal max_acceleration_units_per_sq_second_normal max_jerk max_feedrate_silent" - " max_acceleration_units_per_sq_second_silent array size."); + "Fix axis_steps_per_mm max_feedrate_normal max_acceleration_mm_per_s2_normal max_jerk max_feedrate_silent" + " max_acceleration_mm_per_s2_silent array size."); #ifdef ENABLE_AUTO_BED_LEVELING static_assert (false, "zprobe_zoffset was not initialized in printers in field to -(Z_PROBE_OFFSET_FROM_EXTRUDER), so it contains" "0.0, if this is not acceptable, increment EEPROM_VERSION to force use default_conf"); @@ -210,9 +210,9 @@ bool Config_RetrieveSettings() // Initialize the travel_acceleration in eeprom if not already eeprom_init_default_float(&EEPROM_M500_base->travel_acceleration, pgm_read_float(&default_conf.travel_acceleration)); - // Initialize the max_feedrate_silent and max_acceleration_units_per_sq_second_silent in eeprom if not already + // Initialize the max_feedrate_silent and max_acceleration_mm_per_s2_silent in eeprom if not already eeprom_init_default_block(&EEPROM_M500_base->max_feedrate_silent, sizeof(EEPROM_M500_base->max_feedrate_silent), default_conf.max_feedrate_silent); - eeprom_init_default_block(&EEPROM_M500_base->max_acceleration_units_per_sq_second_silent, sizeof(EEPROM_M500_base->max_acceleration_units_per_sq_second_silent), default_conf.max_acceleration_units_per_sq_second_silent); + eeprom_init_default_block(&EEPROM_M500_base->max_acceleration_mm_per_s2_silent, sizeof(EEPROM_M500_base->max_acceleration_mm_per_s2_silent), default_conf.max_acceleration_mm_per_s2_silent); // load the CS to RAM eeprom_read_block(reinterpret_cast(&cs), reinterpret_cast(EEPROM_M500_base), sizeof(cs)); @@ -225,10 +225,10 @@ bool Config_RetrieveSettings() cs.max_feedrate_normal[j] = NORMAL_MAX_FEEDRATE_XY; if (cs.max_feedrate_silent[j] > SILENT_MAX_FEEDRATE_XY) cs.max_feedrate_silent[j] = SILENT_MAX_FEEDRATE_XY; - if (cs.max_acceleration_units_per_sq_second_normal[j] > NORMAL_MAX_ACCEL_XY) - cs.max_acceleration_units_per_sq_second_normal[j] = NORMAL_MAX_ACCEL_XY; - if (cs.max_acceleration_units_per_sq_second_silent[j] > SILENT_MAX_ACCEL_XY) - cs.max_acceleration_units_per_sq_second_silent[j] = SILENT_MAX_ACCEL_XY; + if (cs.max_acceleration_mm_per_s2_normal[j] > NORMAL_MAX_ACCEL_XY) + cs.max_acceleration_mm_per_s2_normal[j] = NORMAL_MAX_ACCEL_XY; + if (cs.max_acceleration_mm_per_s2_silent[j] > SILENT_MAX_ACCEL_XY) + cs.max_acceleration_mm_per_s2_silent[j] = SILENT_MAX_ACCEL_XY; } if(cs.axis_ustep_resolution[X_AXIS] == 0xff){ cs.axis_ustep_resolution[X_AXIS] = TMC2130_USTEPS_XY; } diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index de6bc0645..08a27413c 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -11,7 +11,7 @@ typedef struct char version[4]; float axis_steps_per_mm[4]; float max_feedrate_normal[4]; - unsigned long max_acceleration_units_per_sq_second_normal[4]; + unsigned long max_acceleration_mm_per_s2_normal[4]; float acceleration; //!< Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX float retract_acceleration; //!< mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX float minimumfeedrate; @@ -36,7 +36,7 @@ typedef struct bool volumetric_enabled; float filament_size[1]; //!< cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder. float max_feedrate_silent[4]; //!< max speeds for silent mode - unsigned long max_acceleration_units_per_sq_second_silent[4]; + unsigned long max_acceleration_mm_per_s2_silent[4]; unsigned char axis_ustep_resolution[4]; float travel_acceleration; //!< travel acceleration mm/s^2 // Arc Interpolation Settings, configurable via M214 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 35ff46d80..e025dd743 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6695,10 +6695,10 @@ Sigma_Exit: if (val_silent > SILENT_MAX_ACCEL_XY) val_silent = SILENT_MAX_ACCEL_XY; } - cs.max_acceleration_units_per_sq_second_normal[i] = val; - cs.max_acceleration_units_per_sq_second_silent[i] = val_silent; + cs.max_acceleration_mm_per_s2_normal[i] = val; + cs.max_acceleration_mm_per_s2_silent[i] = val_silent; #else //TMC2130 - max_acceleration_units_per_sq_second[i] = val; + max_acceleration_mm_per_s2[i] = val; #endif //TMC2130 } } diff --git a/Firmware/la10compat.cpp b/Firmware/la10compat.cpp index d729186fe..060bf2391 100644 --- a/Firmware/la10compat.cpp +++ b/Firmware/la10compat.cpp @@ -74,7 +74,7 @@ float la10c_jerk(float j) // check for a compatible range of values prior to convert (be sure that // a higher E-jerk would still be compatible wrt the E accell range) - if(j < 4.5 && cs.max_acceleration_units_per_sq_second_normal[E_AXIS] < 2000) + if(j < 4.5 && cs.max_acceleration_mm_per_s2_normal[E_AXIS] < 2000) return j; // bring low E-jerk values into equivalent LA 1.5 values by diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 766d383bc..b77c2345d 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -81,7 +81,7 @@ float* max_feedrate = cs.max_feedrate_normal; // Use M201 to override by software -unsigned long* max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal; +unsigned long* max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; #ifdef ENABLE_AUTO_BED_LEVELING @@ -1370,7 +1370,7 @@ void set_extrude_min_temp(int temp) void reset_acceleration_rates() { for(int8_t i=0; i < NUM_AXIS; i++) - max_acceleration_steps_per_s2[i] = max_acceleration_units_per_sq_second[i] * cs.axis_steps_per_mm[i]; + max_acceleration_steps_per_s2[i] = max_acceleration_mm_per_s2[i] * cs.axis_steps_per_mm[i]; } #ifdef TMC2130 @@ -1379,12 +1379,12 @@ void update_mode_profile() if (tmc2130_mode == TMC2130_MODE_NORMAL) { max_feedrate = cs.max_feedrate_normal; - max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal; + max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; } else if (tmc2130_mode == TMC2130_MODE_SILENT) { max_feedrate = cs.max_feedrate_silent; - max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_silent; + max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_silent; } reset_acceleration_rates(); } diff --git a/Firmware/planner.h b/Firmware/planner.h index cd1cd2d34..32410d67d 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -187,7 +187,7 @@ extern float* max_feedrate; // Use M201 to override by software -extern unsigned long* max_acceleration_units_per_sq_second; +extern unsigned long* max_acceleration_mm_per_s2; extern unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; extern long position[NUM_AXIS];