From c051a2ecaeb37df8f5dd76e3feb71bdb3f7f66fc Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 24 Feb 2021 02:13:24 +0000 Subject: [PATCH] Fix Chiron TFT serial comms (#21152) --- Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp | 6 +++--- .../sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp index 61057b5b1..c50de1c0a 100644 --- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp +++ b/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp @@ -292,7 +292,7 @@ namespace Anycubic { #if ACDEBUG(AC_SOME) serialprintPGM(str); #endif - while (const char c = pgm_read_byte(str++)) TFTSer.print(c); + while (const char c = pgm_read_byte(str++)) TFTSer.write(c); } void ChironTFT::SendtoTFTLN(PGM_P str = nullptr) { @@ -305,7 +305,7 @@ namespace Anycubic { SERIAL_EOL(); #endif } - TFTSer.println(""); + TFTSer.println(); } bool ChironTFT::ReadTFTCommand() { @@ -840,7 +840,7 @@ namespace Anycubic { // Ignore request if printing //if (isPrinting()) break; //injectCommands_P(PSTR("M500\nM420 S1\nG1 Z10 F240\nG1 X0 Y0 F6000")); - //TFTSer.println(""); + //TFTSer.println(); } break; // A33 firmware info request seet PanelInfo() diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h index 9c7b5001c..4ab1a6b8f 100644 --- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h +++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h @@ -984,7 +984,7 @@ uint8_t UHS_USB_HOST_BASE::ctrlReq(uint8_t addr, uint64_t Request, uint16_t nbyt //bool direction = bmReqType & 0x80; //request direction, IN or OUT uint8_t rcode = 0; - // Serial.println(""); + //Serial.println(); UHS_EpInfo *pep = ctrlReqOpen(addr, Request, dataptr); if(!pep) { HOST_DEBUG("ctrlReq1: ERROR_NULL_EPINFO addr: %d\r\n", addr);