jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix touch ui for stm32

Browse Source
This commit is contained in:
InsanityAutomation
2023-05-31 23:32:39 -04:00
parent 7862493991
commit 97e0ed7393
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration_adv.h
+1 -1
View File
@@ -1974,7 +1974,7 @@
#define DGUS_RX_BUFFER_SIZE 128
#define DGUS_TX_BUFFER_SIZE 48
#if ENABLED(FORCE10SPRODISPLAY)
#if ENABLED(FORCE10SPRODISPLAY) && DISABLED(Creality422, Creality427)
#define SERIAL_STATS_RX_BUFFER_OVERRUNS // Fix Rx overrun situation (Currently only for AVR)
#endif
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp
+24 -19
View File
@@ -599,7 +599,7 @@ RTSSHOW::RTSSHOW()
int RTSSHOW::RTS_RecData()
{
uint8_t receivedbyte;
#if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
if (!DWIN_SERIAL.available() && DWIN_SERIAL.buffer_overruns()) {
// Overrun, but reset the flag only when the buffer is empty
// We want to extract as many as valid datagrams possible...
@@ -608,6 +608,7 @@ int RTSSHOW::RTS_RecData()
//DWIN_SERIAL.reset_rx_overun();
DWIN_SERIAL.flush();
}
#endif
while (DWIN_SERIAL.available()) {
@@ -777,16 +778,18 @@ void RTSSHOW::RTS_SndData(const char *str, unsigned long addr, unsigned char cmd
uint8_t expected_tx = 6 + len; // 6 bytes header + payload.
const millis_t try_until = ExtUI::safe_millis() + 1000;
while (expected_tx > DWIN_SERIAL.get_tx_buffer_free()) {
if (ELAPSED(ExtUI::safe_millis(), try_until)) return; // Stop trying after 1 second
#if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
while (expected_tx > DWIN_SERIAL.get_tx_buffer_free()) {
if (ELAPSED(ExtUI::safe_millis(), try_until)) return; // Stop trying after 1 second
#ifdef ARDUINO_ARCH_STM32
DWIN_SERIAL.flush();
#else
DWIN_SERIAL.flushTX();
#endif
delay(50);
}
#ifdef ARDUINO_ARCH_STM32
DWIN_SERIAL.flush();
#else
DWIN_SERIAL.flushTX();
#endif
delay(50);
}
#endif
int dataRec2;
do { dataRec2 = rtscheck.RTS_RecData(); } while (dataRec2 > 0); // Since OS4 returns an ack on an 82 command, receive and purge it now
@@ -907,16 +910,18 @@ void RTSSHOW::WriteVariable(uint16_t adr, const void* values, uint8_t valueslen,
uint8_t expected_tx = 6 + valueslen; // 6 bytes header + payload.
const millis_t try_until = ExtUI::safe_millis() + 1000;
while (expected_tx > DWIN_SERIAL.get_tx_buffer_free()) {
if (ELAPSED(ExtUI::safe_millis(), try_until)) return; // Stop trying after 1 second
#if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
while (expected_tx > DWIN_SERIAL.get_tx_buffer_free()) {
if (ELAPSED(ExtUI::safe_millis(), try_until)) return; // Stop trying after 1 second
#ifdef ARDUINO_ARCH_STM32
DWIN_SERIAL.flush();
#else
DWIN_SERIAL.flushTX();
#endif
delay(50);
}
#ifdef ARDUINO_ARCH_STM32
DWIN_SERIAL.flush();
#else
DWIN_SERIAL.flushTX();
#endif
delay(50);
}
#endif
int dataRec2;
do { dataRec2 = rtscheck.RTS_RecData(); } while (dataRec2 > 0); // Since OS4 returns an ack on an 82 command, receive and purge it now