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

Apply composite tests

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-23 21:42:38 -05:00
parent 55d66fb897
commit ab2b98e425
53 changed files with 103 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -235,12 +235,14 @@ void menu_cancelobject();
#if HAS_HOTEND
DEFINE_PIDTEMP_FUNCS(0);
#if HAS_MULTI_HOTEND && ENABLED(PID_PARAMS_PER_HOTEND)
#if BOTH(HAS_MULTI_HOTEND, PID_PARAMS_PER_HOTEND)
REPEAT_S(1, HOTENDS, DEFINE_PIDTEMP_FUNCS)
#endif
#endif
#define SHOW_MENU_ADVANCED_TEMPERATURE ((ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU))
#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU)
#define SHOW_MENU_ADVANCED_TEMPERATURE 1
#endif
//
// Advanced Settings > Temperature
@ -253,7 +255,7 @@ void menu_cancelobject();
//
// Autotemp, Min, Max, Fact
//
#if ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND
#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND)
EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
@ -308,7 +310,7 @@ void menu_cancelobject();
#endif
PID_EDIT_MENU_ITEMS(0);
#if HAS_MULTI_HOTEND && ENABLED(PID_PARAMS_PER_HOTEND)
#if BOTH(HAS_MULTI_HOTEND, PID_PARAMS_PER_HOTEND)
REPEAT_S(1, HOTENDS, PID_EDIT_MENU_ITEMS)
#endif