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

Fix position_float after a quickStop condition

Browse Source
This commit is contained in:
Yuri D'Elia 2019-06-05 13:00:26 +02:00
parent fa454f61e4
commit dc436b71fe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/planner.cpp
View File

@ -127,7 +127,7 @@ float extrude_min_temp=EXTRUDE_MINTEMP;
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
float extruder_advance_K = LIN_ADVANCE_K; float extruder_advance_K = LIN_ADVANCE_K;
float position_float[NUM_AXIS] = { 0, 0, 0, 0 }; float position_float[NUM_AXIS];
#endif #endif
// Returns the index of the next block in the ring buffer // Returns the index of the next block in the ring buffer
@ -441,7 +441,7 @@ void plan_init() {
block_buffer_tail = 0; block_buffer_tail = 0;
memset(position, 0, sizeof(position)); // clear position memset(position, 0, sizeof(position)); // clear position
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
memset(position_float, 0, sizeof(position)); // clear position memset(position_float, 0, sizeof(position_float)); // clear position
#endif #endif
previous_speed[0] = 0.0; previous_speed[0] = 0.0;
previous_speed[1] = 0.0; previous_speed[1] = 0.0;
@ -655,7 +655,9 @@ void planner_abort_hard()
// Apply inverse world correction matrix. // Apply inverse world correction matrix.
machine2world(current_position[X_AXIS], current_position[Y_AXIS]); machine2world(current_position[X_AXIS], current_position[Y_AXIS]);
memcpy(destination, current_position, sizeof(destination)); memcpy(destination, current_position, sizeof(destination));
#ifdef LIN_ADVANCE
memcpy(position_float, current_position, sizeof(position_float));
#endif
// Resets planner junction speeds. Assumes start from rest. // Resets planner junction speeds. Assumes start from rest.
previous_nominal_speed = 0.0; previous_nominal_speed = 0.0;
previous_speed[0] = 0.0; previous_speed[0] = 0.0;