bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Define HAS_PREHEAT conditional

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-27 21:15:58 -05:00
committed by Scott Lahteine
parent 1fd4258423
commit 84f9490149
55 changed files with 183 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/nextion/nextion_tft.cpp
View File

@ -335,7 +335,7 @@ void NextionTFT::PanelInfo(uint8_t req) {
break;
case 29: // Preheat
#if PREHEAT_COUNT
#if HAS_PREHEAT
if (!isPrinting()) {
// Preheat PLA
if (nextion_command[4] == 'P') {
@ -560,7 +560,7 @@ void NextionTFT::PanelAction(uint8_t req) {
break;
case 63: // Preheat // Temps defined in configuration.h
#if PREHEAT_COUNT
#if HAS_PREHEAT
if (!isPrinting()) switch (nextion_command[4]) {
// Preheat PLA
case 'P':

2
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -705,7 +705,7 @@ namespace ExtUI {
uint8_t getIDEX_Mode() { return dual_x_carriage_mode; }
#endif
#if PREHEAT_COUNT
#if HAS_PREHEAT
uint16_t getMaterial_preset_E(const uint16_t index) { return ui.material_preset[index].hotend_temp; }
#if HAS_HEATED_BED
uint16_t getMaterial_preset_B(const uint16_t index) { return ui.material_preset[index].bed_temp; }

2
Marlin/src/lcd/extui/ui_api.h
View File

@ -148,7 +148,7 @@ namespace ExtUI {
uint32_t getProgress_seconds_elapsed();
#if PREHEAT_COUNT
#if HAS_PREHEAT
uint16_t getMaterial_preset_E(const uint16_t);
#if HAS_HEATED_BED
uint16_t getMaterial_preset_B(const uint16_t);