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

Merge pull request #1596 from PavelSindler/farm_status_new 

new farm statuses for pause (14) and wait for user (15)
This commit is contained in:
MRprusa3d 2019-03-05 16:14:59 +01:00 committed by GitHub
parent 27f69bb761 f1031d2302
commit 869c8caaa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Firmware/ultralcd.cpp
View File

@ -4080,7 +4080,25 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
{ {
case 0: // default message case 0: // default message
if (IS_SD_PRINTING) if (busy_state == PAUSED_FOR_USER)
{
SERIAL_ECHO("{");
prusa_stat_printerstatus(15);
prusa_stat_farm_number();
prusa_stat_printinfo();
SERIAL_ECHOLN("}");
status_number = 15;
}
else if (isPrintPaused || card.paused)
{
SERIAL_ECHO("{");
prusa_stat_printerstatus(14);
prusa_stat_farm_number();
prusa_stat_printinfo();
SERIAL_ECHOLN("}");
status_number = 14;
}
else if (IS_SD_PRINTING)
{ {
SERIAL_ECHO("{"); SERIAL_ECHO("{");
prusa_stat_printerstatus(4); prusa_stat_printerstatus(4);