mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 19:02:35 +02:00
Code Issues Releases Wiki Activity

Re fix reset (#501)

Browse Source 
* 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:
Mitch Bradley
2020-07-26 13:31:03 -10:00
parent 81c7746bb6
commit 05ff080935
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/grbl.h
View File

@@ -22,7 +22,7 @@
// Grbl versioning system // Grbl versioning system
#define GRBL_VERSION "1.3a" #define GRBL_VERSION "1.3a"
#define GRBL_VERSION_BUILD "20200725" #define GRBL_VERSION_BUILD "20200726"
//#include <sdkconfig.h> //#include <sdkconfig.h>

2
Grbl_Esp32/protocol.cpp
View File

@@ -99,7 +99,7 @@ err_t execute_line(char* line, uint8_t client, auth_t auth_level)
GRBL PRIMARY LOOP: GRBL PRIMARY LOOP:
*/ */
void protocol_main_loop() { void protocol_main_loop() {
empty_client_buffers(); serial_reset_read_buffer(CLIENT_ALL);
empty_lines(); empty_lines();
//uint8_t client = CLIENT_SERIAL; // default client //uint8_t client = CLIENT_SERIAL; // default client
// Perform some machine checks to make sure everything is good to go. // Perform some machine checks to make sure everything is good to go.

8
Grbl_Esp32/serial.cpp
View File

@@ -63,12 +63,6 @@ static TaskHandle_t serialCheckTaskHandle = 0;
InputBuffer client_buffer[CLIENT_COUNT]; // create a buffer for each client 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. // Returns the number of bytes available in a client buffer.
uint8_t serial_get_rx_buffer_available(uint8_t client) { uint8_t serial_get_rx_buffer_available(uint8_t client) {
return client_buffer[client].availableforwrite(); return client_buffer[client].availableforwrite();
@@ -160,7 +154,7 @@ void serialCheckTask(void* pvParameters) {
void serial_reset_read_buffer(uint8_t client) { void serial_reset_read_buffer(uint8_t client) {
for (uint8_t client_num = 0; client_num < CLIENT_COUNT; client_num++) { for (uint8_t client_num = 0; client_num < CLIENT_COUNT; client_num++) {
if (client == client_num || client == CLIENT_ALL) if (client == client_num || client == CLIENT_ALL)
client_buffer[client].begin(); client_buffer[client_num].begin();
} }
} }

2
Grbl_Esp32/serial.h
View File

@@ -56,6 +56,4 @@ void execute_realtime_command(uint8_t command, uint8_t client);
bool any_client_has_data(); bool any_client_has_data();
bool is_realtime_command(uint8_t data); bool is_realtime_command(uint8_t data);
void empty_client_buffers();
#endif #endif