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

Code cleanup: Move texts to messages.c/h

This commit is contained in:
leptun 2019-09-30 20:16:01 +03:00
parent 30f325c81d
commit 61c7479579
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -619,7 +619,7 @@ void crashdet_cancel()
if (saved_printing_type == PRINTING_TYPE_SD) { if (saved_printing_type == PRINTING_TYPE_SD) {
lcd_print_stop(); lcd_print_stop();
}else if(saved_printing_type == PRINTING_TYPE_USB){ }else if(saved_printing_type == PRINTING_TYPE_USB){
SERIAL_ECHOLNPGM("// action:cancel"); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI
SERIAL_PROTOCOLLNRPGM(MSG_OK); SERIAL_PROTOCOLLNRPGM(MSG_OK);
} }
} }

3
Firmware/messages.c
View File

@ -131,3 +131,6 @@ const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix th
const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; //// const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; ////
const char MSG_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; //// const char MSG_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; ////
const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; //// const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; ////
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_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20

3
Firmware/messages.h
View File

@ -132,6 +132,9 @@ extern const char MSG_EJECT_FILAMENT[];
extern const char MSG_CUT_FILAMENT[]; extern const char MSG_CUT_FILAMENT[];
extern const char MSG_OCTOPRINT_PAUSED[]; extern const char MSG_OCTOPRINT_PAUSED[];
extern const char MSG_OCTOPRINT_RESUMED[]; extern const char MSG_OCTOPRINT_RESUMED[];
extern const char MSG_OCTOPRINT_CANCEL[];
extern const char MSG_FANCHECK_EXTRUDER[];
extern const char MSG_FANCHECK_PRINT[];
#if defined(__cplusplus) #if defined(__cplusplus)
} }

4
Firmware/temperature.cpp
View File

@ -547,10 +547,10 @@ void fanSpeedError(unsigned char _fan) {
} }
switch (_fan) { switch (_fan) {
case 0: // extracting the same code from case 0 and case 1 into a function saves 72B case 0: // extracting the same code from case 0 and case 1 into a function saves 72B
fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), PSTR("Err: EXTR. FAN ERROR") ); fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), MSG_FANCHECK_EXTRUDER);
break; break;
case 1: case 1:
fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), PSTR("Err: PRINT FAN ERROR") ); fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), MSG_FANCHECK_PRINT);
break; break;
} }
// SERIAL_PROTOCOLLNRPGM(MSG_OK); //This ok messes things up with octoprint. // SERIAL_PROTOCOLLNRPGM(MSG_OK); //This ok messes things up with octoprint.

6
Firmware/ultralcd.cpp
View File

@ -6339,13 +6339,13 @@ static void fan_error_selftest()
manage_heater(); manage_heater();
#ifdef TACH_0 #ifdef TACH_0
if (fan_speed[0] <= 20) { //extruder fan error if (fan_speed[0] <= 20) { //extruder fan error
LCD_ALERTMESSAGERPGM(PSTR("Err: EXTR. FAN ERROR")); LCD_ALERTMESSAGERPGM(MSG_FANCHECK_EXTRUDER);
return; return;
} }
#endif #endif
#ifdef TACH_1 #ifdef TACH_1
if (fan_speed[1] <= 20) { //print fan error if (fan_speed[1] <= 20) { //print fan error
LCD_ALERTMESSAGERPGM(PSTR("Err: PRINT FAN ERROR")); LCD_ALERTMESSAGERPGM(MSG_FANCHECK_PRINT);
return; return;
} }
#endif #endif
@ -6883,7 +6883,7 @@ void lcd_print_stop()
//-// //-//
if(!card.sdprinting) if(!card.sdprinting)
{ {
SERIAL_ECHOLNPGM("// action:cancel"); // for Octoprint SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint
} }
saved_printing = false; saved_printing = false;
saved_printing_type = PRINTING_TYPE_NONE; saved_printing_type = PRINTING_TYPE_NONE;