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

dont process data from serial line if print is saved (crash detection and filament detection)

Browse Source
This commit is contained in:
PavelSindler 2018-06-19 16:51:22 +02:00
parent 209209459d
commit 1e60390545
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -7160,8 +7160,8 @@ void FlushSerialRequestResend()
void ClearToSend()
{
previous_millis_cmd = millis();
if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR))
SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR))
SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
}
#if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3
@ -8926,6 +8926,7 @@ void restore_print_from_ram_and_continue(float e_move)
}
else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing
gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing
serial_count = 0;
FlushSerialRequestResend();
}
else {

5
Firmware/cmdqueue.cpp
View File

@ -91,7 +91,7 @@ bool cmdqueue_pop_front()
void cmdqueue_reset()
{
bufindr = 0;
bufindr = 0;
bufindw = 0;
buflen = 0;
cmdbuffer_front_already_processed = false;
@ -385,7 +385,8 @@ void get_command()
rx_buffer_full = true; //sets flag that buffer was full
}
while (MYSERIAL.available() > 0) {
// start of serial line processing loop
while (MYSERIAL.available() > 0 && !saved_printing) { //is print is saved (crash detection or filament detection), dont process data from serial line
char serial_char = MYSERIAL.read();
/* if (selectedSerialPort == 1)