diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 9c5dfd93d..65f0815ac 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -11,7 +11,7 @@ #define FW_version "3.1.1-RC1" #define FW_build 130 //#define FW_build --BUILD-NUMBER-- -#define FW_version_build FW_version " b" STR(FW_build) +#define FW_version_build FW_version " b" STR(FW_build) "a" #define FW_PRUSA3D_MAGIC "PRUSA3DFW" diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h index bbebe4691..d65a3ec93 100644 --- a/Firmware/Configuration_prusa.h +++ b/Firmware/Configuration_prusa.h @@ -75,11 +75,11 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) //Silent mode limits -#define SILENT_MAX_ACCEL_X 900 // X-axis max acceleration in silent mode in mm/s^2 -#define SILENT_MAX_ACCEL_Y 900 // Y-axis max axxeleration in silent mode in mm/s^2 +#define SILENT_MAX_ACCEL_X 1024 // X-axis max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_ACCEL_Y 1024 // Y-axis max axxeleration in silent mode in mm/s^2 #define SILENT_MAX_ACCEL_X_ST (100*SILENT_MAX_ACCEL_X) // X max accel in steps/s^2 #define SILENT_MAX_ACCEL_Y_ST (100*SILENT_MAX_ACCEL_Y) // Y max accel in steps/s^2 -#define SILENT_MAX_FEEDRATE 120 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (120mm/s=7200mm/min>2700mm/min) +#define SILENT_MAX_FEEDRATE 192 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (120mm/s=7200mm/min>2700mm/min) //number of bytes from end of the file to start check #define END_FILE_SECTION 10000 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c3104aa90..ee75901ba 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -601,6 +601,7 @@ void crashdet_disable() { MYSERIAL.println("crashdet_disable"); tmc2130_sg_stop_on_crash = false; + tmc2130_sg_crash = false; eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0x00); CrashDetectMenu = 0; } diff --git a/Firmware/thermistortables.h b/Firmware/thermistortables.h index 977a557e7..d722fa5d0 100644 --- a/Firmware/thermistortables.h +++ b/Firmware/thermistortables.h @@ -1215,7 +1215,7 @@ const short temptable_1047[][2] PROGMEM = { const short temptable_2000[][2] PROGMEM = { // Source: https://product.tdk.com/info/en/catalog/datasheets/503021/tpd_ntc-thermistor_ntcg_en.pdf // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance -{305*OVERSAMPLENR, 125}, +/*{305*OVERSAMPLENR, 125}, {338*OVERSAMPLENR, 120}, {374*OVERSAMPLENR, 115}, {412*OVERSAMPLENR, 110}, @@ -1248,7 +1248,41 @@ const short temptable_2000[][2] PROGMEM = { {997*OVERSAMPLENR, -25}, {998*OVERSAMPLENR, -30}, {999*OVERSAMPLENR, -35}, -{999*OVERSAMPLENR, -40}, +{999*OVERSAMPLENR, -40},*/ +{313*OVERSAMPLENR,125}, +{347*OVERSAMPLENR,120}, +{383*OVERSAMPLENR,115}, +{422*OVERSAMPLENR,110}, +{463*OVERSAMPLENR,105}, +{506*OVERSAMPLENR,100}, +{549*OVERSAMPLENR,95}, +{594*OVERSAMPLENR,90}, +{638*OVERSAMPLENR,85}, +{681*OVERSAMPLENR,80}, +{722*OVERSAMPLENR,75}, +{762*OVERSAMPLENR,70}, +{799*OVERSAMPLENR,65}, +{833*OVERSAMPLENR,60}, +{863*OVERSAMPLENR,55}, +{890*OVERSAMPLENR,50}, +{914*OVERSAMPLENR,45}, +{934*OVERSAMPLENR,40}, +{951*OVERSAMPLENR,35}, +{966*OVERSAMPLENR,30}, +{978*OVERSAMPLENR,25}, +{988*OVERSAMPLENR,20}, +{996*OVERSAMPLENR,15}, +{1002*OVERSAMPLENR,10}, +{1007*OVERSAMPLENR,5}, +{1012*OVERSAMPLENR,0}, +{1015*OVERSAMPLENR,-5}, +{1017*OVERSAMPLENR,-10}, +{1019*OVERSAMPLENR,-15}, +{1020*OVERSAMPLENR,-20}, +{1021*OVERSAMPLENR,-25}, +{1022*OVERSAMPLENR,-30}, +{1023*OVERSAMPLENR,-35}, +{1023*OVERSAMPLENR,-40}, }; #endif