From 8af08cd641bab90d3da126d01b5ffa6bebc26bd6 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Wed, 13 Jun 2018 20:55:15 +0200 Subject: [PATCH] New ML support - fixed es translation (too long strings) + temporary disabled E-correct menu --- Firmware/ultralcd.cpp | 11 ++++++----- lang/lang_en_es.txt | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 23bd22e0..92f7f23f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4147,12 +4147,13 @@ static void lcd_settings_menu() } else MENU_ITEM(submenu, _T(MSG_CRASHDETECT_NA), lcd_crash_mode_info); } + #ifdef TMC2130_LINEARITY_CORRECTION_XYZ - MENU_ITEM_EDIT(wfac, _i("X-correct"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 - MENU_ITEM_EDIT(wfac, _i("Y-correct"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 - MENU_ITEM_EDIT(wfac, _i("Z-correct"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 +// MENU_ITEM_EDIT(wfac, _i("X-corr"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 +// MENU_ITEM_EDIT(wfac, _i("Y-corr"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 +// MENU_ITEM_EDIT(wfac, _i("Z-corr"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 #endif //TMC2130_LINEARITY_CORRECTION_XYZ - MENU_ITEM_EDIT(wfac, _i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 +// MENU_ITEM_EDIT(wfac, _i("E-corr"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 #endif //TMC2130 if (temp_cal_active == false) { @@ -7137,7 +7138,7 @@ static void menu_action_sdfile(const char* filename, char* longFilename) for (c = &cmd[4]; *c; c++) *c = tolower(*c); - const char end[5] = ".gco"; + const char end[5] = ".gco"; //we are storing just first 8 characters of 8.3 filename assuming that extension is always ".gco" for (int i = 0; i < 8; i++) { diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 847f9b82..2b1068e4 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -188,7 +188,7 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Det. choque [activo]" +"Det. choque [act]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" @@ -224,7 +224,7 @@ #MSG_EXTRUDER_CORRECTION c=9 r=0 "E-correct" -"E-correcion" +"E-correct" #MSG_END_FILE_LIST c=0 r=0 "End file list" @@ -280,15 +280,15 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"Autocarga Fil. [activo]" +"Autocarg f. [act]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" -"Autocarga Fil. [N/D]" +"Autocarg f. [N/D]" #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" -"Autocarga f. [inactiva]" +"Autocarg f. [ina]" #MSG_FAN_SPEED c=14 r=0 "Fan speed" @@ -300,11 +300,11 @@ #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Comprobación de ventiladores [activo]" +"Com. ventil [act]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -"Comprobación de ventiladores [inactiva]" +"Com. ventil [ina]" #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" @@ -316,7 +316,7 @@ #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" -"Sensor de Fil. [inactivo]" +"Sensor Fil. [act]" #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -848,11 +848,11 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"Puerto RPi [activo]" +"Puerto RPi [act]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"Puerto RPi [inactivo]" +"Puerto RPi [ina]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?"