Merge remote-tracking branch 'origin/kill2' into _temp_error

This commit is contained in:
AnHardt 2015-05-20 21:25:32 +02:00
commit 120d4c7a8c

View File

@ -719,7 +719,7 @@ static float analog2temp(int raw, uint8_t e) {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERROR((int)e); SERIAL_ERROR((int)e);
SERIAL_ERRORLNPGM(MSG_INVALID_EXTRUDER_NUM); SERIAL_ERRORLNPGM(MSG_INVALID_EXTRUDER_NUM);
kill(); kill(PSTR(MSG_KILLED));
return 0.0; return 0.0;
} }