josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filament statistics hotfix, load filament move Z simplified

This commit is contained in:
PavelSindler 2018-07-11 19:35:22 +02:00
parent 11aa775322
commit 9b7cc60b42
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -3114,13 +3114,7 @@ void gcode_M701()
custom_message = true; custom_message = true;
custom_message_type = 2; custom_message_type = 2;
if (current_position[Z_AXIS] < 20) { if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30;
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."));
}
lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));
current_position[E_AXIS] += 70; current_position[E_AXIS] += 70;

6
Firmware/ultralcd.cpp
View File

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