From ea7e717204d3fce588c7146fff1da65d64057b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 7 Feb 2023 18:39:37 +0000 Subject: [PATCH] Cleanup: Remove various dead code --- Firmware/ultralcd.cpp | 51 ------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f115689fd..0f0ca29a5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -239,11 +239,6 @@ static void lcd_babystep_z(); static void lcd_sdcard_menu(); static void lcd_sheet_menu(); -#ifdef DELTA_CALIBRATION_MENU -static void lcd_delta_calibrate_menu(); -#endif // DELTA_CALIBRATION_MENU - - /* Different types of actions that can be used in menu items. */ static void menu_action_sdfile(const char* filename); static void menu_action_sddirectory(const char* filename); @@ -254,27 +249,6 @@ static void menu_action_sddirectory(const char* filename); #define STATE_OFF 0 #define STATE_ON 1 -/* -#define MENU_ITEM(type, label, args...) do { \ - if (menu_item == menu_line) { \ - if (lcd_draw_update) { \ - const char* _label_pstr = (label); \ - if (lcd_encoder == menu_item) { \ - lcd_implementation_drawmenu_ ## type ## _selected (menu_row, _label_pstr , ## args ); \ - }else{\ - lcd_implementation_drawmenu_ ## type (menu_row, _label_pstr , ## args ); \ - }\ - }\ - if (menu_clicked && (lcd_encoder == menu_item)) {\ - lcd_quick_feedback(); \ - menu_action_ ## type ( args ); \ - return;\ - }\ - }\ - menu_item++;\ - } while(0) -*/ - #if (SDCARDDETECT > 0) bool lcd_oldcardstatus; #endif @@ -284,16 +258,9 @@ uint8_t selected_sheet = 0; bool ignore_click = false; bool wait_for_unclick; -// place-holders for Ki and Kd edits -#ifdef PIDTEMP -// float raw_Ki, raw_Kd; -#endif - bool bMain; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function bool bSettings; // flag (i.e. 'fake parameter') for 'lcd_hw_setup_menu()' function - - const char STR_SEPARATOR[] PROGMEM = "------------"; static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* longFilename) @@ -1816,18 +1783,6 @@ void lcd_cutter_enabled() } #endif //MMU_HAS_CUTTER -void lcd_set_filament_autoload() { - fsensor.setAutoLoadEnabled(!fsensor.getAutoLoadEnabled()); -} - -#if defined(FILAMENT_SENSOR) && defined(PAT9125) -void lcd_set_filament_oq_meass() -{ - fsensor_oq_measure_set(!fsensor_oq_measure_enabled); -} -#endif - - FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as 'non-autoLoad' bool bFilamentPreheatState; bool bFilamentAction=false; @@ -5788,12 +5743,6 @@ static void lcd_backlight_menu() static void lcd_control_temperature_menu() { -#ifdef PIDTEMP - // set up temp variables - undo the default scaling -// raw_Ki = unscalePID_i(Ki); -// raw_Kd = unscalePID_d(Kd); -#endif - MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); #if TEMP_SENSOR_0 != 0