3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed x of 4 and y of 9 to x/4 and y/4

Browse source 
Added `Iteration` translation
This commit is contained in:
3d-gussner 2021-04-27 20:22:28 +02:00
parent 94b195123f
commit 686054b95e
12 changed files with 47 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Firmware/Marlin_main.cpp
View file

@ -3428,13 +3428,11 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
lcd_show_fullscreen_message_and_wait_P(_T(MSG_CONFIRM_NOZZLE_CLEAN));
if(onlyZ){
lcd_display_message_fullscreen_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("1 %S 9"),_T(MSG_OF));
lcd_puts_at_P(0,3,_n("1/9"));
}else{
//lcd_show_fullscreen_message_and_wait_P(_T(MSG_PAPER));
lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("1 %S 4"),_T(MSG_OF));
lcd_puts_at_P(0,3,_n("1/4"));
}
refresh_cmd_timeout();
@ -3454,8 +3452,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PAPER));
KEEPALIVE_STATE(IN_HANDLER);
lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("1 %S 4"),_T(MSG_OF));
lcd_puts_at_P(0,3,_n("1/4"));
}
bool endstops_enabled = enable_endstops(false);

32
Firmware/mesh_bed_calibration.cpp
View file

@ -2231,10 +2231,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level
}
#endif // SUPPORT_VERBOSITY
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
uint8_t next_line;
lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1), next_line);
if (next_line > 3)
next_line = 3;
lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1));
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
// Collect the rear 2x3 points.
@ -2249,11 +2246,11 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level
// Don't let the manage_inactivity() function remove power from the motors.
refresh_cmd_timeout();
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
lcd_set_cursor(0, next_line);
lcd_printf_P(PSTR("%d %S 4"),(k+1),_T(MSG_OF));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("%d/4"),(k+1));
if (iteration > 0) {
lcd_printf_P(PSTR(" Iter %d"),int(iteration + 1));
lcd_printf_P(PSTR(" %S %d/1"),_T(MSG_ITERATION),int(iteration + 1));
}
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
float *pt = pts + k * 2;
@ -2531,10 +2528,7 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
bool endstop_z_enabled = enable_z_endstop(false);
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
uint8_t next_line;
lcd_display_message_fullscreen_P(_i("Improving bed calibration point"), next_line);////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60
if (next_line > 3)
next_line = 3;
lcd_display_message_fullscreen_P(_i("Improving bed calibration point"));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
// Collect a matrix of 9x9 points.
@ -2544,8 +2538,8 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
refresh_cmd_timeout();
// Print the decrasing ID of the measurement point.
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
lcd_set_cursor(0, next_line);
lcd_printf_P(PSTR("%d %S 4"),mesh_point+1,_T(MSG_OF));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("%d/4"),mesh_point+1);
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
// Move up.
@ -2843,13 +2837,9 @@ bool sample_mesh_and_store_reference()
refresh_cmd_timeout();
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
uint8_t next_line;
lcd_display_message_fullscreen_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1), next_line);
if (next_line > 3)
next_line = 3;
lcd_display_message_fullscreen_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1));
// display "point xx of yy"
lcd_set_cursor(0, next_line);
lcd_printf_P(PSTR("1 %S 9"),_T(MSG_OF));
lcd_puts_at_P(0,3,_n("1/9"));
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
// Sample Z heights for the mesh bed leveling.
@ -2897,8 +2887,8 @@ bool sample_mesh_and_store_reference()
go_to_current(homing_feedrate[X_AXIS]/60);
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
// display "point xx of yy"
lcd_set_cursor(0, next_line);
lcd_printf_P(PSTR("%d %S 9"),mesh_point+1,_T(MSG_OF));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("%d/9"),mesh_point+1);
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
if (!find_bed_induction_sensor_point_z()) //Z crash or deviation > 50um
{

2
Firmware/messages.c
View file

@ -50,6 +50,7 @@ const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////c=12
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////c=20
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=18
const char MSG_ITERATION[] PROGMEM_I1 = ISTR("Iteration"); ////c=12
const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20
const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20
const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18
@ -123,7 +124,6 @@ const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Origin
const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////c=3
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
const char MSG_OF[] PROGMEM_I1 = ISTR("of"); ////c=3
const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////c=3
const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////c=3
const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////c=3

2
Firmware/messages.h
View file

@ -51,6 +51,7 @@ extern const char MSG_FSENSOR[];
extern const char MSG_HEATING[];
extern const char MSG_HEATING_COMPLETE[];
extern const char MSG_HOMEYZ[];
extern const char MSG_ITERATION[];
extern const char MSG_CHOOSE_EXTRUDER[];
extern const char MSG_CHOOSE_FILAMENT[];
extern const char MSG_LAST_PRINT[];
@ -123,7 +124,6 @@ extern const char MSG_WIZARD_WELCOME_SHIPPING[];
extern const char MSG_YES[];
extern const char MSG_V2_CALIBRATION[];
extern const char WELCOME_MSG[];
extern const char MSG_OF[];
extern const char MSG_OFF[];
extern const char MSG_ON[];
extern const char MSG_NA[];

6
lang/lang_en.txt
View file

@ -412,6 +412,9 @@
#MSG_LOADING_FILAMENT c=20
"Loading filament"
#MSG_ITERATION c=12
"Iteration"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
@ -586,9 +589,6 @@
#MSG_EJECT_REMOVE c=20 r=4
"Please remove filament and then press the knob."
#MSG_OF c=3
"of"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."

8
lang/lang_en_cz.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Zavadeni filamentu"
#MSG_ITERATION c=12
"Iteration"
"Opakovani"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Uvolnena remenicka"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Prosim vyjmete filament a pote stisknete tlacitko."
#MSG_OF c=3
"of"
"z"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Odstrante prosim tiskovy plat z podlozky."

8
lang/lang_en_de.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Filament laedt"
#MSG_ITERATION c=12
"Iteration"
"Wiederholung"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Lose Riemenscheibe"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Bitte Filament entfernen und dann den Knopf druecken"
#MSG_OF c=3
"of"
"von"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Bitte entfernen Sie das Stahlblech vom Heizbett."

8
lang/lang_en_es.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Introduciendo filam."
#MSG_ITERATION c=12
"Iteration"
"Iteracion"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Polea suelta"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Por favor quite el filamento y luego presione el dial."
#MSG_OF c=3
"of"
"de"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Por favor retire la chapa de acero de la base calefactable."

8
lang/lang_en_fr.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Chargement du fil."
#MSG_ITERATION c=12
"Iteration"
"\x00"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Poulie lache"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Veuillez retirer le filament puis appuyez sur le bouton."
#MSG_OF c=3
"of"
"de"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Retirez la plaque en acier du plateau chauffant."

8
lang/lang_en_it.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Caricando filamento"
#MSG_ITERATION c=12
"Iteration"
"Iterazione"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Puleggia lenta"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Rimuovi il filamento e quindi premi la manopola."
#MSG_OF c=3
"of"
"su"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Rimuovete la piastra di acciaio dal piano riscaldato"

8
lang/lang_en_nl.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Laden filament"
#MSG_ITERATION c=12
"Iteration"
"Iteratie"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Losse riemschijf"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Trek onmiddellijk filament eruit en druk vervolgens op de knop."
#MSG_OF c=3
"of"
"van"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Verwijder staalplaat van het bed."

8
lang/lang_en_pl.txt
View file

@ -550,6 +550,10 @@
"Loading filament"
"Laduje filament"
#MSG_ITERATION c=12
"Iteration"
"Iteracja"
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Luzne kolo pasowe"
@ -782,10 +786,6 @@
"Please remove filament and then press the knob."
"Wyciagnij filament i wcisnij pokretlo."
#MSG_OF c=3
"of"
"z"
#MSG_REMOVE_STEEL_SHEET c=20 r=4
"Please remove steel sheet from heatbed."
"Prosze zdjac plyte stalowa z podgrzewanego stolu."