Skip to content

Commit

Permalink
merge followup
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jul 23, 2021
1 parent 71bf98f commit c20431b
Show file tree
Hide file tree
Showing 8 changed files with 316 additions and 437 deletions.
22 changes: 7 additions & 15 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2234,14 +2234,6 @@
// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
//#define ADVANCED_OK

/**
* Buffer monitoring
*
* To help diagnose print quality issues stemming from command buffers being empty,
* we add M576 which enables reporting of buffer empty
*/
//#define BUFFER_MONITORING

// Printrun may have trouble receiving long strings all at once.
// This option inserts short delays between lines of serial output.
#define SERIAL_OVERRUN_PROTECTION
Expand Down Expand Up @@ -4182,13 +4174,13 @@
// Enable Marlin dev mode which adds some special commands
//#define MARLIN_DEV_MODE

/**
* Buffer monitoring
*
* To help diagnose print quality issues stemming from command buffers being empty,
* we add D576 which enables reporting of buffer empty. Requires MARLIN_DEV_MODE.
*/
//#define BUFFER_MONITORING
#if ENABLED(MARLIN_DEV_MODE)
/**
* D576 - Buffer Monitoring
* To help diagnose print quality issues stemming from empty command buffers.
*/
//#define BUFFER_MONITORING
#endif

/**
* Postmortem Debugging captures misbehavior and outputs the CPU status and backtrace to serial.
Expand Down
4 changes: 0 additions & 4 deletions Marlin/src/gcode/gcode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -851,10 +851,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 575: M575(); break; // M575: Set serial baudrate
#endif

#if ENABLED(BUFFER_MONITORING) // M576: Buffer monitoring
case 576: M576(); break;
#endif

#if ENABLED(ADVANCED_PAUSE_FEATURE)
case 600: M600(); break; // M600: Pause for Filament Change
case 603: M603(); break; // M603: Configure Filament Change
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/gcode/gcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@
* M553 - Get or set IP netmask. (Requires enabled Ethernet port)
* M554 - Get or set IP gateway. (Requires enabled Ethernet port)
* M569 - Enable stealthChop on an axis. (Requires at least one _DRIVER_TYPE to be TMC2130/2160/2208/2209/5130/5160)
* M575 - Change the serial baud rate. (Requires BAUD_RATE_GCODE)
* M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE)
* M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
* M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
Expand Down Expand Up @@ -297,6 +298,7 @@
* M997 - Perform in-application firmware update
* M999 - Restart after being stopped by error
* D... - Custom Development G-code. Add hooks to 'gcode_D.cpp' for developers to test features. (Requires MARLIN_DEV_MODE)
* D576 - Set buffer monitoring options. (Requires BUFFER_MONITORING)
*
* "T" Codes
*
Expand Down Expand Up @@ -973,8 +975,6 @@ class GcodeSuite {
static void M575();
#endif

TERN_(BUFFER_MONITORING, static void M576());

#if ENABLED(ADVANCED_PAUSE_FEATURE)
static void M600();
static void M603();
Expand Down
Loading

0 comments on commit c20431b

Please sign in to comment.