Parcourir la source

filament statistics hotfix, load filament move Z simplified

PavelSindler il y a 6 ans
Parent
commit
9b7cc60b42
2 fichiers modifiés avec 4 ajouts et 10 suppressions
  1. 1 7
      Firmware/Marlin_main.cpp
  2. 3 3
      Firmware/ultralcd.cpp

+ 1 - 7
Firmware/Marlin_main.cpp

@@ -3114,13 +3114,7 @@ void gcode_M701()
 	custom_message = true;
 	custom_message_type = 2;
 
-	if (current_position[Z_AXIS] < 20) {
-	  lcd_setstatuspgm(_T(MSG_PLEASE_WAIT));
-	  current_position[Z_AXIS] += 30;
-	  plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); //fast sequence
-	  st_synchronize();
-	  lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament and press the knob."));
-	}
+	if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30;
 
 	lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));
 	current_position[E_AXIS] += 70;

+ 3 - 3
Firmware/ultralcd.cpp

@@ -2110,7 +2110,7 @@ void lcd_menu_statistics()
 {
 	if (IS_SD_PRINTING)
 	{
-		int _met = total_filament_used / 100000;
+		float _met = ((float)total_filament_used) / (100000.f);
 		int _cm = (total_filament_used - (_met * 100000)) / 10;
 		int _t = (millis() - starttime) / 1000;
 		int _h = _t / 3600;
@@ -2125,12 +2125,12 @@ void lcd_menu_statistics()
 		lcd_printf_P(_N(
 		  ESC_2J
 		  "%S:"
-		  ESC_H(6,1) "%8.2f m\n"
+		  ESC_H(6,1) "%8.2fm \n"
 		  "%S :"
 		  ESC_H(8,3) "%2dh %02dm %02d"
 		  ),
 		 _i("Filament used"),
-		 _met, _cm,
+		 _met,
 		 _i("Print time"),
 		 _h, _m, _s
 		);