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

Merge pull request #315 from XPila/MK3 

new ambient thermistor table
This commit is contained in:
XPila 2017-12-12 22:51:02 +01:00 committed by GitHub
parent 30a45043a7 7e00248060
commit bbd8dc3191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 15099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/Configuration_prusa.h
View File

@ -92,6 +92,13 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
// Disable some commands // Disable some commands
#define _DISABLE_M42_M226 #define _DISABLE_M42_M226
// Minimum ambient temperature limit to start triggering MINTEMP errors [C]
// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it,
// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle
// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater)
#define MINTEMP_MINAMBIENT 18
//DEBUG //DEBUG
//#define _NO_ASM //#define _NO_ASM
#define DEBUG_DCODES //D codes #define DEBUG_DCODES //D codes

15066
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

2
Firmware/temperature.cpp
View File

@ -1465,6 +1465,7 @@ void min_temp_error(uint8_t e) {
#ifdef DEBUG_DISABLE_MINTEMP #ifdef DEBUG_DISABLE_MINTEMP
return; return;
#endif #endif
if (current_temperature_ambient < MINTEMP_MINAMBIENT) return;
disable_heater(); disable_heater();
if(IsStopped() == false) { if(IsStopped() == false) {
SERIAL_ERROR_START; SERIAL_ERROR_START;
@ -1498,6 +1499,7 @@ void bed_min_temp_error(void) {
#ifdef DEBUG_DISABLE_MINTEMP #ifdef DEBUG_DISABLE_MINTEMP
return; return;
#endif #endif
if (current_temperature_ambient < MINTEMP_MINAMBIENT) return;
#if HEATER_BED_PIN > -1 #if HEATER_BED_PIN > -1
WRITE(HEATER_BED_PIN, 0); WRITE(HEATER_BED_PIN, 0);
#endif #endif

66
Firmware/thermistortables.h
View File

@ -1249,39 +1249,39 @@ const short temptable_2000[][2] PROGMEM = {
{998*OVERSAMPLENR, -30}, {998*OVERSAMPLENR, -30},
{999*OVERSAMPLENR, -35}, {999*OVERSAMPLENR, -35},
{999*OVERSAMPLENR, -40},*/ {999*OVERSAMPLENR, -40},*/
{313*OVERSAMPLENR,125}, {313*OVERSAMPLENR,125},
{347*OVERSAMPLENR,120}, {347*OVERSAMPLENR,120},
{383*OVERSAMPLENR,115}, {383*OVERSAMPLENR,115},
{422*OVERSAMPLENR,110}, {422*OVERSAMPLENR,110},
{463*OVERSAMPLENR,105}, {463*OVERSAMPLENR,105},
{506*OVERSAMPLENR,100}, {506*OVERSAMPLENR,100},
{549*OVERSAMPLENR,95}, {549*OVERSAMPLENR,95},
{594*OVERSAMPLENR,90}, {594*OVERSAMPLENR,90},
{638*OVERSAMPLENR,85}, {638*OVERSAMPLENR,85},
{681*OVERSAMPLENR,80}, {681*OVERSAMPLENR,80},
{722*OVERSAMPLENR,75}, {722*OVERSAMPLENR,75},
{762*OVERSAMPLENR,70}, {762*OVERSAMPLENR,70},
{799*OVERSAMPLENR,65}, {799*OVERSAMPLENR,65},
{833*OVERSAMPLENR,60}, {833*OVERSAMPLENR,60},
{863*OVERSAMPLENR,55}, {863*OVERSAMPLENR,55},
{890*OVERSAMPLENR,50}, {890*OVERSAMPLENR,50},
{914*OVERSAMPLENR,45}, {914*OVERSAMPLENR,45},
{934*OVERSAMPLENR,40}, {934*OVERSAMPLENR,40},
{951*OVERSAMPLENR,35}, {951*OVERSAMPLENR,35},
{966*OVERSAMPLENR,30}, {966*OVERSAMPLENR,30},
{978*OVERSAMPLENR,25}, {978*OVERSAMPLENR,25},
{988*OVERSAMPLENR,20}, {988*OVERSAMPLENR,20},
{996*OVERSAMPLENR,15}, {996*OVERSAMPLENR,15},
{1002*OVERSAMPLENR,10}, {1002*OVERSAMPLENR,10},
{1007*OVERSAMPLENR,5}, {1007*OVERSAMPLENR,5},
{1012*OVERSAMPLENR,0}, {1012*OVERSAMPLENR,0},
{1015*OVERSAMPLENR,-5}, {1015*OVERSAMPLENR,-5},
{1017*OVERSAMPLENR,-10}, {1017*OVERSAMPLENR,-10},
{1019*OVERSAMPLENR,-15}, {1019*OVERSAMPLENR,-15},
{1020*OVERSAMPLENR,-20}, {1020*OVERSAMPLENR,-20},
{1021*OVERSAMPLENR,-25}, {1021*OVERSAMPLENR,-25},
{1022*OVERSAMPLENR,-30}, {1022*OVERSAMPLENR,-30},
{1023*OVERSAMPLENR,-35}, {1023*OVERSAMPLENR,-35},
{1023*OVERSAMPLENR,-40}, {1023*OVERSAMPLENR,-40},
}; };
#endif #endif