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

Fix `Load filament` to c=16

This commit is contained in:
3d-gussner 2023-05-23 09:31:37 +02:00
parent 5553e45ad3
commit a37bcbfd8c
16 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.cpp
View File

@ -53,7 +53,7 @@ const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_
const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////MSG_LAST_PRINT c=18
const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////MSG_LAST_PRINT_FAILURES c=20
const char MSG_PRELOAD_TO_MMU[] PROGMEM_I1 = ISTR("Preload to MMU"); ////MSG_PRELOAD_TO_MMU c=17
const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=17
const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=16
const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING_TEST c=18
const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20
const char MSG_TESTING_FILAMENT[] PROGMEM_I1 = ISTR("Testing filament"); ////MSG_TESTING_FILAMENT c=20

6
Firmware/ultralcd.cpp
View File

@ -4765,7 +4765,7 @@ static void mmu_preload_filament_menu() {
MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), load_all_wrapper);
for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++)
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_PRELOAD_TO_MMU c=16
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i);
MENU_END();
}
@ -4788,7 +4788,7 @@ static void mmu_load_to_nozzle_menu() {
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++)
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i);
MENU_END();
}
@ -4834,7 +4834,7 @@ static void mmu_loading_test_menu() {
MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), loading_test_all_wrapper);
for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++)
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i);
MENU_END();
}

2
lang/po/Firmware.pot
View File

@ -1033,7 +1033,7 @@ msgstr ""
msgid "Load All"
msgstr ""
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_cs.po
View File

@ -1056,7 +1056,7 @@ msgstr "Doladeni osy Z"
msgid "Load All"
msgstr "Nacist vse"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_de.po
View File

@ -1068,7 +1068,7 @@ msgstr "Z einstellen"
msgid "Load All"
msgstr "Alle laden"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

4
lang/po/Firmware_es.po
View File

@ -1069,12 +1069,12 @@ msgstr "Micropaso Eje Z"
msgid "Load All"
msgstr "Intr. todos fil."
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442
msgid "Load filament"
msgstr "Introducir filam."
msgstr "Introducir fil."
#. MSG_LOAD_TO_NOZZLE c=18
#: ../../Firmware/ultralcd.cpp:5426

2
lang/po/Firmware_fr.po
View File

@ -1076,7 +1076,7 @@ msgstr "Ajuster Z en dir."
msgid "Load All"
msgstr "Tout Charger"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

4
lang/po/Firmware_hr.po
View File

@ -1068,12 +1068,12 @@ msgstr "Live podesavanje Z"
msgid "Load All"
msgstr "Puni sve"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442
msgid "Load filament"
msgstr "Napunite filament"
msgstr "Napunite fil."
#. MSG_LOAD_TO_NOZZLE c=18
#: ../../Firmware/ultralcd.cpp:5426

2
lang/po/Firmware_hu.po
View File

@ -1069,7 +1069,7 @@ msgstr "Z magassag beall."
msgid "Load All"
msgstr "Ossz.bet"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_it.po
View File

@ -1071,7 +1071,7 @@ msgstr "Compensazione Z"
msgid "Load All"
msgstr "Carica tutti"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_nl.po
View File

@ -1072,7 +1072,7 @@ msgstr "Live Z aanpassen"
msgid "Load All"
msgstr "Laad alle"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

4
lang/po/Firmware_no.po
View File

@ -1062,12 +1062,12 @@ msgstr "Juster Live-Z"
msgid "Load All"
msgstr "Last Alle"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442
msgid "Load filament"
msgstr "Last inn filament"
msgstr "Last inn filam."
#. MSG_LOAD_TO_NOZZLE c=18
#: ../../Firmware/ultralcd.cpp:5426

2
lang/po/Firmware_pl.po
View File

@ -1068,7 +1068,7 @@ msgstr "Ustaw. Live Z"
msgid "Load All"
msgstr "Zalad. wszystkie"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_ro.po
View File

@ -1070,7 +1070,7 @@ msgstr "Reglare Z live"
msgid "Load All"
msgstr "Incarca toate"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_sk.po
View File

@ -1064,7 +1064,7 @@ msgstr "Doladenie osi Z"
msgid "Load All"
msgstr "Zaviest vsetko"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442

2
lang/po/Firmware_sv.po
View File

@ -1069,7 +1069,7 @@ msgstr "Live justera Z"
msgid "Load All"
msgstr "Ladda alla"
#. MSG_LOAD_FILAMENT c=17
#. MSG_LOAD_FILAMENT c=16
#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952
#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032
#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442