Skip to content

[2.0.x] Enhanced command injection #9479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
revilor wants to merge 4 commits into from
Closed

[2.0.x] Enhanced command injection #9479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7da7b2b
extended queue to support SRAM command injection - config option
Feb 4, 2018
b70845e
enhanced command injection
Feb 4, 2018
d7a2c37
added configuration option to all example configs
Feb 4, 2018
be6ab35
separated sanity checks
Feb 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 3
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/default/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,6 +1440,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Cartesio/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,6 +1442,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Creality/Ender/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Felix/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,21 @@
*/
#define FASTER_GCODE_PARSER

/**
* Enhanced command injection.
*
* Allow to inject commands from PROGMEM and SRAM. The required stack size depends on
* the complexity and encapsulation of the injected commands. For every injected command
* which triggers another command injection an additional stack slot is required.
* The default value of 3 should work for most use cases.
*/
//#define ENHANCED_COMMAND_INJECTION
#if ENABLED(ENHANCED_COMMAND_INJECTION)
#ifndef ENHANCED_COMMAND_INJECTION_STACK
#define ENHANCED_COMMAND_INJECTION_STACK 2
#endif
#endif

/**
* User-defined menu items that execute custom GCode
*/
Expand Down
Loading