From 61c74795791f3ec64411e6a4a8c43ae8f1aa448e Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 30 Sep 2019 20:16:01 +0300 Subject: [PATCH] Code cleanup: Move texts to messages.c/h --- Firmware/Marlin_main.cpp | 2 +- Firmware/messages.c | 3 +++ Firmware/messages.h | 3 +++ Firmware/temperature.cpp | 4 ++-- Firmware/ultralcd.cpp | 6 +++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 98dff2f9..39013dc8 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -619,7 +619,7 @@ void crashdet_cancel() if (saved_printing_type == PRINTING_TYPE_SD) { lcd_print_stop(); }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); } } diff --git a/Firmware/messages.c b/Firmware/messages.c index 7803bb35..c0c3cfc3 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -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_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; //// 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 diff --git a/Firmware/messages.h b/Firmware/messages.h index a6525491..525b7c5b 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -132,6 +132,9 @@ extern const char MSG_EJECT_FILAMENT[]; extern const char MSG_CUT_FILAMENT[]; extern const char MSG_OCTOPRINT_PAUSED[]; 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) } diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index e1c46728..5a1b9c8c 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -547,10 +547,10 @@ void fanSpeedError(unsigned char _fan) { } switch (_fan) { 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; 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; } // SERIAL_PROTOCOLLNRPGM(MSG_OK); //This ok messes things up with octoprint. diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bd261d4e..5214ea59 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6339,13 +6339,13 @@ static void fan_error_selftest() manage_heater(); #ifdef TACH_0 if (fan_speed[0] <= 20) { //extruder fan error - LCD_ALERTMESSAGERPGM(PSTR("Err: EXTR. FAN ERROR")); + LCD_ALERTMESSAGERPGM(MSG_FANCHECK_EXTRUDER); return; } #endif #ifdef TACH_1 if (fan_speed[1] <= 20) { //print fan error - LCD_ALERTMESSAGERPGM(PSTR("Err: PRINT FAN ERROR")); + LCD_ALERTMESSAGERPGM(MSG_FANCHECK_PRINT); return; } #endif @@ -6883,7 +6883,7 @@ void lcd_print_stop() //-// if(!card.sdprinting) { - SERIAL_ECHOLNPGM("// action:cancel"); // for Octoprint + SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint } saved_printing = false; saved_printing_type = PRINTING_TYPE_NONE;