mirror of
https://github.com/bdring/Grbl_Esp32.git
synced 2025-09-01 18:32:37 +02:00
Re fix reset (#501)
* Better fix for ^x reset problem By using an existing function instead of making a new one. The existing function was buggy, so fixed it. * Bump version
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
// Grbl versioning system
|
||||
|
||||
#define GRBL_VERSION "1.3a"
|
||||
#define GRBL_VERSION_BUILD "20200725"
|
||||
#define GRBL_VERSION_BUILD "20200726"
|
||||
|
||||
|
||||
//#include <sdkconfig.h>
|
||||
|
@@ -99,7 +99,7 @@ err_t execute_line(char* line, uint8_t client, auth_t auth_level)
|
||||
GRBL PRIMARY LOOP:
|
||||
*/
|
||||
void protocol_main_loop() {
|
||||
empty_client_buffers();
|
||||
serial_reset_read_buffer(CLIENT_ALL);
|
||||
empty_lines();
|
||||
//uint8_t client = CLIENT_SERIAL; // default client
|
||||
// Perform some machine checks to make sure everything is good to go.
|
||||
|
@@ -63,12 +63,6 @@ static TaskHandle_t serialCheckTaskHandle = 0;
|
||||
|
||||
InputBuffer client_buffer[CLIENT_COUNT]; // create a buffer for each client
|
||||
|
||||
void empty_client_buffers() {
|
||||
for (uint8_t i = 0; i < CLIENT_COUNT; i++) {
|
||||
client_buffer[i].end();
|
||||
}
|
||||
}
|
||||
|
||||
// Returns the number of bytes available in a client buffer.
|
||||
uint8_t serial_get_rx_buffer_available(uint8_t client) {
|
||||
return client_buffer[client].availableforwrite();
|
||||
@@ -160,7 +154,7 @@ void serialCheckTask(void* pvParameters) {
|
||||
void serial_reset_read_buffer(uint8_t client) {
|
||||
for (uint8_t client_num = 0; client_num < CLIENT_COUNT; client_num++) {
|
||||
if (client == client_num || client == CLIENT_ALL)
|
||||
client_buffer[client].begin();
|
||||
client_buffer[client_num].begin();
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -56,6 +56,4 @@ void execute_realtime_command(uint8_t command, uint8_t client);
|
||||
bool any_client_has_data();
|
||||
bool is_realtime_command(uint8_t data);
|
||||
|
||||
void empty_client_buffers();
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user