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

Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.

Browse Source
This commit is contained in:
Marek Bel 2018-09-24 17:33:58 +02:00
parent ca179a2d18
commit c38fef281d
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/ConfigurationStore.cpp
View File

@ -99,9 +99,9 @@ void Config_PrintSettings(uint8_t level)
), ),
echomagic, echomagic, cs.axis_steps_per_unit[X_AXIS], cs.axis_steps_per_unit[Y_AXIS], cs.axis_steps_per_unit[Z_AXIS], cs.axis_steps_per_unit[E_AXIS], echomagic, echomagic, cs.axis_steps_per_unit[X_AXIS], cs.axis_steps_per_unit[Y_AXIS], cs.axis_steps_per_unit[Z_AXIS], cs.axis_steps_per_unit[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_normal[X_AXIS], cs.max_feedrate_normal[Y_AXIS], cs.max_feedrate_normal[Z_AXIS], cs.max_feedrate_normal[E_AXIS],
echomagic, echomagic, max_feedrate_silent[X_AXIS], max_feedrate_silent[Y_AXIS], max_feedrate_silent[Z_AXIS], max_feedrate_silent[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_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, max_acceleration_units_per_sq_second_silent[X_AXIS], max_acceleration_units_per_sq_second_silent[Y_AXIS], max_acceleration_units_per_sq_second_silent[Z_AXIS], max_acceleration_units_per_sq_second_silent[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.acceleration, cs.retract_acceleration, echomagic, echomagic, cs.acceleration, cs.retract_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.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] echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS]
@ -250,12 +250,12 @@ bool Config_RetrieveSettings(uint16_t offset)
{ {
if (cs.max_feedrate_normal[j] > NORMAL_MAX_FEEDRATE_XY) if (cs.max_feedrate_normal[j] > NORMAL_MAX_FEEDRATE_XY)
cs.max_feedrate_normal[j] = NORMAL_MAX_FEEDRATE_XY; cs.max_feedrate_normal[j] = NORMAL_MAX_FEEDRATE_XY;
if (max_feedrate_silent[j] > SILENT_MAX_FEEDRATE_XY) if (cs.max_feedrate_silent[j] > SILENT_MAX_FEEDRATE_XY)
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) 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; cs.max_acceleration_units_per_sq_second_normal[j] = NORMAL_MAX_ACCEL_XY;
if (max_acceleration_units_per_sq_second_silent[j] > SILENT_MAX_ACCEL_XY) if (cs.max_acceleration_units_per_sq_second_silent[j] > SILENT_MAX_ACCEL_XY)
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;
} }
#endif //TMC2130 #endif //TMC2130

2
Firmware/ConfigurationStore.h
View File

@ -33,7 +33,7 @@ typedef struct
float retract_recover_feedrate; float retract_recover_feedrate;
bool volumetric_enabled; 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 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]; float max_feedrate_silent[4]; //!< max speeds for silent mode
unsigned long max_acceleration_units_per_sq_second_silent[4]; unsigned long max_acceleration_units_per_sq_second_silent[4];
} __attribute__ ((packed)) M500_conf; } __attribute__ ((packed)) M500_conf;

4
Firmware/Marlin_main.cpp
View File

@ -5875,7 +5875,7 @@ Sigma_Exit:
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_normal[i] = val;
max_acceleration_units_per_sq_second_silent[i] = val_silent; cs.max_acceleration_units_per_sq_second_silent[i] = val_silent;
#else //TMC2130 #else //TMC2130
max_acceleration_units_per_sq_second[i] = val; max_acceleration_units_per_sq_second[i] = val;
#endif //TMC2130 #endif //TMC2130
@ -5907,7 +5907,7 @@ Sigma_Exit:
val_silent = SILENT_MAX_FEEDRATE_XY; val_silent = SILENT_MAX_FEEDRATE_XY;
} }
cs.max_feedrate_normal[i] = val; cs.max_feedrate_normal[i] = val;
max_feedrate_silent[i] = val_silent; cs.max_feedrate_silent[i] = val_silent;
#else //TMC2130 #else //TMC2130
max_feedrate[i] = val; max_feedrate[i] = val;
#endif //TMC2130 #endif //TMC2130

6
Firmware/planner.cpp
View File

@ -73,12 +73,10 @@
//=========================================================================== //===========================================================================
// Use M203 to override by software // Use M203 to override by software
float max_feedrate_silent[NUM_AXIS]; // max speeds for silent mode
float* max_feedrate = cs.max_feedrate_normal; float* max_feedrate = cs.max_feedrate_normal;
// Use M201 to override by software // Use M201 to override by software
unsigned long max_acceleration_units_per_sq_second_silent[NUM_AXIS];
unsigned long* max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal; unsigned long* max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal;
unsigned long axis_steps_per_sqr_second[NUM_AXIS]; unsigned long axis_steps_per_sqr_second[NUM_AXIS];
@ -1318,8 +1316,8 @@ void update_mode_profile()
} }
else if (tmc2130_mode == TMC2130_MODE_SILENT) else if (tmc2130_mode == TMC2130_MODE_SILENT)
{ {
max_feedrate = max_feedrate_silent; max_feedrate = cs.max_feedrate_silent;
max_acceleration_units_per_sq_second = max_acceleration_units_per_sq_second_silent; max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_silent;
} }
reset_acceleration_rates(); reset_acceleration_rates();
} }

2
Firmware/planner.h
View File

@ -159,12 +159,10 @@ extern bool e_active();
void check_axes_activity(); void check_axes_activity();
// Use M203 to override by software // Use M203 to override by software
extern float max_feedrate_silent[NUM_AXIS];
extern float* max_feedrate; extern float* max_feedrate;
// Use M201 to override by software // Use M201 to override by software
extern unsigned long max_acceleration_units_per_sq_second_silent[NUM_AXIS];
extern unsigned long* max_acceleration_units_per_sq_second; extern unsigned long* max_acceleration_units_per_sq_second;
extern unsigned long axis_steps_per_sqr_second[NUM_AXIS]; extern unsigned long axis_steps_per_sqr_second[NUM_AXIS];