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

Add JOIN for simple append

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-03 18:48:31 -05:00
parent 51ae13fc8c
commit 9188ce1a8d
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/core/macros.h
View File

@ -227,6 +227,9 @@
#define LIST_N(N,V...) _LIST_N(N,V)
#define ARRAY_N(N,V...) { _LIST_N(N,V) }
#define _JOIN_1(O) (O)
#define JOIN_N(N,C,V...) (DO(JOIN,C,LIST_N(N,V)))
// Macros for adding
#define INC_0 1
#define INC_1 2

26
Marlin/src/lcd/menu/menu_filament.cpp
View File

@ -253,24 +253,14 @@ void _menu_temp_filament_op(const PauseMode inMode, const int8_t extruder) {
SUBMENU(MSG_FILAMENTUNLOAD, menu_temp_e0_filament_unload);
#else
#if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
if (thermalManager.targetHotEnoughToExtrude(0)
#if E_STEPPERS > 1
&& thermalManager.targetHotEnoughToExtrude(1)
#if E_STEPPERS > 2
&& thermalManager.targetHotEnoughToExtrude(2)
#if E_STEPPERS > 3
&& thermalManager.targetHotEnoughToExtrude(3)
#if E_STEPPERS > 4
&& thermalManager.targetHotEnoughToExtrude(4)
#if E_STEPPERS > 5
&& thermalManager.targetHotEnoughToExtrude(5)
#endif // E_STEPPERS > 5
#endif // E_STEPPERS > 4
#endif // E_STEPPERS > 3
#endif // E_STEPPERS > 2
#endif // E_STEPPERS > 1
)
GCODES_ITEM(MSG_FILAMENTUNLOAD_ALL, PSTR("M702"));
if (JOIN_N(E_STEPPERS, &&,
thermalManager.targetHotEnoughToExtrude(0),
thermalManager.targetHotEnoughToExtrude(1),
thermalManager.targetHotEnoughToExtrude(2),
thermalManager.targetHotEnoughToExtrude(3),
thermalManager.targetHotEnoughToExtrude(4),
thermalManager.targetHotEnoughToExtrude(5))
) GCODES_ITEM(MSG_FILAMENTUNLOAD_ALL, PSTR("M702"));
else
SUBMENU(MSG_FILAMENTUNLOAD_ALL, menu_unload_filament_all_temp);
#endif