Skip to content
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

Jump to bottom

Prepare Menu fix #5632

Closed
wants to merge 1 commit into from
Closed

Prepare Menu fix #5632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions Marlin/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,11 +1403,18 @@ void kill_screen(const char* lcd_msg) {
// Cooldown
//
bool has_heat = false;
HOTEND_LOOP() if (thermalManager.target_temperature[e]) { has_heat = true; break; }
#if HAS_TEMP_BED
if (thermalManager.target_temperature_bed) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
HOTEND_LOOP() if (thermalManager.target_temperature[e])
{
has_heat = true;
MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no point to the has_heat boolean if you're going to duplicate code for each heat test.
Also while I haven't checked yet, I'm pretty sure you're adding a Cooldown entry for every hotend. Multi-extruder users will probably be confused

}
else
{
#if HAS_TEMP_BED
if (thermalManager.target_temperature_bed) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
}

//
// BLTouch Self-Test and Reset
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The latest Release Candidate lives in the ["RC" branch](https://github.com/Marli

## Recent Changes
- RCBugFix
- Prepare menu fix

- RC8 - 06 Dec 2016
- Major performance improvement for Graphical LCDs
Expand Down