From 6b5f9253d67caabba28fc1b86b0189ce6db07bdb Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 16 Jan 2018 16:50:05 +0100 Subject: [PATCH 1/2] build 147 --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7e951119..792a5ff0 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,9 +9,9 @@ // Firmware version #define FW_VERSION "3.1.1-RC4" -#define FW_COMMIT_NR 146 +#define FW_COMMIT_NR 147 #define FW_DEV_VERSION FW_VERSION_RC -#define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR)"c" +#define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR) #define FW_VERSION_UNKNOWN 4 #define FW_VERSION_ALPHA 3 From c2710fea637da8c2970dcacdc9b7d3fdbf5fd1ab Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 16 Jan 2018 17:04:21 +0100 Subject: [PATCH 2/2] crashdetection limits changed (X=48, Y=64) --- Firmware/tmc2130.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index a9180300..01713208 100644 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -239,7 +239,9 @@ void tmc2130_st_isr(uint8_t last_step_mask) { tmc2130_sg_cnt[axis] = tmc2130_sg_err[axis]; tmc2130_sg_change = true; - if (tmc2130_sg_err[axis] >= 32) + uint8_t sg_thr = 48; + if (axis == Y_AXIS) sg_thr = 64; + if (tmc2130_sg_err[axis] >= sg_thr) { tmc2130_sg_err[axis] = 0; crash = true;