Merge pull request #6895 from thinkyhead/bf_user_commands

Custom user commands menu
This commit is contained in:
Scott Lahteine 2017-05-30 13:40:50 -05:00 committed by GitHub
commit 05b66234ae
26 changed files with 681 additions and 115 deletions

View file

@ -126,6 +126,7 @@ script:
# #
- restore_configs - restore_configs
- opt_enable AUTO_BED_LEVELING_UBL UBL_G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT FIX_MOUNTED_PROBE EEPROM_SETTINGS G3D_PANEL - opt_enable AUTO_BED_LEVELING_UBL UBL_G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT FIX_MOUNTED_PROBE EEPROM_SETTINGS G3D_PANEL
- opt_enable_adv CUSTOM_USER_MENUS
- build_marlin - build_marlin
# #
# Test a Sled Z Probe # Test a Sled Z Probe

View file

@ -1221,12 +1221,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1235,4 +1234,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1227,12 +1227,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.5 #define PROPORTIONAL_FONT_RATIO 1.5
@ -1241,4 +1240,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1198,12 +1198,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1212,4 +1211,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1227,12 +1227,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1241,4 +1240,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1217,12 +1217,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1231,4 +1230,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1219,12 +1219,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1233,4 +1232,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1218,12 +1218,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1232,4 +1231,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1216,12 +1216,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1230,4 +1229,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1216,12 +1216,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1230,4 +1229,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1221,12 +1221,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1235,4 +1234,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1216,12 +1216,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1230,4 +1229,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1223,12 +1223,11 @@
#define NO_WORKSPACE_OFFSETS #define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.5 #define PROPORTIONAL_FONT_RATIO 1.5
@ -1237,4 +1236,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1214,12 +1214,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1228,4 +1227,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -1217,12 +1217,11 @@
//#define NO_WORKSPACE_OFFSETS //#define NO_WORKSPACE_OFFSETS
/** /**
* This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number * Set the number of proportional font spaces required to fill up a typical character space.
* of spaces to be output by the ratio set below. This allows for better alignment of output for commands * This can help to better align the output of commands like `G29 O` Mesh Output.
* like G29 O, which renders a mesh/grid.
* *
* For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
* accordingly for your client and font. * Otherwise, adjust according to your client and font.
*/ */
#define PROPORTIONAL_FONT_RATIO 1.0 #define PROPORTIONAL_FONT_RATIO 1.0
@ -1231,4 +1230,27 @@
*/ */
#define FASTER_GCODE_PARSER #define FASTER_GCODE_PARSER
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
#define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
//#define USER_DESC_5 "Home & Info"
//#define USER_GCODE_5 "G28\nM503"
#endif
#endif // CONFIGURATION_ADV_H #endif // CONFIGURATION_ADV_H

View file

@ -156,6 +156,9 @@
#ifndef MSG_LEVEL_BED #ifndef MSG_LEVEL_BED
#define MSG_LEVEL_BED _UxGT("Level bed") #define MSG_LEVEL_BED _UxGT("Level bed")
#endif #endif
#ifndef MSG_USER_MENU
#define MSG_USER_MENU _UxGT("Custom Commands")
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
#ifndef MSG_UBL_UNHOMED #ifndef MSG_UBL_UNHOMED

View file

@ -789,6 +789,58 @@ void kill_screen(const char* lcd_msg) {
#endif // HAS_DEBUG_MENU #endif // HAS_DEBUG_MENU
#if ENABLED(CUSTOM_USER_MENUS)
#ifdef USER_SCRIPT_DONE
#define _DONE_SCRIPT "\n" USER_SCRIPT_DONE
#else
#define _DONE_SCRIPT ""
#endif
void _lcd_user_gcode(const char * const cmd) {
lcd_return_to_status();
enqueue_and_echo_commands_P(cmd);
}
#if defined(USER_DESC_1) && defined(USER_GCODE_1)
void lcd_user_gcode_1() { _lcd_user_gcode(PSTR(USER_GCODE_1 _DONE_SCRIPT)); }
#endif
#if defined(USER_DESC_2) && defined(USER_GCODE_2)
void lcd_user_gcode_2() { _lcd_user_gcode(PSTR(USER_GCODE_2 _DONE_SCRIPT)); }
#endif
#if defined(USER_DESC_3) && defined(USER_GCODE_3)
void lcd_user_gcode_3() { _lcd_user_gcode(PSTR(USER_GCODE_3 _DONE_SCRIPT)); }
#endif
#if defined(USER_DESC_4) && defined(USER_GCODE_4)
void lcd_user_gcode_4() { _lcd_user_gcode(PSTR(USER_GCODE_4 _DONE_SCRIPT)); }
#endif
#if defined(USER_DESC_5) && defined(USER_GCODE_5)
void lcd_user_gcode_5() { _lcd_user_gcode(PSTR(USER_GCODE_5 _DONE_SCRIPT)); }
#endif
void _lcd_user_menu() {
START_MENU();
MENU_BACK(MSG_MAIN);
#if defined(USER_DESC_1) && defined(USER_GCODE_1)
MENU_ITEM(function, USER_DESC_1, lcd_user_gcode_1);
#endif
#if defined(USER_DESC_2) && defined(USER_GCODE_2)
MENU_ITEM(function, USER_DESC_2, lcd_user_gcode_2);
#endif
#if defined(USER_DESC_3) && defined(USER_GCODE_3)
MENU_ITEM(function, USER_DESC_3, lcd_user_gcode_3);
#endif
#if defined(USER_DESC_4) && defined(USER_GCODE_4)
MENU_ITEM(function, USER_DESC_4, lcd_user_gcode_4);
#endif
#if defined(USER_DESC_5) && defined(USER_GCODE_5)
MENU_ITEM(function, USER_DESC_5, lcd_user_gcode_5);
#endif
END_MENU();
}
#endif
/** /**
* *
* "Main" menu * "Main" menu
@ -804,6 +856,10 @@ void kill_screen(const char* lcd_msg) {
START_MENU(); START_MENU();
MENU_BACK(MSG_WATCH); MENU_BACK(MSG_WATCH);
#if ENABLED(CUSTOM_USER_MENUS)
MENU_ITEM(submenu, MSG_USER_MENU, _lcd_user_menu);
#endif
// //
// Debug Menu when certain options are enabled // Debug Menu when certain options are enabled
// //