From 7aadb2f660f315094994c229b2bdd01bdd8a90d0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 27 Aug 2018 20:57:57 +0200 Subject: [PATCH 1/2] Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P --- Firmware/mmu.cpp | 9 +-------- Firmware/ultralcd.h | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 73caf79db..a32a9a6ab 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -9,14 +9,7 @@ #include "Configuration_prusa.h" #include "fsensor.h" #include "cardreader.h" - - -extern const char* lcd_display_message_fullscreen_P(const char *msg); -extern void lcd_show_fullscreen_message_and_wait_P(const char *msg); -extern int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, bool default_yes = false); -extern void lcd_return_to_status(); -extern void lcd_wait_for_heater(); -extern char choose_extruder_menu(); +#include "ultralcd.h" #define CHECK_FINDA ((IS_SD_PRINTING || is_usb_printing) && (mcode_in_progress != 600) && !saved_printing && e_active()) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 29a13a9c7..69faadbb1 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -45,6 +45,7 @@ void lcd_menu_statistics(); extern const char* lcd_display_message_fullscreen_P(const char *msg, uint8_t &nlines); extern const char* lcd_display_message_fullscreen_P(const char *msg); +extern void lcd_return_to_status(); extern void lcd_wait_for_click(); extern void lcd_show_fullscreen_message_and_wait_P(const char *msg); // 0: no, 1: yes, -1: timeouted From 72cd0d26f94abecbfa4081ca7807053d3f1e83de Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 27 Aug 2018 21:08:40 +0200 Subject: [PATCH 2/2] Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu. --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 08490dbcc..36c70d7a2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4492,11 +4492,11 @@ void lcd_wizard(int state) { lcd_update(2); } +#ifdef TMC2130 void lcd_settings_linearity_correction_menu(void) { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); -#ifdef TMC2130 #ifdef TMC2130_LINEARITY_CORRECTION_XYZ //tmc2130_wave_fac[X_AXIS] @@ -4505,13 +4505,13 @@ void lcd_settings_linearity_correction_menu(void) MENU_ITEM_EDIT_int3_P(_i("Z-correct"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 #endif //TMC2130_LINEARITY_CORRECTION_XYZ MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 -#endif MENU_END(); if(menu_leaving) { lcd_settings_linearity_correction_menu_save(); } } +#endif // TMC2130 static void lcd_settings_menu() {