From eba2924fdd2f2ba74b727cb38318f5b4e8aa8c14 Mon Sep 17 00:00:00 2001 From: Robert Pelnar <robert.pelnar@seznam.cz> Date: Wed, 20 Dec 2017 22:55:11 +0100 Subject: [PATCH] Remove load/unload menu when autoload enabled --- Firmware/Configuration.h | 2 +- Firmware/ultralcd.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 46e1e41d..6b509d04 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -11,7 +11,7 @@ #define FW_version "3.1.1-RC2" #define FW_build 137 //#define FW_build --BUILD-NUMBER-- -#define FW_version_build FW_version " b" STR(FW_build) "y" +#define FW_version_build FW_version " b" STR(FW_build) "z" #define FW_PRUSA3D_MAGIC "PRUSA3DFW" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1a48969e..073afaaa 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5016,8 +5016,11 @@ static void lcd_main_menu() else { #ifndef SNMM - MENU_ITEM(function, MSG_LOAD_FILAMENT, lcd_LoadFilament); - MENU_ITEM(function, MSG_UNLOAD_FILAMENT, lcd_unLoadFilament); + if (!filament_autoload_enabled) + { + MENU_ITEM(function, MSG_LOAD_FILAMENT, lcd_LoadFilament); + MENU_ITEM(function, MSG_UNLOAD_FILAMENT, lcd_unLoadFilament); + } #endif #ifdef SNMM MENU_ITEM(submenu, MSG_LOAD_FILAMENT, fil_load_menu);