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

Optimize by hand since the lto is still stooopit

Browse source 
saves ~100B
This commit is contained in:
Alex Voinea 2022-08-15 22:12:31 +03:00
parent b27c8b50e0
commit 671519caf3
2 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Firmware/Marlin.h
View file

@ -289,6 +289,7 @@ extern float default_retraction;
void get_coordinates(); void get_coordinates();
void prepare_move(uint16_t start_segment_idx = 0); void prepare_move(uint16_t start_segment_idx = 0);
void prepare_arc_move(bool isclockwise, uint16_t start_segment_idx = 0); void prepare_arc_move(bool isclockwise, uint16_t start_segment_idx = 0);
uint16_t restore_interrupted_gcode();
#ifdef TMC2130 #ifdef TMC2130
void homeaxis(uint8_t axis, uint8_t cnt = 1, uint8_t* pstep = 0); void homeaxis(uint8_t axis, uint8_t cnt = 1, uint8_t* pstep = 0);

50
Firmware/Marlin_main.cpp
View file

@ -4648,20 +4648,7 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,0xFFFF);
case 0: // G0 -> G1 case 0: // G0 -> G1
case 1: // G1 case 1: // G1
{ {
// When recovering from a previous print move, restore the originally uint16_t start_segment_idx = restore_interrupted_gcode();
// calculated start position on the first USB/SD command. This accounts
// properly for relative moves
uint16_t start_segment_idx = 1;
if (
(saved_start_position[0] != SAVED_START_POSITION_UNSET) && (
(CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_SDCARD) ||
(CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)
)
) {
memcpy(current_position, saved_start_position, sizeof(current_position));
saved_start_position[0] = SAVED_START_POSITION_UNSET;
start_segment_idx = saved_segment_idx;
}
get_coordinates(); // For X Y Z E F get_coordinates(); // For X Y Z E F
if (total_filament_used > ((current_position[E_AXIS] - destination[E_AXIS]) * 100)) { //protection against total_filament_used overflow if (total_filament_used > ((current_position[E_AXIS] - destination[E_AXIS]) * 100)) { //protection against total_filament_used overflow
@ -4711,25 +4698,12 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,0xFFFF);
case 2: case 2:
case 3: case 3:
{ {
// When recovering from a previous print move, restore the originally uint16_t start_segment_idx = restore_interrupted_gcode();
// calculated start position on the first USB/SD command. This accounts
// properly for relative moves
uint16_t start_segment_idx = 1;
if (
(saved_start_position[0] != SAVED_START_POSITION_UNSET) && (
(CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_SDCARD) ||
(CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)
)
) {
memcpy(current_position, saved_start_position, sizeof(current_position));
saved_start_position[0] = SAVED_START_POSITION_UNSET;
start_segment_idx = saved_segment_idx;
}
#ifdef SF_ARC_FIX #ifdef SF_ARC_FIX
bool relative_mode_backup = relative_mode; bool relative_mode_backup = relative_mode;
relative_mode = true; relative_mode = true;
#endif #endif
get_coordinates(); get_coordinates(); // For X Y Z E F
#ifdef SF_ARC_FIX #ifdef SF_ARC_FIX
relative_mode=relative_mode_backup; relative_mode=relative_mode_backup;
#endif #endif
@ -9503,6 +9477,24 @@ void clamp_to_software_endstops(float target[3])
} }
} }
uint16_t restore_interrupted_gcode() {
// When recovering from a previous print move, restore the originally
// calculated start position on the first USB/SD command. This accounts
// properly for relative moves
if (
(saved_start_position[0] != SAVED_START_POSITION_UNSET) && (
(CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_SDCARD) ||
(CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)
)
) {
memcpy(current_position, saved_start_position, sizeof(current_position));
saved_start_position[0] = SAVED_START_POSITION_UNSET;
return saved_segment_idx;
}
else
return 0;
}
#ifdef MESH_BED_LEVELING #ifdef MESH_BED_LEVELING
void mesh_plan_buffer_line(const float &x, const float &y, const float &z, const float &e, const float &feed_rate, const uint8_t extruder, uint16_t start_segment_idx = 0) { void mesh_plan_buffer_line(const float &x, const float &y, const float &z, const float &e, const float &feed_rate, const uint8_t extruder, uint16_t start_segment_idx = 0) {
float dx = x - current_position[X_AXIS]; float dx = x - current_position[X_AXIS];