ソースを参照

wrapper function for selftest

PavelSindler 7 年 前
コミット
2199c84ec9
2 ファイル変更8 行追加3 行削除
  1. 7 2
      Firmware/ultralcd.cpp
  2. 1 1
      Firmware/ultralcd.h

+ 7 - 2
Firmware/ultralcd.cpp

@@ -3675,7 +3675,7 @@ static void lcd_calibration_menu()
   if (!isPrintPaused)
   if (!isPrintPaused)
   {
   {
 	MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W"));
 	MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W"));
-    MENU_ITEM(function, MSG_SELFTEST, lcd_selftest);
+    MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v);
 #ifdef MK1BP
 #ifdef MK1BP
     // MK1
     // MK1
     // "Calibrate Z"
     // "Calibrate Z"
@@ -5293,6 +5293,11 @@ menu_edit_type(float, float51, ftostr51, 10)
 menu_edit_type(float, float52, ftostr52, 100)
 menu_edit_type(float, float52, ftostr52, 100)
 menu_edit_type(unsigned long, long5, ftostr5, 0.01)
 menu_edit_type(unsigned long, long5, ftostr5, 0.01)
 
 
+static void lcd_selftest_v()
+{
+	(void)lcd_selftest();
+}
+
 static bool lcd_selftest()
 static bool lcd_selftest()
 {
 {
 	int _progress = 0;
 	int _progress = 0;
@@ -5418,7 +5423,7 @@ static bool lcd_selfcheck_axis_sg(char axis) {
 	default: axis_length = 210; break;
 	default: axis_length = 210; break;
 	}
 	}
 	//tmc2130_sg_stop_on_crash = false;
 	//tmc2130_sg_stop_on_crash = false;
-	crashdet_disable();
+	//crashdet_disable();
 #ifdef TMC2130
 #ifdef TMC2130
 	tmc2130_home_exit();
 	tmc2130_home_exit();
 	enable_endstops(true);
 	enable_endstops(true);

+ 1 - 1
Firmware/ultralcd.h

@@ -34,7 +34,7 @@
 void lcd_mylang();
 void lcd_mylang();
   bool lcd_detected(void);
   bool lcd_detected(void);
 
 
-  
+  static void lcd_selftest_v();
   static bool lcd_selftest();
   static bool lcd_selftest();
   static bool lcd_selfcheck_endstops();
   static bool lcd_selfcheck_endstops();
   static bool lcd_selfcheck_axis(int _axis, int _travel);
   static bool lcd_selfcheck_axis(int _axis, int _travel);