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

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

Browse source
This commit is contained in:
michalprusa 2017-09-26 14:48:32 +01:00
commit 0b88142253
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Firmware/Configuration_prusa.h
View file

@ -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_Z 1 // extrapolate 256 for Z axis
#define TMC2130_INTPOL_E 1 // extrapolate 256 for E 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_AMPL_X 220 // PWMCONF
#define TMC2130_PWM_AUTO_X 1 // PWMCONF #define TMC2130_PWM_AUTO_X 1 // PWMCONF
#define TMC2130_PWM_FREQ_X 2 // 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_AMPL_Y 225 // PWMCONF
#define TMC2130_PWM_AUTO_Y 1 // PWMCONF #define TMC2130_PWM_AUTO_Y 1 // PWMCONF
#define TMC2130_PWM_FREQ_Y 2 // PWMCONF #define TMC2130_PWM_FREQ_Y 2 // PWMCONF

2
Firmware/ultralcd.cpp
View file

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