thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues with no hotend / bed / fan (#18395)

Browse Source
This commit is contained in:
Scott Lahteine
2020-06-24 19:44:50 -05:00
committed by GitHub
parent b0aad414ec
commit 4275466f49
19 changed files with 732 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/lcd/ultralcd.h
View File

@@ -256,6 +256,14 @@
};
#endif
#if PREHEAT_COUNT
typedef struct {
TERN_(HAS_HOTEND, uint16_t hotend_temp);
TERN_(HAS_HEATED_BED, uint16_t bed_temp );
TERN_(HAS_FAN, uint16_t fan_speed );
} preheat_t;
#endif
////////////////////////////////////////////
//////////// MarlinUI Singleton ////////////
////////////////////////////////////////////
@@ -469,6 +477,10 @@ public:
static const char * scrolled_filename(CardReader &theCard, const uint8_t maxlen, uint8_t hash, const bool doScroll);
#endif
#if PREHEAT_COUNT
static preheat_t material_preset[PREHEAT_COUNT];
#endif
#if HAS_LCD_MENU
#if ENABLED(TOUCH_BUTTONS)
@@ -494,9 +506,6 @@ public:
static constexpr int8_t manual_move_e_index = 0;
#endif
static int16_t preheat_hotend_temp[2], preheat_bed_temp[2];
static uint8_t preheat_fan_speed[2];
// Select Screen (modal NO/YES style dialog)
static bool selection;
static void set_selection(const bool sel) { selection = sel; }