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

Ambient thermistor - new table (PFW-71) 

Crashdetection disable durring print (PI3M3-42)
Stealth mode - better limit values (PI3M3-5)
This commit is contained in:
Robert Pelnar 2017-12-12 15:44:42 +01:00
parent 7204e91ec6
commit 0271da3c67
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -11,7 +11,7 @@
#define FW_version "3.1.1-RC1" #define FW_version "3.1.1-RC1"
#define FW_build 130 #define FW_build 130
//#define FW_build --BUILD-NUMBER-- //#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" #define FW_PRUSA3D_MAGIC "PRUSA3DFW"

6
Firmware/Configuration_prusa.h
View File

@ -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) #define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min)
//Silent mode limits //Silent mode limits
#define SILENT_MAX_ACCEL_X 900 // X-axis max acceleration 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 900 // Y-axis max axxeleration 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_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_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 //number of bytes from end of the file to start check
#define END_FILE_SECTION 10000 #define END_FILE_SECTION 10000

1
Firmware/Marlin_main.cpp
View File

@ -601,6 +601,7 @@ void crashdet_disable()
{ {
MYSERIAL.println("crashdet_disable"); MYSERIAL.println("crashdet_disable");
tmc2130_sg_stop_on_crash = false; tmc2130_sg_stop_on_crash = false;
tmc2130_sg_crash = false;
eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0x00); eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0x00);
CrashDetectMenu = 0; CrashDetectMenu = 0;
} }

38
Firmware/thermistortables.h
View File

@ -1215,7 +1215,7 @@ const short temptable_1047[][2] PROGMEM = {
const short temptable_2000[][2] PROGMEM = { const short temptable_2000[][2] PROGMEM = {
// Source: https://product.tdk.com/info/en/catalog/datasheets/503021/tpd_ntc-thermistor_ntcg_en.pdf // 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 // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
{305*OVERSAMPLENR, 125}, /*{305*OVERSAMPLENR, 125},
{338*OVERSAMPLENR, 120}, {338*OVERSAMPLENR, 120},
{374*OVERSAMPLENR, 115}, {374*OVERSAMPLENR, 115},
{412*OVERSAMPLENR, 110}, {412*OVERSAMPLENR, 110},
@ -1248,7 +1248,41 @@ const short temptable_2000[][2] PROGMEM = {
{997*OVERSAMPLENR, -25}, {997*OVERSAMPLENR, -25},
{998*OVERSAMPLENR, -30}, {998*OVERSAMPLENR, -30},
{999*OVERSAMPLENR, -35}, {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 #endif