Skip to content

MPC Edit Menu compilation error when compiling for multi-hotends revisited #24059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 4 commits into from
Apr 22, 2022
Merged

MPC Edit Menu compilation error when compiling for multi-hotends revisited #24059

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eabf2ad
Fixed build for MPC edit mnu with multiple hotends
tombrazier Apr 19, 2022
8d2cfda
Using lambda function
tombrazier Apr 20, 2022
c60d33c
Merge 'bugfix-2.0.x' into pr/24059
thinkyhead Apr 22, 2022
2e86886
fewer changes, same idea
thinkyhead Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Marlin/src/lcd/menu/menu_advanced.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,21 +352,22 @@ void menu_backlash();
#define MPC_EDIT_ITEMS(N) \
_MPC_EDIT_ITEMS(N); \
EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN_E, &editable.decimal, 0, 1, []{ \
MPC_t &c = thermalManager.temp_hotend[MenuItemBase::itemIndex].constants; \
c.fan255_adjustment = editable.decimal - c.ambient_xfer_coeff_fan0; \
})
#else
#define MPC_EDIT_ITEMS _MPC_EDIT_ITEMS
#endif

#if HAS_MULTI_HOTEND
auto mpc_edit_hotend = [&](const uint8_t e) {
static auto mpc_edit_hotend = [](const uint8_t e) {
MPC_EDIT_DEFS(e);
START_MENU();
BACK_ITEM(MSG_TEMPERATURE);
MPC_EDIT_ITEMS(e);
END_MENU();
};
#define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, [&]{ mpc_edit_hotend(MenuItemBase::itemIndex); });
#define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, []{ mpc_edit_hotend(MenuItemBase::itemIndex); });
#else
#define MPC_ENTRY MPC_EDIT_ITEMS
#endif
Expand Down