From bfe00734936f02e5caa6f15252ab67c7ea0d6d2b Mon Sep 17 00:00:00 2001 From: bdring Date: Mon, 11 May 2020 21:50:41 -0500 Subject: [PATCH 1/2] 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 ); } From 1ad35c008fdfc469a582c277512dfa4df97e8f49 Mon Sep 17 00:00:00 2001 From: bdring Date: Thu, 14 May 2020 16:31:16 -0500 Subject: [PATCH 2/2] Some machine name fixes --- Grbl_Esp32/Machines/atari_1020.h | 2 +- Grbl_Esp32/Machines/lowrider_v1p2.h | 2 +- Grbl_Esp32/Machines/midtbot.h | 2 +- Grbl_Esp32/Machines/polar_coaster.h | 2 +- Grbl_Esp32/Machines/servo_axis.h | 2 +- Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h | 2 +- Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h | 2 +- Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h | 2 +- Grbl_Esp32/Spindles/HuanyangSpindle.cpp | 2 +- Grbl_Esp32/grbl.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Grbl_Esp32/Machines/atari_1020.h b/Grbl_Esp32/Machines/atari_1020.h index 5e4139eb..d2e01270 100644 --- a/Grbl_Esp32/Machines/atari_1020.h +++ b/Grbl_Esp32/Machines/atari_1020.h @@ -28,7 +28,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "MACHINE_ATARI_1020" +#define MACHINE_NAME "ATARI_1020" #define CUSTOM_CODE_FILENAME "Custom/atari_1020.cpp" diff --git a/Grbl_Esp32/Machines/lowrider_v1p2.h b/Grbl_Esp32/Machines/lowrider_v1p2.h index f742cd1f..50d90ad1 100644 --- a/Grbl_Esp32/Machines/lowrider_v1p2.h +++ b/Grbl_Esp32/Machines/lowrider_v1p2.h @@ -26,7 +26,7 @@ -#define MACHINE_NAME "MACHINE_LOWRIDER_V1P2" +#define MACHINE_NAME "LOWRIDER_V1P2" #define USE_GANGED_AXES // allow two motors on an axis diff --git a/Grbl_Esp32/Machines/midtbot.h b/Grbl_Esp32/Machines/midtbot.h index c7249897..e0c73329 100644 --- a/Grbl_Esp32/Machines/midtbot.h +++ b/Grbl_Esp32/Machines/midtbot.h @@ -22,7 +22,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "MIDTBOT" +#define MACHINE_NAME "midTbot" #define SPINDLE_TYPE SPINDLE_TYPE_NONE diff --git a/Grbl_Esp32/Machines/polar_coaster.h b/Grbl_Esp32/Machines/polar_coaster.h index 125fbcf4..6296a44a 100644 --- a/Grbl_Esp32/Machines/polar_coaster.h +++ b/Grbl_Esp32/Machines/polar_coaster.h @@ -22,7 +22,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "POLAR_COASTER" +#define MACHINE_NAME "Polar Coaster" // This causes the custom code file to be included in the build // via ../custom_code.cpp diff --git a/Grbl_Esp32/Machines/servo_axis.h b/Grbl_Esp32/Machines/servo_axis.h index 792c9c53..62d5f8f4 100644 --- a/Grbl_Esp32/Machines/servo_axis.h +++ b/Grbl_Esp32/Machines/servo_axis.h @@ -27,7 +27,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "MACHINE_SERVO_AXIS" +#define MACHINE_NAME "SERVO_AXIS" // Pick a board version //#define PEN_LASER_V1 diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h b/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h index 5aa018c6..917a3877 100644 --- a/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h +++ b/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h @@ -23,7 +23,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "SPI_DAISY_4X_xyyz" +#define MACHINE_NAME "SPI Daisy 4x XYYZ" #ifdef N_AXIS #undef N_AXIS diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h b/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h index 02732a2b..1187bd0c 100644 --- a/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h +++ b/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h @@ -23,7 +23,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "SPI_DAISY_4X_XYZ" +#define MACHINE_NAME "SPI Daisy 4x XYZ" #ifdef N_AXIS #undef N_AXIS diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h b/Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h index 0f278b20..93a03844 100644 --- a/Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h +++ b/Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h @@ -23,7 +23,7 @@ along with Grbl_ESP32. If not, see . */ -#define MACHINE_NAME "SPI_DAISY_4X XYZA" +#define MACHINE_NAME "SPI Daisy 4x XYZA" #ifdef N_AXIS #undef N_AXIS diff --git a/Grbl_Esp32/Spindles/HuanyangSpindle.cpp b/Grbl_Esp32/Spindles/HuanyangSpindle.cpp index 8b302904..14a8b6bc 100644 --- a/Grbl_Esp32/Spindles/HuanyangSpindle.cpp +++ b/Grbl_Esp32/Spindles/HuanyangSpindle.cpp @@ -99,7 +99,7 @@ void vfd_cmd_task(void* pvParameters) { } else { // TODO: Should we ping the spindle here to make sure it does not go off line? } - vTaskDelay(500); // TODO: What is the best value here? + vTaskDelay(200); // TODO: What is the best value here? } } diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h index 51ac5b3b..0b931fe6 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 "20200511" +#define GRBL_VERSION_BUILD "20200514" //#include #include