From 9d31c8a4b3e7ddded7f48270457cc808eeee8c58 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 14 Jun 2018 15:34:40 +0200 Subject: [PATCH] New ML support - menu + es translation fixed --- Firmware/ultralcd.cpp | 10 +++++----- lang/lang_en_es.txt | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 92f7f23f..b4fbe6f7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4149,11 +4149,11 @@ static void lcd_settings_menu() } #ifdef TMC2130_LINEARITY_CORRECTION_XYZ -// 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 + 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 #endif //TMC2130_LINEARITY_CORRECTION_XYZ -// 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 + 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 #endif //TMC2130 if (temp_cal_active == false) { @@ -6059,7 +6059,7 @@ char *wfac_to_str5(const uint8_t &x) conv[0] = '['; ftostr43(((float)((uint16_t)x + 1000) / 1000), 1); } - else strcpy_P(conv, _i(" [off"));////MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 + else strncpy_P(conv, _i(" [off"), 6);////MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 conv[6] = ']'; conv[7] = ' '; conv[8] = 0; diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 2b1068e4..a6a23335 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,6 +1,6 @@ #MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 " [off" -"[inactivo" +" [ina" #MSG_PLANNER_BUFFER_BYTES c=0 r=0 " PlannerBufferBytes: " @@ -196,7 +196,7 @@ #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Det. choque [inactivo]" +"Det. choque [ina]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -588,19 +588,19 @@ #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" -"Modo [Normal]" +"Modo [Normal]" #MSG_SILENT_MODE_ON c=0 r=0 "Mode [silent]" -"Modo [silencio]" +"Modo [silencio]" #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" -"Modo [Silencio]" +"Modo [Silencio]" #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" -"Modo [fuerza auto]" +"Modo[fuerza auto]" #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" @@ -864,7 +864,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" -"Tarj. SD [FlshAir]" +"Tarj.SD [FlshAir]" #MSG_SD_CARD_OK c=0 r=0 "SD card ok" @@ -892,11 +892,11 @@ #MSG_SELFTEST_START c=20 r=0 "Self test start " -"Iniciar Selftest" +"Iniciar Selftest " #MSG_SELFTEST c=0 r=0 "Selftest " -"Selftest" +"Selftest " #MSG_SELFTEST_ERROR c=0 r=0 "Selftest error !" @@ -904,7 +904,7 @@ #MSG_SELFTEST_FAILED c=20 r=0 "Selftest failed " -"Fallo Selftest" +"Fallo Selftest " #MSG_FORCE_SELFTEST c=20 r=8 "Selftest will be run to calibrate accurate sensorless rehoming." @@ -936,11 +936,11 @@ #MSG_SORT_TIME c=17 r=1 "Sort: [Time]" -"Orden: [Fecha]" +"Orden: [Fecha]" #MSG_SORT_ALPHA c=17 r=1 "Sort: [Alphabet]" -"Orden: [Alfabético]" +"Orden:[Alfabétic]" #MSG_SORTING c=20 r=1 "Sorting files" @@ -988,11 +988,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Cal. temp. [ON]" +"Cal. temp. [ON]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Cal. temp. [OFF]" +"Cal. temp. [OFF]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration"