From b14cc0d7c5d6e029ade5e96a5692d97553221142 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 26 May 2019 15:29:54 -0500 Subject: [PATCH] Remove extra gcode. prefix --- Marlin/src/gcode/bedlevel/mbl/G29.cpp | 2 +- Marlin/src/gcode/feature/L6470/M916-918.cpp | 14 +++++++------- Marlin/src/gcode/feature/pause/M600.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp index 15fbf82128..dd6faea955 100644 --- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp @@ -134,7 +134,7 @@ void GcodeSuite::G29() { BUZZ(100, 659); BUZZ(100, 698); - gcode.home_all_axes(); + home_all_axes(); set_bed_leveling_enabled(true); #if ENABLED(MESH_G28_REST_ORIGIN) diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp index 7744bfe0e3..6c2cd220d7 100644 --- a/Marlin/src/gcode/feature/L6470/M916-918.cpp +++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp @@ -106,10 +106,10 @@ void GcodeSuite::M916() { // turn the motor(s) both directions sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_min, final_feedrate); - gcode.process_subcommands_now_P(gcode_string); + process_subcommands_now_P(gcode_string); sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_max, final_feedrate); - gcode.process_subcommands_now_P(gcode_string); + process_subcommands_now_P(gcode_string); // get the status after the motors have stopped planner.synchronize(); @@ -226,10 +226,10 @@ void GcodeSuite::M917() { DEBUG_ECHOLNPAIR(" OCD threshold : ", (ocd_th_val + 1) * 375); sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_min, final_feedrate); - gcode.process_subcommands_now_P(gcode_string); + process_subcommands_now_P(gcode_string); sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_max, final_feedrate); - gcode.process_subcommands_now_P(gcode_string); + process_subcommands_now_P(gcode_string); planner.synchronize(); @@ -263,7 +263,7 @@ void GcodeSuite::M917() { L6470.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold); } DEBUG_ECHOLNPGM("."); - gcode.reset_stepper_timeout(); // reset_stepper_timeout to keep steppers powered + reset_stepper_timeout(); // reset_stepper_timeout to keep steppers powered watchdog_reset(); // beat the dog safe_delay(5000); status_composite_temp = 0; @@ -518,10 +518,10 @@ void GcodeSuite::M918() { DEBUG_ECHOLNPAIR("...feedrate = ", current_feedrate); sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_min, current_feedrate); - gcode.process_subcommands_now_P(gcode_string); + process_subcommands_now_P(gcode_string); sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_max, current_feedrate); - gcode.process_subcommands_now_P(gcode_string); + process_subcommands_now_P(gcode_string); planner.synchronize(); diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp index 147cc9c573..fe34541700 100644 --- a/Marlin/src/gcode/feature/pause/M600.cpp +++ b/Marlin/src/gcode/feature/pause/M600.cpp @@ -98,7 +98,7 @@ void GcodeSuite::M600() { #if ENABLED(HOME_BEFORE_FILAMENT_CHANGE) // Don't allow filament change without homing first - if (axis_unhomed_error()) gcode.home_all_axes(); + if (axis_unhomed_error()) home_all_axes(); #endif #if EXTRUDERS > 1