MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2094 from thinkyhead/cherry_picking

Browse Source 
Rename process_commands to process_next_command
This commit is contained in:
Scott Lahteine 2015-05-16 21:08:59 -07:00
commit ea3df2b0b3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Marlin.h
View File

@ -113,7 +113,6 @@ FORCE_INLINE void serialprintPGM(const char *str) {
} }
void get_command(); void get_command();
void process_commands();
void manage_inactivity(bool ignore_stepper_queue=false); void manage_inactivity(bool ignore_stepper_queue=false);

10
Marlin/Marlin_main.cpp
View File

@ -399,6 +399,8 @@ bool target_direction;
//================================ Functions ================================ //================================ Functions ================================
//=========================================================================== //===========================================================================
void process_next_command();
bool setTargetedHotend(int code); bool setTargetedHotend(int code);
void serial_echopair_P(const char *s_P, float v) { serialprintPGM(s_P); SERIAL_ECHO(v); } void serial_echopair_P(const char *s_P, float v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
@ -697,17 +699,17 @@ void loop() {
// Write the string from the read buffer to SD // Write the string from the read buffer to SD
card.write_command(command); card.write_command(command);
if (card.logging) if (card.logging)
process_commands(); // The card is saving because it's logging process_next_command(); // The card is saving because it's logging
else else
SERIAL_PROTOCOLLNPGM(MSG_OK); SERIAL_PROTOCOLLNPGM(MSG_OK);
} }
} }
else else
process_commands(); process_next_command();
#else #else
process_commands(); process_next_command();
#endif // SDSUPPORT #endif // SDSUPPORT
@ -5178,7 +5180,7 @@ inline void gcode_T() {
* Process Commands and dispatch them to handlers * Process Commands and dispatch them to handlers
* This is called from the main loop() * This is called from the main loop()
*/ */
void process_commands() { void process_next_command() {
if ((marlin_debug_flags & DEBUG_ECHO)) { if ((marlin_debug_flags & DEBUG_ECHO)) {
SERIAL_ECHO_START; SERIAL_ECHO_START;