Ver código fonte

Merge pull request #408 from XPila/MK3

Mk3
XPila 6 anos atrás
pai
commit
d5500db66d
2 arquivos alterados com 5 adições e 3 exclusões
  1. 2 2
      Firmware/Configuration.h
  2. 3 1
      Firmware/tmc2130.cpp

+ 2 - 2
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

+ 3 - 1
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;