Explorar o código

Merge pull request #1079 from mkbel/fix_unable_to_compile

Fix unable to compile
PavelSindler %!s(int64=6) %!d(string=hai) anos
pai
achega
bb21cd6fec
Modificáronse 3 ficheiros con 4 adicións e 9 borrados
  1. 1 7
      Firmware/mmu.cpp
  2. 2 2
      Firmware/ultralcd.cpp
  3. 1 0
      Firmware/ultralcd.h

+ 1 - 7
Firmware/mmu.cpp

@@ -9,16 +9,10 @@
 #include "Configuration_prusa.h"
 #include "fsensor.h"
 #include "cardreader.h"
+#include "ultralcd.h"
 #include "sound.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();
-
 #define CHECK_FINDA ((IS_SD_PRINTING || is_usb_printing) && (mcode_in_progress != 600) && !saved_printing && e_active())
 
 #define MMU_TODELAY 100

+ 2 - 2
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()
 {

+ 1 - 0
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