diff --git a/Marlin/src/lcd/HardwareSerial.cpp b/Marlin/src/lcd/HardwareSerial.cpp index ab029414..c0179fd1 100755 --- a/Marlin/src/lcd/HardwareSerial.cpp +++ b/Marlin/src/lcd/HardwareSerial.cpp @@ -312,33 +312,6 @@ HardwareSerialClass::operator bool() HardwareSerialClass HardwareSerial(&rx_buffer_ajg, &tx_buffer_ajg, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3, RXEN3, TXEN3, RXCIE3, UDRIE3, U2X3); #endif -void Newok_to_send() { - previous_cmd_ms = millis(); - /* - if (!send_ok[cmd_queue_index_r]) return; - // SERIAL_PROTOCOLPGM(MSG_OK); - #if ENABLED(ADVANCED_OK) - char* p = command_queue[cmd_queue_index_r]; - if (*p == 'N') { - SERIAL_PROTOCOL(' '); - SERIAL_ECHO(*p++); - while (NUMERIC_SIGNED(*p)) - SERIAL_ECHO(*p++); - } - SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1)); - SERIAL_PROTOCOLPGM(" B"); SERIAL_PROTOCOL(BUFSIZE - commands_in_queue); - #endif - SERIAL_EOL; - */ -} -void NEWFlushSerialRequestResend() { - //char command_queue[cmd_queue_index_r][100]="Resend:"; - HardwareSerial.flush(); - // SERIAL_PROTOCOLPGM(MSG_RESEND); -// SERIAL_PROTOCOLLN(gcode_LastN + 1); - Newok_to_send(); -} - #endif #endif // whole file diff --git a/Marlin/src/lcd/HardwareSerial.h b/Marlin/src/lcd/HardwareSerial.h index de91bd1f..b8048ed7 100755 --- a/Marlin/src/lcd/HardwareSerial.h +++ b/Marlin/src/lcd/HardwareSerial.h @@ -141,7 +141,4 @@ FORCE_INLINE void HardwareSerialprintPGM(const char *str) } } -void NEWFlushSerialRequestResend(); -void NEWClearToSend(); - #endif diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 20e0b2b2..d09edb04 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -1076,10 +1076,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() if( (int)(strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)) != checksum) { HARDWARE_SERIAL_ERROR_START; - NEWFlushSerialRequestResend(); - - HARDWARE_SERIAL_ERROR_START; - NEWFlushSerialRequestResend(); + HardwareSerial.flush(); serial3_count = 0; return; } @@ -1088,7 +1085,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() else { HARDWARE_SERIAL_ERROR_START; - NEWFlushSerialRequestResend(); + HardwareSerial.flush(); serial3_count = 0; return; }