Browse Source

Merge remote-tracking branch 'origin/MK3' into MK3

michalprusa 7 năm trước cách đây
mục cha
commit
0b88142253
2 tập tin đã thay đổi với 3 bổ sung3 xóa
  1. 2 2
      Firmware/Configuration_prusa.h
  2. 1 1
      Firmware/ultralcd.cpp

+ 2 - 2
Firmware/Configuration_prusa.h

@@ -115,12 +115,12 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define TMC2130_INTPOL_Z    1         // extrapolate 256 for Z axis
 #define TMC2130_INTPOL_E    1         // extrapolate 256 for E axis
 
-#define TMC2130_PWM_GRAD_X  8         // PWMCONF
+#define TMC2130_PWM_GRAD_X  4         // PWMCONF
 #define TMC2130_PWM_AMPL_X  220       // PWMCONF
 #define TMC2130_PWM_AUTO_X  1         // PWMCONF
 #define TMC2130_PWM_FREQ_X  2         // PWMCONF
 
-#define TMC2130_PWM_GRAD_Y  8         // PWMCONF
+#define TMC2130_PWM_GRAD_Y  4         // PWMCONF
 #define TMC2130_PWM_AMPL_Y  225       // PWMCONF
 #define TMC2130_PWM_AUTO_Y  1         // PWMCONF
 #define TMC2130_PWM_FREQ_Y  2         // PWMCONF

+ 1 - 1
Firmware/ultralcd.cpp

@@ -2582,7 +2582,7 @@ static void lcd_silent_mode_set() {
   eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu);
 #ifdef TMC2130
   st_synchronize();
-  if (tmc2130_wait_standstill_xy(100))
+  if (tmc2130_wait_standstill_xy(1000))
 	  MYSERIAL.print("standstill OK");
   else
 	  MYSERIAL.print("standstill NG!");