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

prepare filament message in english, bowden menu updated

This commit is contained in:
PavelSindler 2017-05-09 18:45:53 +02:00
parent 1db5b43175
commit 7c2caa0fec
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/language_all.cpp
View File

@ -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";

4
Firmware/language_all.h
View File

@ -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];

1
Firmware/language_en.h
View File

@ -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"

7
Firmware/ultralcd.cpp
View File

@ -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--;