3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of a regression bug, caused by pre-calculating the extrudemultiply

Browse Source 
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
This commit is contained in:
bubnikv 2018-03-07 15:46:46 +01:00 committed by PavelSindler
parent 2b7e50e45b
commit 6ba07a358b
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Firmware/ultralcd.cpp
View File

@ -91,6 +91,18 @@ union MenuData
int rear2; int rear2;
} adjustBed; } adjustBed;
struct TuneMenu
{
// editMenuParentState is used when an edit menu is entered, so it knows
// the return menu and encoder state.
struct EditMenuParentState editMenuParentState;
// To recognize, whether the menu has been just initialized.
int8_t status;
// Backup of extrudemultiply, to recognize, that the value has been changed and
// it needs to be applied.
int16_t extrudemultiply;
} tuneMenu;
// editMenuParentState is used when an edit menu is entered, so it knows // editMenuParentState is used when an edit menu is entered, so it knows
// the return menu and encoder state. // the return menu and encoder state.
struct EditMenuParentState editMenuParentState; struct EditMenuParentState editMenuParentState;
@ -5326,7 +5338,17 @@ static void lcd_colorprint_change() {
static void lcd_tune_menu() static void lcd_tune_menu()
{ {
EEPROM_read(EEPROM_SILENT, (uint8_t*)&SilentModeMenu, sizeof(SilentModeMenu)); if (menuData.tuneMenu.status == 0) {
// Menu was entered. Mark the menu as entered and save the current extrudemultiply value.
menuData.tuneMenu.status = 1;
menuData.tuneMenu.extrudemultiply = extrudemultiply;
} else if (menuData.tuneMenu.extrudemultiply != extrudemultiply) {
// extrudemultiply has been changed from the child menu. Apply the new value.
menuData.tuneMenu.extrudemultiply = extrudemultiply;
calculate_extruder_multipliers();
}
EEPROM_read(EEPROM_SILENT, (uint8_t*)&SilentModeMenu, sizeof(SilentModeMenu));