sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add HAS_HOTEND, etc.

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-19 23:56:55 -05:00
parent 5d0deba938
commit 15f6f53638
38 changed files with 554 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ namespace ExtUI {
case CHAMBER: return; // Chamber has no idle timer
#endif
default:
#if HOTENDS
#if HAS_HOTEND
thermalManager.reset_hotend_idle_timer(heater - H0);
#endif
break;
@@ -258,7 +258,7 @@ namespace ExtUI {
case CHAMBER: return false; // Chamber has no idle timer
#endif
default:
#if HOTENDS
#if HAS_HOTEND
return thermalManager.hotend_idle[heater - H0].timed_out;
#else
return false;
@@ -985,7 +985,7 @@ namespace ExtUI {
else
#endif
{
#if HOTENDS
#if HAS_HOTEND
static constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP, HEATER_6_MAXTEMP, HEATER_7_MAXTEMP);
const int16_t e = heater - H0;
thermalManager.setTargetHotend(LROUND(constrain(value, 0, heater_maxtemp[e] - 15)), e);
@@ -997,7 +997,7 @@ namespace ExtUI {
#ifdef TOUCH_UI_LCD_TEMP_SCALING
value *= TOUCH_UI_LCD_TEMP_SCALING;
#endif
#if HOTENDS
#if HAS_HOTEND
constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP, HEATER_6_MAXTEMP, HEATER_7_MAXTEMP);
const int16_t e = extruder - E0;
enableHeater(extruder);