CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This fix is not DELTA compatible

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-02 17:11:54 -07:00
parent 064efb20e0
commit 664b299a51
4 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Marlin.h
View File

@ -225,9 +225,12 @@ void ok_to_send();
void reset_bed_level(); void reset_bed_level();
void prepare_move(); void prepare_move();
void set_current_position_from_planner();
void kill(const char*); void kill(const char*);
#if DISABLED(DELTA) && DISABLED(SCARA)
void set_current_position_from_planner();
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
void handle_filament_runout(); void handle_filament_runout();
#endif #endif

34
Marlin/Marlin_main.cpp
View File

@ -5894,20 +5894,22 @@ inline void gcode_M400() { stepper.synchronize(); }
#endif // FILAMENT_WIDTH_SENSOR #endif // FILAMENT_WIDTH_SENSOR
void set_current_position_from_planner() { #if DISABLED(DELTA) && DISABLED(SCARA)
stepper.synchronize(); void set_current_position_from_planner() {
#if ENABLED(AUTO_BED_LEVELING_FEATURE) stepper.synchronize();
vector_3 pos = planner.adjusted_position(); // values directly from steppers... #if ENABLED(AUTO_BED_LEVELING_FEATURE)
current_position[X_AXIS] = pos.x; vector_3 pos = planner.adjusted_position(); // values directly from steppers...
current_position[Y_AXIS] = pos.y; current_position[X_AXIS] = pos.x;
current_position[Z_AXIS] = pos.z; current_position[Y_AXIS] = pos.y;
#else current_position[Z_AXIS] = pos.z;
current_position[X_AXIS] = stepper.get_axis_position_mm(X_AXIS); #else
current_position[Y_AXIS] = stepper.get_axis_position_mm(Y_AXIS); current_position[X_AXIS] = stepper.get_axis_position_mm(X_AXIS);
current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS); current_position[Y_AXIS] = stepper.get_axis_position_mm(Y_AXIS);
#endif current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS);
sync_plan_position(); // ...re-apply to planner position #endif
} sync_plan_position(); // ...re-apply to planner position
}
#endif
/** /**
* M410: Quickstop - Abort all planned moves * M410: Quickstop - Abort all planned moves
@ -5917,7 +5919,9 @@ void set_current_position_from_planner() {
*/ */
inline void gcode_M410() { inline void gcode_M410() {
stepper.quick_stop(); stepper.quick_stop();
set_current_position_from_planner(); #if DISABLED(DELTA) && DISABLED(SCARA)
set_current_position_from_planner();
#endif
} }

4
Marlin/endstops.cpp
View File

@ -187,7 +187,9 @@ void Endstops::report_state() {
card.sdprinting = false; card.sdprinting = false;
card.closefile(); card.closefile();
stepper.quick_stop(); stepper.quick_stop();
set_current_position_from_planner(); #if DISABLED(DELTA) && DISABLED(SCARA)
set_current_position_from_planner();
#endif
thermalManager.disable_all_heaters(); // switch off all heaters. thermalManager.disable_all_heaters(); // switch off all heaters.
} }
#endif #endif

4
Marlin/ultralcd.cpp
View File

@ -482,7 +482,9 @@ inline void line_to_current(AxisEnum axis) {
static void lcd_sdcard_stop() { static void lcd_sdcard_stop() {
stepper.quick_stop(); stepper.quick_stop();
set_current_position_from_planner(); #if DISABLED(DELTA) && DISABLED(SCARA)
set_current_position_from_planner();
#endif
clear_command_queue(); clear_command_queue();
card.sdprinting = false; card.sdprinting = false;
card.closefile(); card.closefile();