3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #836 from PavelSindler/M27_update

Browse source 
M27 hotfix: don't return "Not SD printing" in case that SD card print is paused
This commit is contained in:
XPila 2018-06-13 18:53:10 +02:00 committed by GitHub
commit 8b5e7122ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Firmware/Marlin.h
View file

@ -357,7 +357,7 @@ extern uint8_t print_percent_done_silent;
extern uint16_t print_time_remaining_silent; extern uint16_t print_time_remaining_silent;
#define PRINT_TIME_REMAINING_INIT 65535 #define PRINT_TIME_REMAINING_INIT 65535
#define PRINT_PERCENT_DONE_INIT 255 #define PRINT_PERCENT_DONE_INIT 255
#define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == 4) || saved_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) #define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == 4) || saved_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL) || card.paused)
extern void calculate_extruder_multipliers(); extern void calculate_extruder_multipliers();

5
Firmware/cardreader.cpp
View file

@ -523,8 +523,11 @@ void CardReader::getStatus()
SERIAL_PROTOCOL(itostr2(time%60)); SERIAL_PROTOCOL(itostr2(time%60));
SERIAL_PROTOCOLPGM("\n"); SERIAL_PROTOCOLPGM("\n");
} }
else if (paused) {
SERIAL_PROTOCOLLNPGM("SD print paused");
}
else if (saved_printing) { else if (saved_printing) {
SERIAL_PROTOCOLLNPGM("Print saved"); SERIAL_PROTOCOLLNPGM("Print saved");
} }
else { else {
SERIAL_PROTOCOLLNPGM("Not SD printing"); SERIAL_PROTOCOLLNPGM("Not SD printing");