CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 05:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly clear input buffer for serial

Browse Source
This commit is contained in:
suchmememanyskill
2025-01-11 17:15:26 +01:00
parent 1efaa616e1
commit fdfa2d014f
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CYD-Klipper/src/core/klipper-serial/serial_klipper_printer_integration.cpp
View File

@@ -3,12 +3,23 @@
#include <UrlEncode.h> #include <UrlEncode.h>
#include "../../ui/serial/serial_console.h" #include "../../ui/serial/serial_console.h"
void clear_serial_buffer() void clear_serial_buffer(bool can_rely_on_newline_terminator = true)
{ {
while (Serial.available()) if (can_rely_on_newline_terminator)
{ {
Serial.read(); if (Serial.available())
}; {
while (Serial.read() != '\n')
;
}
}
else
{
while (Serial.available())
{
Serial.read();
}
}
} }
// Request: {timeout} {method} {endpoint} // Request: {timeout} {method} {endpoint}
@@ -46,7 +57,7 @@ bool make_serial_request(JsonDocument &out, int timeout_ms, HttpRequestType requ
if (buff[0] < '0' || buff[0] > '9') if (buff[0] < '0' || buff[0] > '9')
{ {
Serial.println("Invalid error code"); Serial.printf("Invalid error code, got char '%c'\n", buff[0]);
clear_serial_buffer(); clear_serial_buffer();
return false; return false;
@@ -108,7 +119,7 @@ bool make_binary_request(BinaryResponse* data, int timeout_ms, HttpRequestType r
if (buff[0] < '0' || buff[0] > '9') if (buff[0] < '0' || buff[0] > '9')
{ {
Serial.println("Invalid length"); Serial.println("Invalid length");
clear_serial_buffer(); clear_serial_buffer(false);
return false; return false;
} }
@@ -118,7 +129,7 @@ bool make_binary_request(BinaryResponse* data, int timeout_ms, HttpRequestType r
if (data_length <= 0) if (data_length <= 0)
{ {
Serial.println("0 Length"); Serial.println("0 Length");
clear_serial_buffer(); clear_serial_buffer(false);
return false; return false;
} }
@@ -129,7 +140,7 @@ bool make_binary_request(BinaryResponse* data, int timeout_ms, HttpRequestType r
if (data->data == NULL) if (data->data == NULL)
{ {
Serial.println("Failed to allocate memory"); Serial.println("Failed to allocate memory");
clear_serial_buffer(); clear_serial_buffer(false);
return false; return false;
} }