bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move Stepper::synchronize to Planner (#10713)

Browse Source 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
This commit is contained in:
Scott Lahteine
2018-05-12 01:38:02 -05:00
committed by GitHub
parent f2e3c9896e
commit 306f0f2135
33 changed files with 72 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/control/M17_M18_M84.cpp
View File

@ -50,7 +50,7 @@ void GcodeSuite::M18_M84() {
stepper.finish_and_disable();
}
else {
stepper.synchronize();
planner.synchronize();
if (parser.seen('X')) disable_X();
if (parser.seen('Y')) disable_Y();
if (parser.seen('Z')) disable_Z();

2
Marlin/src/gcode/control/M226.cpp
View File

@ -37,7 +37,7 @@ void GcodeSuite::M226() {
int target = LOW;
stepper.synchronize();
planner.synchronize();
pinMode(pin, INPUT);
switch (pin_state) {

4
Marlin/src/gcode/control/M3-M5.cpp
View File

@ -79,7 +79,7 @@ inline void ocr_val_mode() {
void GcodeSuite::M3_M4(bool is_M3) {
stepper.synchronize(); // wait until previous movement commands (G0/G0/G2/G3) have completed before playing with the spindle
planner.synchronize(); // wait until previous movement commands (G0/G0/G2/G3) have completed before playing with the spindle
#if SPINDLE_DIR_CHANGE
const bool rotation_dir = (is_M3 != SPINDLE_INVERT_DIR);
if (SPINDLE_STOP_ON_DIR_CHANGE \
@ -129,7 +129,7 @@ void GcodeSuite::M3_M4(bool is_M3) {
* M5 turn off spindle
*/
void GcodeSuite::M5() {
stepper.synchronize();
planner.synchronize();
WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);
#if ENABLED(SPINDLE_LASER_PWM)
analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);

2
Marlin/src/gcode/control/M400.cpp
View File

@ -28,6 +28,6 @@
*/
void GcodeSuite::M400() {
stepper.synchronize();
planner.synchronize();
}

4
Marlin/src/gcode/control/M605.cpp
View File

@ -43,7 +43,7 @@
* Note: the X axis should be homed after changing dual x-carriage mode.
*/
void GcodeSuite::M605() {
stepper.synchronize();
planner.synchronize();
if (parser.seen('S')) dual_x_carriage_mode = (DualXMode)parser.value_byte();
switch (dual_x_carriage_mode) {
case DXC_FULL_CONTROL_MODE:
@ -75,7 +75,7 @@
#elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
void GcodeSuite::M605() {
stepper.synchronize();
planner.synchronize();
extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR(MSG_DUPLICATION_MODE, extruder_duplication_enabled ? MSG_ON : MSG_OFF);