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

Merge pull request #1202 from MRprusa3d/PFW-573

Browse source 
preHeatError
This commit is contained in:
PavelSindler 2018-10-08 16:12:33 +02:00 committed by GitHub
commit c91c878408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Firmware/temperature.cpp
View file

@ -1210,6 +1210,9 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
static int __preheat_errors[2] = { 0,0}; static int __preheat_errors[2] = { 0,0};
if (millis() - temp_runaway_timer[_heater_id] > 2000)
{
#ifdef TEMP_RUNAWAY_BED_TIMEOUT #ifdef TEMP_RUNAWAY_BED_TIMEOUT
if (_isbed) if (_isbed)
{ {
@ -1225,9 +1228,6 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
} }
#endif #endif
if (millis() - temp_runaway_timer[_heater_id] > 2000)
{
temp_runaway_timer[_heater_id] = millis(); temp_runaway_timer[_heater_id] = millis();
if (_output == 0) if (_output == 0)
{ {
@ -1251,9 +1251,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
} }
} }
if (temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) if ((_current_temperature < _target_temperature) && (temp_runaway_status[_heater_id] == TempRunaway_PREHEAT))
{
if (_current_temperature < ((_isbed) ? (0.8 * _target_temperature) : 150)) //check only in area where temperature is changing fastly for heater, check to 0.8 x target temperature for bed
{ {
__preheat_counter[_heater_id]++; __preheat_counter[_heater_id]++;
if (__preheat_counter[_heater_id] > ((_isbed) ? 16 : 8)) // periodicaly check if current temperature changes if (__preheat_counter[_heater_id] > ((_isbed) ? 16 : 8)) // periodicaly check if current temperature changes
@ -1285,7 +1283,6 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
__preheat_counter[_heater_id] = 0; __preheat_counter[_heater_id] = 0;
} }
} }
}
if (_current_temperature >= _target_temperature && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) if (_current_temperature >= _target_temperature && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT)
{ {
@ -1293,7 +1290,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
temp_runaway_check_active = false; temp_runaway_check_active = false;
} }
if (!temp_runaway_check_active && _output > 0) if (_output > 0)
{ {
temp_runaway_check_active = true; temp_runaway_check_active = true;
} }
@ -1302,7 +1299,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
if (temp_runaway_check_active) if (temp_runaway_check_active)
{ {
// we are in range // we are in range
if (_target_temperature - __hysteresis < _current_temperature && _current_temperature < _target_temperature + __hysteresis) if ((_current_temperature > (_target_temperature - __hysteresis)) && (_current_temperature < (_target_temperature + __hysteresis)))
{ {
temp_runaway_check_active = false; temp_runaway_check_active = false;
temp_runaway_error_counter[_heater_id] = 0; temp_runaway_error_counter[_heater_id] = 0;

2
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View file

@ -128,7 +128,7 @@ EXTRUDER SETTINGS
#endif #endif
// Extrude mintemp // Extrude mintemp
#define EXTRUDE_MINTEMP 130 #define EXTRUDE_MINTEMP 175
// Extruder cooling fans // Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8 #define EXTRUDER_0_AUTO_FAN_PIN 8

2
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View file

@ -128,7 +128,7 @@ EXTRUDER SETTINGS
#endif #endif
// Extrude mintemp // Extrude mintemp
#define EXTRUDE_MINTEMP 130 #define EXTRUDE_MINTEMP 175
// Extruder cooling fans // Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8 #define EXTRUDER_0_AUTO_FAN_PIN 8

2
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View file

@ -182,7 +182,7 @@
#endif #endif
// Extrude mintemp // Extrude mintemp
#define EXTRUDE_MINTEMP 180 #define EXTRUDE_MINTEMP 175
// Extruder cooling fans // Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8 #define EXTRUDER_0_AUTO_FAN_PIN 8

2
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View file

@ -183,7 +183,7 @@
#endif #endif
// Extrude mintemp // Extrude mintemp
#define EXTRUDE_MINTEMP 180 #define EXTRUDE_MINTEMP 175
// Extruder cooling fans // Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8 #define EXTRUDER_0_AUTO_FAN_PIN 8

2
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View file

@ -299,7 +299,7 @@
#endif #endif
// Extrude mintemp // Extrude mintemp
#define EXTRUDE_MINTEMP 190 #define EXTRUDE_MINTEMP 175
// Extruder cooling fans // Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8 #define EXTRUDER_0_AUTO_FAN_PIN 8