diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 6b509d04..dd803c9d 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -8,10 +8,10 @@ #define STR(x) STR_HELPER(x) // Firmware version -#define FW_version "3.1.1-RC2" -#define FW_build 137 +#define FW_version "3.1.1-RC3" +#define FW_build 138 //#define FW_build --BUILD-NUMBER-- -#define FW_version_build FW_version " b" STR(FW_build) "z" +#define FW_version_build FW_version " b" STR(FW_build) #define FW_PRUSA3D_MAGIC "PRUSA3DFW" diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 047ea6dd..989014d3 100644 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -221,6 +221,8 @@ uint8_t tmc2130_sample_diag() return mask; } +extern bool is_usb_printing; + void tmc2130_st_isr(uint8_t last_step_mask) { if (tmc2130_mode == TMC2130_MODE_SILENT || tmc2130_sg_stop_on_crash == false) return; @@ -253,7 +255,7 @@ void tmc2130_st_isr(uint8_t last_step_mask) if (diag_mask & 0x04) tmc2130_sg_cnt[2]++; if (diag_mask & 0x08) tmc2130_sg_cnt[3]++; }*/ - if (tmc2130_sg_stop_on_crash && crash) + if (!is_usb_printing && tmc2130_sg_stop_on_crash && crash) { tmc2130_sg_crash = true; tmc2130_sg_stop_on_crash = false;