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

Update `x of 4` and `x of 9` messages so longer text can be used.

This commit is contained in:
3d-gussner 2021-04-27 07:18:52 +02:00
parent b3c5d395d4
commit b8ae08fd3d
12 changed files with 43 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/Marlin_main.cpp
View File

@ -3429,14 +3429,12 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
if(onlyZ){
lcd_display_message_fullscreen_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1));
lcd_set_cursor(0, 3);
lcd_print(1);
lcd_puts_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2));
lcd_printf_P(PSTR("1 %S 9"),_T(MSG_OF));
}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, 2);
lcd_print(1);
lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("1 %S 4"),_T(MSG_OF));
}
refresh_cmd_timeout();
@ -3456,9 +3454,8 @@ 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, 2);
lcd_print(1);
lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));
lcd_set_cursor(0, 3);
lcd_printf_P(PSTR("1 %S 4"),_T(MSG_OF));
}
bool endstops_enabled = enable_endstops(false);

15
Firmware/mesh_bed_calibration.cpp
View File

@ -2250,12 +2250,10 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level
refresh_cmd_timeout();
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
lcd_set_cursor(0, next_line);
lcd_print(k + 1);
lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));
lcd_printf_P(PSTR("%d %S 4"),(k+1),_T(MSG_OF));
if (iteration > 0) {
lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20
lcd_print(int(iteration + 1));
lcd_printf_P(PSTR(" Iter %d"),int(iteration + 1));
}
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
float *pt = pts + k * 2;
@ -2547,8 +2545,7 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
// Print the decrasing ID of the measurement point.
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
lcd_set_cursor(0, next_line);
lcd_print(mesh_point+1);
lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
lcd_printf_P(PSTR("%d %S 4"),mesh_point+1,_T(MSG_OF));
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
// Move up.
@ -2852,8 +2849,7 @@ bool sample_mesh_and_store_reference()
next_line = 3;
// display "point xx of yy"
lcd_set_cursor(0, next_line);
lcd_print(1);
lcd_puts_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2));
lcd_printf_P(PSTR("1 %S 9"),_T(MSG_OF));
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
// Sample Z heights for the mesh bed leveling.
@ -2902,8 +2898,7 @@ bool sample_mesh_and_store_reference()
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
// display "point xx of yy"
lcd_set_cursor(0, next_line);
lcd_print(mesh_point+1);
lcd_puts_P(_T(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2));
lcd_printf_P(PSTR("%d %S 9"),mesh_point+1,_T(MSG_OF));
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
if (!find_bed_induction_sensor_point_z()) //Z crash or deviation > 50um
{

3
Firmware/messages.c
View File

@ -42,7 +42,6 @@ const char MSG_FILAMENT_LOADING_T2[] PROGMEM_I1 = ISTR("Insert filament into ext
const char MSG_FILAMENT_LOADING_T3[] PROGMEM_I1 = ISTR("Insert filament into extruder 4. Click when done."); ////c=20 r=4
const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////c=18
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=20 r=2
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20
const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=9
@ -65,7 +64,6 @@ const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////c=18
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=20 r=3
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=18
const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=15
const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=15
@ -125,6 +123,7 @@ 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

3
Firmware/messages.h
View File

@ -43,7 +43,6 @@ extern const char MSG_FILAMENT_LOADING_T2[];
extern const char MSG_FILAMENT_LOADING_T3[];
extern const char MSG_FILAMENTCHANGE[];
extern const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[];
extern const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[];
extern const char MSG_FINISHING_MOVEMENTS[];
extern const char MSG_FOLLOW_CALIBRATION_FLOW[];
extern const char MSG_FOLLOW_Z_CALIBRATION_FLOW[];
@ -64,7 +63,6 @@ extern const char MSG_BACK[];
extern const char MSG_SHEET[];
extern const char MSG_STEEL_SHEETS[];
extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[];
extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[];
extern const char MSG_MENU_CALIBRATION[];
extern const char MSG_MMU_FAILS[];
extern const char MSG_MMU_LOAD_FAILS[];
@ -125,6 +123,7 @@ 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[];

9
lang/lang_en.txt
View File

@ -13,12 +13,6 @@
#MSG_IR_UNKNOWN c=18
"unknown state"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
@ -592,6 +586,9 @@
#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."

12
lang/lang_en_cz.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"neznamy stav"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" z 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" z 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] odsazeni bodu"
@ -790,6 +782,10 @@
"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."

12
lang/lang_en_de.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"Status unbekannt"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" von 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" von 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] Punktversatz"
@ -790,6 +782,10 @@
"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."

12
lang/lang_en_es.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"estado desconocido"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" de 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" de 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] punto offset"
@ -790,6 +782,10 @@
"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."

12
lang/lang_en_fr.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"Etat inconnu"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" de 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" de 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"Offset point [0;0]"
@ -790,6 +782,10 @@
"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."

12
lang/lang_en_it.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"stato sconosciuto"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" su 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" su 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] punto offset"
@ -790,6 +782,10 @@
"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"

12
lang/lang_en_nl.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"Status onbekend"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" van 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" van 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] punt offset"
@ -790,6 +782,10 @@
"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."

12
lang/lang_en_pl.txt
View File

@ -18,14 +18,6 @@
"unknown state"
"Stan nieznany"
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
" of 4"
" z 4"
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
" z 9"
#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] przesun.punktu"
@ -790,6 +782,10 @@
"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."