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

lowercase "stop" function

Browse Source
This commit is contained in:
Scott Lahteine 2016-04-18 00:05:22 -07:00
parent 39ee9c526b
commit ac69fad96d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Marlin.h
View File

@ -223,7 +223,6 @@ void ok_to_send();
void reset_bed_level(); void reset_bed_level();
void prepare_move(); void prepare_move();
void kill(const char*); void kill(const char*);
void Stop();
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
void handle_filament_runout(); void handle_filament_runout();

8
Marlin/Marlin_main.cpp
View File

@ -491,6 +491,8 @@ static bool send_ok[BUFSIZE];
* *************************************************************************** * ***************************************************************************
*/ */
void stop();
void get_available_commands(); void get_available_commands();
void process_next_command(); void process_next_command();
@ -1761,7 +1763,7 @@ static void setup_for_endstop_move() {
SERIAL_ERRORLNPGM("Z-Probe failed to engage!"); SERIAL_ERRORLNPGM("Z-Probe failed to engage!");
LCD_ALERTMESSAGEPGM("Err: ZPROBE"); LCD_ALERTMESSAGEPGM("Err: ZPROBE");
} }
Stop(); stop();
} }
#endif // Z_PROBE_ALLEN_KEY #endif // Z_PROBE_ALLEN_KEY
@ -1865,7 +1867,7 @@ static void setup_for_endstop_move() {
SERIAL_ERRORLNPGM("Z-Probe failed to retract!"); SERIAL_ERRORLNPGM("Z-Probe failed to retract!");
LCD_ALERTMESSAGEPGM("Err: ZPROBE"); LCD_ALERTMESSAGEPGM("Err: ZPROBE");
} }
Stop(); stop();
} }
#endif // Z_PROBE_ALLEN_KEY #endif // Z_PROBE_ALLEN_KEY
@ -8017,7 +8019,7 @@ void kill(const char* lcd_msg) {
} }
#endif // FAST_PWM_FAN #endif // FAST_PWM_FAN
void Stop() { void stop() {
disable_all_heaters(); disable_all_heaters();
if (IsRunning()) { if (IsRunning()) {
Running = false; Running = false;