From bfe00734936f02e5caa6f15252ab67c7ea0d6d2b Mon Sep 17 00:00:00 2001 From: bdring Date: Mon, 11 May 2020 21:50:41 -0500 Subject: [PATCH] Changed serial read core -Test fix for problems with pause and reset of running jobs. - It may have been due to 2 cores accessing the same data. --- Grbl_Esp32/grbl.h | 2 +- Grbl_Esp32/report.cpp | 2 +- Grbl_Esp32/serial.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h index 379babf2..51ac5b3b 100644 --- a/Grbl_Esp32/grbl.h +++ b/Grbl_Esp32/grbl.h @@ -22,7 +22,7 @@ // Grbl versioning system #define GRBL_VERSION "1.2a" -#define GRBL_VERSION_BUILD "20200510" +#define GRBL_VERSION_BUILD "20200511" //#include #include diff --git a/Grbl_Esp32/report.cpp b/Grbl_Esp32/report.cpp index d5c91c85..622bfa9e 100644 --- a/Grbl_Esp32/report.cpp +++ b/Grbl_Esp32/report.cpp @@ -258,7 +258,7 @@ void report_feedback_message(uint8_t message_code) { // OK to send to all client #ifdef ENABLE_SD_CARD case MESSAGE_SD_FILE_QUIT: grbl_notifyf("SD print canceled", "Reset during SD file at line: %d", sd_get_current_line_number()); - grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Reset during SD file at line: %d", sd_get_current_line_number); + grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Reset during SD file at line: %d", sd_get_current_line_number()); break; #endif } diff --git a/Grbl_Esp32/serial.cpp b/Grbl_Esp32/serial.cpp index 407137e3..ea883da1 100644 --- a/Grbl_Esp32/serial.cpp +++ b/Grbl_Esp32/serial.cpp @@ -82,7 +82,7 @@ void serial_init() { NULL, // parameters 1, // priority &serialCheckTaskHandle, - 0 // core + 1 // core ); }