MarlinUI support for up to 5 Material Presets (#18488)
- Add `I` preset parameter to `G26`, `M106`, `M140`, and `M190`. - Extend menu items to permit a string interpolation. - Keep material names in a list and interpolate in menu items. - Extend material presets to support up to 5 predefined materials. Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
@ -589,14 +589,6 @@
|
||||
#define NUM_SERVOS 0
|
||||
#endif
|
||||
|
||||
#ifndef PREHEAT_1_LABEL
|
||||
#define PREHEAT_1_LABEL "PLA"
|
||||
#endif
|
||||
|
||||
#ifndef PREHEAT_2_LABEL
|
||||
#define PREHEAT_2_LABEL "ABS"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Set a flag for a servo probe (or BLTouch)
|
||||
*/
|
||||
|
@ -2129,9 +2129,17 @@
|
||||
#endif
|
||||
|
||||
#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD)
|
||||
#define PREHEAT_COUNT 2
|
||||
#else
|
||||
#undef PREHEAT_COUNT
|
||||
#ifdef PREHEAT_5_LABEL
|
||||
#define PREHEAT_COUNT 5
|
||||
#elif defined(PREHEAT_4_LABEL)
|
||||
#define PREHEAT_COUNT 4
|
||||
#elif defined(PREHEAT_3_LABEL)
|
||||
#define PREHEAT_COUNT 3
|
||||
#elif defined(PREHEAT_2_LABEL)
|
||||
#define PREHEAT_COUNT 2
|
||||
#elif defined(PREHEAT_1_LABEL)
|
||||
#define PREHEAT_COUNT 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user