From 7c2caa0fec5601fafb15076ce36571da34a2c736 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 9 May 2017 18:45:53 +0200 Subject: [PATCH] prepare filament message in english, bowden menu updated --- Firmware/language_all.cpp | 10 +++++----- Firmware/language_all.h | 4 ++-- Firmware/language_en.h | 1 + Firmware/ultralcd.cpp | 7 +++++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index d2f601e27..c4bb419e7 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -446,11 +446,6 @@ const char * const MSG_BEGIN_FILE_LIST_LANG_TABLE[1] PROGMEM = { MSG_BEGIN_FILE_LIST_EN }; -const char MSG_BOWDEN_SETTINGS_EN[] PROGMEM = "Continue?"; -const char * const MSG_BOWDEN_SETTINGS_LANG_TABLE[1] PROGMEM = { - MSG_BOWDEN_SETTINGS_EN -}; - const char MSG_BROWNOUT_RESET_EN[] PROGMEM = " Brown out Reset"; const char * const MSG_BROWNOUT_RESET_LANG_TABLE[1] PROGMEM = { MSG_BROWNOUT_RESET_EN @@ -1955,6 +1950,11 @@ const char * const MSG_PREHEAT_NOZZLE_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_PREHEAT_NOZZLE_DE }; +const char MSG_PREPARE_FILAMENT_EN[] PROGMEM = "Prepare new filament"; +const char * const MSG_PREPARE_FILAMENT_LANG_TABLE[1] PROGMEM = { + MSG_PREPARE_FILAMENT_EN +}; + const char MSG_PRESS_EN[] PROGMEM = "and press the knob"; const char MSG_PRESS_CZ[] PROGMEM = "a stisknete tlacitko"; const char MSG_PRESS_IT[] PROGMEM = "e cliccare manopola"; diff --git a/Firmware/language_all.h b/Firmware/language_all.h index b2cc1310a..26e26de24 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -99,8 +99,6 @@ extern const char* const MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR_L #define MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR LANG_TABLE_SELECT(MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR_LANG_TABLE) extern const char* const MSG_BEGIN_FILE_LIST_LANG_TABLE[1]; #define MSG_BEGIN_FILE_LIST LANG_TABLE_SELECT_EXPLICIT(MSG_BEGIN_FILE_LIST_LANG_TABLE, 0) -extern const char* const MSG_BOWDEN_SETTINGS_LANG_TABLE[1]; -#define MSG_BOWDEN_SETTINGS LANG_TABLE_SELECT_EXPLICIT(MSG_BOWDEN_SETTINGS_LANG_TABLE, 0) extern const char* const MSG_BROWNOUT_RESET_LANG_TABLE[1]; #define MSG_BROWNOUT_RESET LANG_TABLE_SELECT_EXPLICIT(MSG_BROWNOUT_RESET_LANG_TABLE, 0) extern const char* const MSG_CALIBRATE_BED_LANG_TABLE[LANG_NUM]; @@ -381,6 +379,8 @@ extern const char* const MSG_PREHEAT_LANG_TABLE[LANG_NUM]; #define MSG_PREHEAT LANG_TABLE_SELECT(MSG_PREHEAT_LANG_TABLE) extern const char* const MSG_PREHEAT_NOZZLE_LANG_TABLE[LANG_NUM]; #define MSG_PREHEAT_NOZZLE LANG_TABLE_SELECT(MSG_PREHEAT_NOZZLE_LANG_TABLE) +extern const char* const MSG_PREPARE_FILAMENT_LANG_TABLE[1]; +#define MSG_PREPARE_FILAMENT LANG_TABLE_SELECT_EXPLICIT(MSG_PREPARE_FILAMENT_LANG_TABLE, 0) extern const char* const MSG_PRESS_LANG_TABLE[LANG_NUM]; #define MSG_PRESS LANG_TABLE_SELECT(MSG_PRESS_LANG_TABLE) extern const char* const MSG_PRINTER_DISCONNECTED_LANG_TABLE[1]; diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 37c4406d3..234b09a20 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -292,5 +292,6 @@ #define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE "Temperature calibration is finished. Click to continue." #define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "Temp. cal. [ON]" #define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "Temp. cal. [OFF]" +#define(length=20, lines=1) MSG_PREPARE_FILAMENT "Prepare new filament" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 50396d880..874f1008b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -975,8 +975,11 @@ void lcd_wait_interact() { lcd_implementation_clear(); lcd.setCursor(0, 1); - +#ifdef SNMM + lcd_printPGM(MSG_PREPARE_FILAMENT); +#else lcd_printPGM(MSG_INSERT_FILAMENT); +#endif lcd.setCursor(0, 2); lcd_printPGM(MSG_PRESS); @@ -2789,7 +2792,7 @@ void bowden_menu() { manage_heater(); manage_inactivity(true); - if (abs((enc_dif - encoderDiff)) > 1) { + if (abs((enc_dif - encoderDiff)) > 2) { if (enc_dif > encoderDiff) { cursor_pos--;