Skip to content

Commit

Permalink
"Unload filament" c adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
@leptun
leptun committed Jan 16, 2022
1 parent 7442057 commit 93b1a6b
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Firmware/messages.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////c=18
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED."); ////c=20
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////Number 1 to 5 is added behind text e.g. "Unload filament" c=16
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=18
const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20
const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=18
const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); ////c=20 r=8
Expand Down
8 changes: 4 additions & 4 deletions Firmware/ultralcd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5920,7 +5920,7 @@ void bowden_menu() {
}

#ifdef SNMM

#error broken MSG_UNLOAD_FILAMENT translation
static char snmm_stop_print_menu() { //menu for choosing which filaments will be unloaded in stop print
lcd_clear();
lcd_puts_at_P(0,0,_T(MSG_UNLOAD_FILAMENT)); lcd_print(':');
Expand Down Expand Up @@ -6638,14 +6638,14 @@ static void lcd_main_menu()
MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18
//-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload);
//bFilamentFirstRun=true;
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament);
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); ////MSG_UNLOAD_FILAMENT c=18
MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FILAMENT), mmu_fil_eject_menu);
#ifdef MMU_HAS_CUTTER
MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu);
#endif //MMU_HAS_CUTTER
} else {
#ifdef SNMM
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), fil_unload_menu);
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), fil_unload_menu); ////MSG_UNLOAD_FILAMENT c=18
MENU_ITEM_SUBMENU_P(_i("Change extruder"), change_extr_menu);////MSG_CHANGE_EXTR c=20
#endif
#ifdef FILAMENT_SENSOR
Expand All @@ -6658,7 +6658,7 @@ static void lcd_main_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
}
bFilamentFirstRun=true;
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament); ////MSG_UNLOAD_FILAMENT c=18
}
MENU_ITEM_SUBMENU_P(_T(MSG_SETTINGS), lcd_settings_menu);
if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu);
Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@
#MSG_TO_UNLOAD_FIL c=20
"to unload filament"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"

#MSG_UNLOADING_FILAMENT c=20
Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_cz.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"k vyjmuti filamentu"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Vyjmout filament"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_da.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_de.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"um Filament entladen"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Fil. entladen"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_es.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"para descargar fil."

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Soltar filamento"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_fr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"pour decharger fil."

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Decharger fil."

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_hr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_hu.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_it.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"per scaricare fil."

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Scarica filam."

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_lb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_lt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_nl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"om fil. uitwerpen"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Fil. uitwerpen"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_pl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"aby rozlad. filament"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"Rozladowanie fil"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_sl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down
2 changes: 1 addition & 1 deletion lang/lang_en_sv.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
"to unload filament"
"\x00"

#MSG_UNLOAD_FILAMENT c=16
#MSG_UNLOAD_FILAMENT c=18
"Unload filament"
"\x00"

Expand Down

0 comments on commit 93b1a6b

Please sign in to comment.