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

Fix LCD output 

Configuration->HW Setup->Checks showed `a`

MSG_FILAMENT `Filament` can only be 8 chars long and only ES and IT had `Filemanto` as translation.
But as ES the `o` in `Filamento` was overwritten by `[Estricto]` I removed the MSG_FILAMENT to be translated.
Saves few bytes.
This commit is contained in:
3d-gussner 2024-08-26 09:20:05 +02:00
parent f5fe658728
commit c1360d7bfb
19 changed files with 6 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -3376,7 +3376,7 @@ static void mmu_M600_load_filament(bool automatic) {
slot = SpoolJoin::spooljoin.nextSlot(); slot = SpoolJoin::spooljoin.nextSlot();
} else { } else {
// Only ask for the slot if automatic/SpoolJoin is off // Only ask for the slot if automatic/SpoolJoin is off
slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)); slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT);
} }
setTargetHotend(saved_extruder_temperature); setTargetHotend(saved_extruder_temperature);

2
Firmware/Tcodes.cpp
View File

@ -31,7 +31,7 @@ void TCodes(char *const strchr_pointer, const uint8_t codeValue) {
} else if (strchr_pointer[index] == 'x' || strchr_pointer[index] == '?'){ } else if (strchr_pointer[index] == 'x' || strchr_pointer[index] == '?'){
// load to extruder gears; if mmu is not present do nothing // load to extruder gears; if mmu is not present do nothing
if (MMU2::mmu2.Enabled()) { if (MMU2::mmu2.Enabled()) {
MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT))); MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT));
} }
} else if (strchr_pointer[index] == 'c'){ } else if (strchr_pointer[index] == 'c'){
// load from extruder gears to nozzle (nozzle should be preheated) // load from extruder gears to nozzle (nozzle should be preheated)

2
Firmware/messages.cpp
View File

@ -35,7 +35,6 @@ const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////MSG_ERROR c=10
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////MSG_EXTRUDER c=17 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////MSG_EXTRUDER c=17
const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////MSG_FANS_CHECK c=13 const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////MSG_FANS_CHECK c=13
const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////MSG_FIL_RUNOUTS c=15 const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////MSG_FIL_RUNOUTS c=15
const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////MSG_FILAMENT c=17
const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////MSG_FAN_SPEED c=14 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////MSG_FAN_SPEED c=14
const char MSG_HOTEND_FAN_SPEED[] PROGMEM_I1 = ISTR("Hotend fan:");////MSG_HOTEND_FAN_SPEED c=15 const char MSG_HOTEND_FAN_SPEED[] PROGMEM_I1 = ISTR("Hotend fan:");////MSG_HOTEND_FAN_SPEED c=15
const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=15 const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=15
@ -380,6 +379,7 @@ extern const char MSG_FW_MK3_DETECTED [] PROGMEM_I1 = ISTR(PRINTER_NAME " firmwa
//not internationalized messages //not internationalized messages
const char MSG_SPOOL_JOIN[] PROGMEM_N1 = "SpoolJoin"; ////MSG_SPOOL_JOIN c=13 const char MSG_SPOOL_JOIN[] PROGMEM_N1 = "SpoolJoin"; ////MSG_SPOOL_JOIN c=13
const char MSG_FIRMWARE[] PROGMEM_N1 = "Firmware"; ////MSG_FIRMWARE c=8 const char MSG_FIRMWARE[] PROGMEM_N1 = "Firmware"; ////MSG_FIRMWARE c=8
const char MSG_FILAMENT[] PROGMEM_N1 = "Filament"; ////MSG_FILAMENT c=8
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = "FlashAir"; ////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8 const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = "FlashAir"; ////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
const char MSG_PINDA[] PROGMEM_N1 = "PINDA"; ////MSG_PINDA c=5 const char MSG_PINDA[] PROGMEM_N1 = "PINDA"; ////MSG_PINDA c=5
const char MSG_WELCOME[] PROGMEM_N1 = WELCOME_MSG; const char MSG_WELCOME[] PROGMEM_N1 = WELCOME_MSG;

2
Firmware/messages.h
View File

@ -38,7 +38,6 @@ extern const char MSG_ERROR[];
extern const char MSG_EXTRUDER[]; extern const char MSG_EXTRUDER[];
extern const char MSG_FANS_CHECK[]; extern const char MSG_FANS_CHECK[];
extern const char MSG_FIL_RUNOUTS[]; extern const char MSG_FIL_RUNOUTS[];
extern const char MSG_FILAMENT[];
extern const char MSG_FAN_SPEED[]; extern const char MSG_FAN_SPEED[];
extern const char MSG_HOTEND_FAN_SPEED[]; extern const char MSG_HOTEND_FAN_SPEED[];
extern const char MSG_PRINT_FAN_SPEED[]; extern const char MSG_PRINT_FAN_SPEED[];
@ -380,6 +379,7 @@ extern const char MSG_FW_MK3_DETECTED [];
//not internationalized messages //not internationalized messages
extern const char MSG_SPOOL_JOIN[]; extern const char MSG_SPOOL_JOIN[];
extern const char MSG_FIRMWARE[]; extern const char MSG_FIRMWARE[];
extern const char MSG_FILAMENT[];
extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[]; extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[];
extern const char MSG_PINDA[]; extern const char MSG_PINDA[];
extern const char MSG_WELCOME[]; extern const char MSG_WELCOME[];

4
Firmware/ultralcd.cpp
View File

@ -3620,7 +3620,7 @@ void lcd_v2_calibration() {
if (MMU2::mmu2.Enabled()) { if (MMU2::mmu2.Enabled()) {
const uint8_t filament = choose_menu_P( const uint8_t filament = choose_menu_P(
_T(MSG_SELECT_FILAMENT), _T(MSG_SELECT_FILAMENT),
_T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off MSG_FILAMENT,(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
if (filament < MMU_FILAMENT_COUNT) { if (filament < MMU_FILAMENT_COUNT) {
lay1cal_filament = filament; lay1cal_filament = filament;
} else { } else {
@ -6787,7 +6787,7 @@ static bool lcd_selftest_fsensor(void)
static bool selftest_irsensor() static bool selftest_irsensor()
{ {
// Ask user which slot to load filament from // Ask user which slot to load filament from
uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)); uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT);
// Render self-test screen // Render self-test screen
lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0); lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0);

7
lang/po/Firmware.pot
View File

@ -674,13 +674,6 @@ msgstr ""
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "" msgstr ""
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr ""
#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8
#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:339 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:339
msgid "" msgid ""

7
lang/po/Firmware_cs.po
View File

@ -680,13 +680,6 @@ msgstr "Výpadky filam."
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. senzor" msgstr "Fil. senzor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_de.po
View File

@ -682,13 +682,6 @@ msgstr "Fil. Mängel"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. Sensor" msgstr "Fil. Sensor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_es.po
View File

@ -686,13 +686,6 @@ msgstr "Fil. acabado"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Sensor Fil." msgstr "Sensor Fil."
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filamento"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_fr.po
View File

@ -690,13 +690,6 @@ msgstr "Fins filament"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Capteur Fil." msgstr "Capteur Fil."
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_hr.po
View File

@ -684,13 +684,6 @@ msgstr "Bez filmaneta"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. senzor" msgstr "Fil. senzor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_hu.po
View File

@ -687,13 +687,6 @@ msgstr "Fil. kifutasok"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. szenzor" msgstr "Fil. szenzor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_it.po
View File

@ -688,13 +688,6 @@ msgstr "Fil. esauriti"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Sensore fil." msgstr "Sensore fil."
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filamento"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_nl.po
View File

@ -689,13 +689,6 @@ msgstr "Fil. fouten"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. sensor" msgstr "Fil. sensor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_no.po
View File

@ -687,13 +687,6 @@ msgstr "Tomt filament"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. Sensor" msgstr "Fil. Sensor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_pl.po
View File

@ -689,13 +689,6 @@ msgstr "Końc. filamentu"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Czuj. filam." msgstr "Czuj. filam."
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_ro.po
View File

@ -689,13 +689,6 @@ msgstr "Epuizări Fil."
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Senzor Fil." msgstr "Senzor Fil."
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_sk.po
View File

@ -686,13 +686,6 @@ msgstr "Výpadky filam."
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. senzor" msgstr "Fil. senzor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265

7
lang/po/Firmware_sv.po
View File

@ -687,13 +687,6 @@ msgstr "Fil. avbrott"
msgid "Fil. sensor" msgid "Fil. sensor"
msgstr "Fil. sensor" msgstr "Fil. sensor"
#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"
#. MSG_FILAMENT_CLEAN c=20 r=3 #. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265 #: ../../Firmware/ultralcd.cpp:2265