zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Chiron TFT serial comms (#21152)

Browse source
This commit is contained in:
Nick 2021-02-24 02:13:24 +00:00 committed by Scott Lahteine
parent dc0247c57e
commit c051a2ecae
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
View file

@ -292,7 +292,7 @@ namespace Anycubic {
#if ACDEBUG(AC_SOME) #if ACDEBUG(AC_SOME)
serialprintPGM(str); serialprintPGM(str);
#endif #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) { void ChironTFT::SendtoTFTLN(PGM_P str = nullptr) {
@ -305,7 +305,7 @@ namespace Anycubic {
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
} }
TFTSer.println(""); TFTSer.println();
} }
bool ChironTFT::ReadTFTCommand() { bool ChironTFT::ReadTFTCommand() {
@ -840,7 +840,7 @@ namespace Anycubic {
// Ignore request if printing // Ignore request if printing
//if (isPrinting()) break; //if (isPrinting()) break;
//injectCommands_P(PSTR("M500\nM420 S1\nG1 Z10 F240\nG1 X0 Y0 F6000")); //injectCommands_P(PSTR("M500\nM420 S1\nG1 Z10 F240\nG1 X0 Y0 F6000"));
//TFTSer.println(""); //TFTSer.println();
} break; } break;
// A33 firmware info request seet PanelInfo() // A33 firmware info request seet PanelInfo()

2
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h
View file

@ -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 //bool direction = bmReqType & 0x80; //request direction, IN or OUT
uint8_t rcode = 0; uint8_t rcode = 0;
// Serial.println(""); //Serial.println();
UHS_EpInfo *pep = ctrlReqOpen(addr, Request, dataptr); UHS_EpInfo *pep = ctrlReqOpen(addr, Request, dataptr);
if(!pep) { if(!pep) {
HOST_DEBUG("ctrlReq1: ERROR_NULL_EPINFO addr: %d\r\n", addr); HOST_DEBUG("ctrlReq1: ERROR_NULL_EPINFO addr: %d\r\n", addr);