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

different preheat error messages for bed and hotend

Browse source
This commit is contained in:
PavelSindler 2017-04-03 15:28:03 +02:00
parent 53938e2280
commit 7086764d35
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Firmware/Configuration.h
View file

@ -5,7 +5,7 @@
#include "Configuration_prusa.h" #include "Configuration_prusa.h"
// Firmware version // Firmware version
#define FW_version "3.0.10-8" #define FW_version "3.0.10-9"
#define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC "PRUSA3DFW"
#define FW_PRUSA3D_MAGIC_LEN 10 #define FW_PRUSA3D_MAGIC_LEN 10

14
Firmware/temperature.cpp
View file

@ -1134,7 +1134,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
if (__preheat_errors > 5) if (__preheat_errors > 5)
{ {
if (farm_mode) { prusa_statistics(0); } if (farm_mode) { prusa_statistics(0); }
temp_runaway_stop(true); temp_runaway_stop(true, _isbed);
if (farm_mode) { prusa_statistics(91); } if (farm_mode) { prusa_statistics(91); }
} }
__preheat_start = _current_temperature; __preheat_start = _current_temperature;
@ -1171,7 +1171,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
if (temp_runaway_error_counter[_heater_id] * 2 > __timeout) if (temp_runaway_error_counter[_heater_id] * 2 > __timeout)
{ {
if (farm_mode) { prusa_statistics(0); } if (farm_mode) { prusa_statistics(0); }
temp_runaway_stop(false); temp_runaway_stop(false, _isbed);
if (farm_mode) { prusa_statistics(90); } if (farm_mode) { prusa_statistics(90); }
} }
} }
@ -1181,7 +1181,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
} }
} }
void temp_runaway_stop(bool isPreheat) void temp_runaway_stop(bool isPreheat, bool isBed)
{ {
cancel_heatup = true; cancel_heatup = true;
quickStop(); quickStop();
@ -1207,9 +1207,9 @@ void temp_runaway_stop(bool isPreheat)
if (isPreheat) if (isPreheat)
{ {
Stop(); Stop();
LCD_ALERTMESSAGEPGM(" PREHEAT ERROR"); isBed ? LCD_ALERTMESSAGEPGM("BED PREHEAT ERROR") : LCD_ALERTMESSAGEPGM("PREHEAT ERROR");
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(": THERMAL RUNAWAY ( PREHEAT )"); isBed ? SERIAL_ERRORLNPGM(" THERMAL RUNAWAY ( PREHEAT HEATBED)") : SERIAL_ERRORLNPGM(" THERMAL RUNAWAY ( PREHEAT HOTEND)");
SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN); SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN);
SET_OUTPUT(FAN_PIN); SET_OUTPUT(FAN_PIN);
WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1); WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1);
@ -1219,9 +1219,9 @@ void temp_runaway_stop(bool isPreheat)
} }
else else
{ {
LCD_ALERTMESSAGEPGM("THERMAL RUNAWAY"); isBed ? LCD_ALERTMESSAGEPGM("BED THERMAL RUNAWAY") : LCD_ALERTMESSAGEPGM("THERMAL RUNAWAY");
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(": THERMAL RUNAWAY"); isBed ? SERIAL_ERRORLNPGM(" HEATBED THERMAL RUNAWAY") : SERIAL_ERRORLNPGM(" HOTEND THERMAL RUNAWAY");
} }
} }
#endif #endif

2
Firmware/temperature.h
View file

@ -182,7 +182,7 @@ static float temp_runaway_timer[4];
static int temp_runaway_error_counter[4]; static int temp_runaway_error_counter[4];
void temp_runaway_check(int _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed); void temp_runaway_check(int _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed);
void temp_runaway_stop(bool isPreheat); void temp_runaway_stop(bool isPreheat, bool isBed);
#endif #endif
int getHeaterPower(int heater); int getHeaterPower(int heater);