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

PFW-1425 Move MMU settings under a common if statement 

We only need to check if the MMU is enabled once,
no need to do it in every submenu.
This way we save little bit of flash memory.

Change in memory:
Flash: -24 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2022-11-06 15:42:36 +00:00 committed by DRracer
parent 8f3f071fd4
commit 3f4ac254ab
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Firmware/ultralcd.cpp
View File

@ -4270,10 +4270,7 @@ static void lcd_fsensor_settings_menu() {
static void settingsSpoolJoin() static void settingsSpoolJoin()
{ {
if (MMU2::mmu2.Enabled()) MENU_ITEM_TOGGLE_P(MSG_SPOOL_JOIN, SpoolJoin::spooljoin.isSpoolJoinEnabled() ? _T(MSG_ON) : _T(MSG_OFF), SpoolJoin::spooljoin.toggleSpoolJoin);
{
MENU_ITEM_TOGGLE_P(MSG_SPOOL_JOIN, SpoolJoin::spooljoin.isSpoolJoinEnabled() ? _T(MSG_ON) : _T(MSG_OFF), SpoolJoin::spooljoin.toggleSpoolJoin);
}
} }
#define SETTINGS_SPOOLJOIN \ #define SETTINGS_SPOOLJOIN \
@ -4286,22 +4283,19 @@ while(0)\
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
static void settingsCutter() static void settingsCutter()
{ {
if (MMU2::mmu2.Enabled()) if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED))
{ {
if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ON), lcd_cutter_enabled);
{ }
MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ON), lcd_cutter_enabled);
}
#ifdef MMU_ALWAYS_CUT #ifdef MMU_ALWAYS_CUT
else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED))
{ {
MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ALWAYS), lcd_cutter_enabled); MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ALWAYS), lcd_cutter_enabled);
} }
#endif #endif
else else
{ {
MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_OFF), lcd_cutter_enabled); MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_OFF), lcd_cutter_enabled);
}
} }
} }
@ -4419,6 +4413,7 @@ do\
while (0) while (0)
*/ */
// TODO: Rename 'Load to extruder' to 'Loading test'
#define SETTINGS_MMU_LOAD_TEST \ #define SETTINGS_MMU_LOAD_TEST \
do\ do\
{\ {\
@ -4755,15 +4750,15 @@ static void lcd_settings_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_FSENSOR), lcd_fsensor_settings_menu); MENU_ITEM_SUBMENU_P(_T(MSG_FSENSOR), lcd_fsensor_settings_menu);
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
SETTINGS_SPOOLJOIN;
SETTINGS_CUTTER;
MENU_ITEM_TOGGLE_P(PSTR("MMU"), eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED) ? _T(MSG_ON) : _T(MSG_OFF), mmu_enable_switch); MENU_ITEM_TOGGLE_P(PSTR("MMU"), eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED) ? _T(MSG_ON) : _T(MSG_OFF), mmu_enable_switch);
if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED)) if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED))
{ {
SETTINGS_SPOOLJOIN;
SETTINGS_CUTTER;
MENU_ITEM_FUNCTION_P(PSTR("Reset MMU"), mmu_reset); MENU_ITEM_FUNCTION_P(PSTR("Reset MMU"), mmu_reset);
SETTINGS_MMU_MODE;
SETTINGS_MMU_LOAD_TEST;
} }
MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
@ -4776,10 +4771,6 @@ static void lcd_settings_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_HW_SETUP), lcd_hw_setup_menu); MENU_ITEM_SUBMENU_P(_T(MSG_HW_SETUP), lcd_hw_setup_menu);
} }
SETTINGS_MMU_MODE;
SETTINGS_MMU_LOAD_TEST;
MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bed_leveling_settings); MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bed_leveling_settings);
#if defined (TMC2130) && defined (LINEARITY_CORRECTION) #if defined (TMC2130) && defined (LINEARITY_CORRECTION)