3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #408 from XPila/MK3

Browse Source 
Mk3
This commit is contained in:
XPila 2018-01-16 17:10:07 +01:00 committed by GitHub
commit d5500db66d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Configuration.h
View File

@ -9,9 +9,9 @@
// Firmware version // Firmware version
#define FW_VERSION "3.1.1-RC4" #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_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_UNKNOWN 4
#define FW_VERSION_ALPHA 3 #define FW_VERSION_ALPHA 3

4
Firmware/tmc2130.cpp
View File

@ -239,7 +239,9 @@ void tmc2130_st_isr(uint8_t last_step_mask)
{ {
tmc2130_sg_cnt[axis] = tmc2130_sg_err[axis]; tmc2130_sg_cnt[axis] = tmc2130_sg_err[axis];
tmc2130_sg_change = true; 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; tmc2130_sg_err[axis] = 0;
crash = true; crash = true;