SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove extra gcode. prefix

Browse source
This commit is contained in:
Scott Lahteine 2019-05-26 15:29:54 -05:00
parent c6d39319de
commit b14cc0d7c5
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/bedlevel/mbl/G29.cpp
View file

@ -134,7 +134,7 @@ void GcodeSuite::G29() {
BUZZ(100, 659); BUZZ(100, 659);
BUZZ(100, 698); BUZZ(100, 698);
gcode.home_all_axes(); home_all_axes();
set_bed_leveling_enabled(true); set_bed_leveling_enabled(true);
#if ENABLED(MESH_G28_REST_ORIGIN) #if ENABLED(MESH_G28_REST_ORIGIN)

14
Marlin/src/gcode/feature/L6470/M916-918.cpp
View file

@ -106,10 +106,10 @@ void GcodeSuite::M916() {
// turn the motor(s) both directions // 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); 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); 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 // get the status after the motors have stopped
planner.synchronize(); planner.synchronize();
@ -226,10 +226,10 @@ void GcodeSuite::M917() {
DEBUG_ECHOLNPAIR(" OCD threshold : ", (ocd_th_val + 1) * 375); 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); 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); 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(); planner.synchronize();
@ -263,7 +263,7 @@ void GcodeSuite::M917() {
L6470.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold); L6470.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
} }
DEBUG_ECHOLNPGM("."); 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 watchdog_reset(); // beat the dog
safe_delay(5000); safe_delay(5000);
status_composite_temp = 0; status_composite_temp = 0;
@ -518,10 +518,10 @@ void GcodeSuite::M918() {
DEBUG_ECHOLNPAIR("...feedrate = ", current_feedrate); DEBUG_ECHOLNPAIR("...feedrate = ", current_feedrate);
sprintf_P(gcode_string, PSTR("G0 %s%4.3f F%4.3f"), temp_axis_string, position_min, 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); 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(); planner.synchronize();

2
Marlin/src/gcode/feature/pause/M600.cpp
View file

@ -98,7 +98,7 @@ void GcodeSuite::M600() {
#if ENABLED(HOME_BEFORE_FILAMENT_CHANGE) #if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
// Don't allow filament change without homing first // Don't allow filament change without homing first
if (axis_unhomed_error()) gcode.home_all_axes(); if (axis_unhomed_error()) home_all_axes();
#endif #endif
#if EXTRUDERS > 1 #if EXTRUDERS > 1