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

Use inlined function set_destination_to_current() in more places 

Saves 70 bytes of flash memory
This commit is contained in:
Guðni Már Gilbert 2021-08-14 21:43:00 +00:00
parent a8d16d2949
commit 52aa5a5f00
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -2827,7 +2827,7 @@ static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, lon
enable_endstops(true); enable_endstops(true);
memcpy(destination, current_position, sizeof(destination)); set_destination_to_current();
feedrate = 0.0; feedrate = 0.0;
#if Z_HOME_DIR > 0 // If homing away from BED do Z first #if Z_HOME_DIR > 0 // If homing away from BED do Z first
@ -3850,7 +3850,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
plan_set_e_position(lastpos[E_AXIS]); plan_set_e_position(lastpos[E_AXIS]);
memcpy(current_position, lastpos, sizeof(lastpos)); memcpy(current_position, lastpos, sizeof(lastpos));
memcpy(destination, current_position, sizeof(current_position)); set_destination_to_current();
//Recover feed rate //Recover feed rate
feedmultiply = feedmultiplyBckp; feedmultiply = feedmultiplyBckp;
@ -9115,7 +9115,7 @@ Sigma_Exit:
#if EXTRUDERS > 1 #if EXTRUDERS > 1
if (tmp_extruder != active_extruder) { if (tmp_extruder != active_extruder) {
// Save current position to return to after applying extruder offset // Save current position to return to after applying extruder offset
memcpy(destination, current_position, sizeof(destination)); set_destination_to_current();
// Offset extruder (only by XY) // Offset extruder (only by XY)
int i; int i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
@ -11442,7 +11442,7 @@ bool recover_machine_state_after_power_panic()
// 5) Set the physical positions from the logical positions using the world2machine transformation // 5) Set the physical positions from the logical positions using the world2machine transformation
// This is only done to inizialize Z/E axes with physical locations, since X/Y are unknown. // This is only done to inizialize Z/E axes with physical locations, since X/Y are unknown.
clamp_to_software_endstops(current_position); clamp_to_software_endstops(current_position);
memcpy(destination, current_position, sizeof(destination)); set_destination_to_current();
plan_set_position_curposXYZE(); plan_set_position_curposXYZE();
SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial ");
print_world_coordinates(); print_world_coordinates();
@ -11775,7 +11775,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS] + z_move, saved_pos[E_AXIS] + e_move, homing_feedrate[Z_AXIS], active_extruder); plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS] + z_move, saved_pos[E_AXIS] + e_move, homing_feedrate[Z_AXIS], active_extruder);
st_synchronize(); //wait moving st_synchronize(); //wait moving
memcpy(current_position, saved_pos, sizeof(saved_pos)); memcpy(current_position, saved_pos, sizeof(saved_pos));
memcpy(destination, current_position, sizeof(destination)); set_destination_to_current();
#endif #endif
waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack
} }
@ -11843,7 +11843,7 @@ void restore_print_from_ram_and_continue(float e_move)
feedmultiply = saved_feedmultiply2; feedmultiply = saved_feedmultiply2;
memcpy(current_position, saved_pos, sizeof(saved_pos)); memcpy(current_position, saved_pos, sizeof(saved_pos));
memcpy(destination, current_position, sizeof(destination)); set_destination_to_current();
if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing
card.setIndex(saved_sdpos); card.setIndex(saved_sdpos);
sdpos_atomic = saved_sdpos; sdpos_atomic = saved_sdpos;

2
Firmware/mesh_bed_calibration.cpp
View File

@ -2852,7 +2852,7 @@ bool sample_mesh_and_store_reference()
current_position[Y_AXIS] = BED_Y0; current_position[Y_AXIS] = BED_Y0;
world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]);
go_to_current(homing_feedrate[X_AXIS]/60); go_to_current(homing_feedrate[X_AXIS]/60);
memcpy(destination, current_position, sizeof(destination)); set_destination_to_current();
enable_endstops(true); enable_endstops(true);
homeaxis(Z_AXIS); homeaxis(Z_AXIS);