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

Merge pull request #2348 from leptun/MK3_fix_kill 

Fix kill messages
This commit is contained in:
DRracer 2019-12-13 18:30:27 +01:00 committed by GitHub
parent 46120e503d e7f2577233
commit 6ab3b20ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View File

@ -5944,7 +5944,7 @@ Sigma_Exit:
//! ### M112 - Emergency stop //! ### M112 - Emergency stop
// ----------------------------------------- // -----------------------------------------
case 112: case 112:
kill(_n(""), 3); kill(MSG_M112_KILL, 3);
break; break;
//! ### M140 - Set bed temperature //! ### M140 - Set bed temperature
@ -8624,7 +8624,7 @@ if(0)
if( (_millis() - previous_millis_cmd) > max_inactive_time ) if( (_millis() - previous_millis_cmd) > max_inactive_time )
if(max_inactive_time) if(max_inactive_time)
kill(_n(""), 4); kill(_n("Inactivity Shutdown"), 4);
if(stepper_inactive_time) { if(stepper_inactive_time) {
if( (_millis() - previous_millis_cmd) > stepper_inactive_time ) if( (_millis() - previous_millis_cmd) > stepper_inactive_time )
{ {
@ -8665,7 +8665,7 @@ if(0)
// ---------------------------------------------------------------- // ----------------------------------------------------------------
if ( killCount >= KILL_DELAY) if ( killCount >= KILL_DELAY)
{ {
kill("", 5); kill(NULL, 5);
} }
#endif #endif

8
Firmware/cardreader.cpp
View File

@ -359,10 +359,10 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
{ {
if((int)file_subcall_ctr>(int)SD_PROCEDURE_DEPTH-1) if((int)file_subcall_ctr>(int)SD_PROCEDURE_DEPTH-1)
{ {
SERIAL_ERROR_START; // SERIAL_ERROR_START;
SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); // SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:");
SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); // SERIAL_ERRORLN(SD_PROCEDURE_DEPTH);
kill("", 1); kill(_n("trying to call sub-gcode files with too many levels."), 1);
return; return;
} }

2
Firmware/cmdqueue.cpp
View File

@ -500,7 +500,7 @@ void get_command()
//If command was e-stop process now //If command was e-stop process now
if(strcmp(cmdbuffer+bufindw+CMDHDRSIZE, "M112") == 0) if(strcmp(cmdbuffer+bufindw+CMDHDRSIZE, "M112") == 0)
kill("", 2); kill(MSG_M112_KILL, 2);
// Store the current line into buffer, move to the next line. // Store the current line into buffer, move to the next line.
// Store type of entry // Store type of entry

1
Firmware/messages.c
View File

@ -160,3 +160,4 @@ const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; ////
const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; //// const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; ////
const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20 const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20
const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20 const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20
const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20

1
Firmware/messages.h
View File

@ -161,6 +161,7 @@ extern const char MSG_OCTOPRINT_RESUMED[];
extern const char MSG_OCTOPRINT_CANCEL[]; extern const char MSG_OCTOPRINT_CANCEL[];
extern const char MSG_FANCHECK_EXTRUDER[]; extern const char MSG_FANCHECK_EXTRUDER[];
extern const char MSG_FANCHECK_PRINT[]; extern const char MSG_FANCHECK_PRINT[];
extern const char MSG_M112_KILL[];
#if defined(__cplusplus) #if defined(__cplusplus)
} }

2
Firmware/temperature.cpp
View File

@ -879,7 +879,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(" - Invalid extruder number !"); SERIAL_ERRORLNPGM(" - Invalid extruder number !");
kill(PSTR(""), 6); kill(NULL, 6);
return 0.0; return 0.0;
} }
#ifdef HEATER_0_USES_MAX6675 #ifdef HEATER_0_USES_MAX6675