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

Add and apply REPEAT macro (#15829)

Browse Source
This commit is contained in:
Scott Lahteine
2019-11-09 17:59:04 -06:00
committed by GitHub
parent 8061836e74
commit 776632c503
11 changed files with 219 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/temperature_screen.cpp
View File

@ -85,22 +85,8 @@ bool TemperatureScreen::onTouchHeld(uint8_t tag) {
case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
#endif
case 30:
setTargetTemp_celsius(0,E0);
#if HOTENDS > 1
setTargetTemp_celsius(0,E1);
#if HOTENDS > 2
setTargetTemp_celsius(0,E2);
#if HOTENDS > 3
setTargetTemp_celsius(0,E3);
#if HOTENDS > 4
setTargetTemp_celsius(0,E4);
#if HOTENDS > 5
setTargetTemp_celsius(0,E5);
#endif
#endif
#endif
#endif
#endif
#define _HOTEND_OFF(N) setTargetTemp_celsius(0,E##N);
REPEAT(HOTENDS, _HOTEND_OFF);
#if HAS_HEATED_BED
setTargetTemp_celsius(0,BED);
#endif

6
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -277,8 +277,10 @@ void menu_advanced_settings();
#if DISABLED(SLIM_LCD_MENUS)
void _menu_configuration_preheat_settings(const uint8_t material) {
#define MINTEMP_ALL _MIN(LIST_N(HOTENDS, HEATER_0_MINTEMP, HEATER_1_MINTEMP, HEATER_2_MINTEMP, HEATER_3_MINTEMP, HEATER_4_MINTEMP, HEATER_5_MINTEMP), 999)
#define MAXTEMP_ALL _MAX(LIST_N(HOTENDS, HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP), 0)
#define _MINTEMP_ITEM(N) HEATER_##N##_MINTEMP,
#define _MAXTEMP_ITEM(N) HEATER_##N##_MAXTEMP,
#define MINTEMP_ALL _MIN(REPEAT(HOTENDS, _MINTEMP_ITEM) 999)
#define MAXTEMP_ALL _MAX(REPEAT(HOTENDS, _MAXTEMP_ITEM) 0)
START_MENU();
BACK_ITEM(MSG_CONFIGURATION);
EDIT_ITEM(percent, MSG_FAN_SPEED, &ui.preheat_fan_speed[material], 0, 255);

6
Marlin/src/lcd/menu/menu_mixer.cpp
View File

@ -158,10 +158,11 @@ void lcd_mixer_mix_edit() {
#if CHANNEL_MIX_EDITING
#define EDIT_COLOR(N) EDIT_ITEM_FAST(float52, MSG_MIX_COMPONENT_##N, &mixer.collector[N-1], 0, 10);
START_MENU();
BACK_ITEM(MSG_MIXER);
#define EDIT_COLOR(N) EDIT_ITEM_FAST(float52, MSG_MIX_COMPONENT_##N, &mixer.collector[N-1], 0, 10);
EDIT_COLOR(1);
EDIT_COLOR(2);
#if MIXING_STEPPERS > 2
@ -176,6 +177,7 @@ void lcd_mixer_mix_edit() {
#endif
#endif
#endif
ACTION_ITEM(MSG_CYCLE_MIX, _lcd_mixer_cycle_mix);
ACTION_ITEM(MSG_COMMIT_VTOOL, _lcd_mixer_commit_vtool);
END_MENU();