From f94900ee79de055b8379fa22aafd25426aebd0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Mon, 4 Apr 2016 04:35:22 +0100 Subject: [PATCH 01/10] Added a script to check all language files for missing translations --- Marlin/scripts/findMissingTranslations.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Marlin/scripts/findMissingTranslations.sh diff --git a/Marlin/scripts/findMissingTranslations.sh b/Marlin/scripts/findMissingTranslations.sh new file mode 100644 index 000000000..b31c09d1d --- /dev/null +++ b/Marlin/scripts/findMissingTranslations.sh @@ -0,0 +1,14 @@ +#!/bin/bash +IGNORE_DEFINES="LANGUAGE_EN_H MAPPER_NON SIMULATE_ROMFONT DISPLAY_CHARSET_ISO10646_1 MSG_H1 MSG_H2 MSG_H3 MSG_H4 MSG_MOVE_E1 MSG_MOVE_E2 MSG_MOVE_E3 MSG_MOVE_E4 MSG_N1 MSG_N2 MSG_N3 MSG_N4 MSG_DIAM_E1 MSG_DIAM_E2 MSG_DIAM_E3 MSG_DIAM_E4 MSG_E1 MSG_E2 MSG_E3 MSG_E4" + +for i in `awk '/#define/{print $2}' language_en.h`; do + for j in `ls language_*.h | grep -v language_en.h`; do + t=$(grep -c "${i}" ${j}) + if [ "$t" -eq 0 ]; then + for k in ${IGNORE_DEFINES}; do + [ "${k}" == "${i}" ] && continue 2; + done + echo "${j},${i}" + fi + done +done From 1326dc72583b38fc284036a320a4df1d906e72de Mon Sep 17 00:00:00 2001 From: esenapaj Date: Mon, 4 Apr 2016 17:44:49 +0900 Subject: [PATCH 02/10] Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags This is follow-up the commit e5771346a42d327820328ca0e43ebdc6dd27ee2a. Update unnoticed files. --- .../Hephestos_2/Configuration.h | 16 ++++++++++++++-- .../delta/kossel_xl/Configuration.h | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index e348a6ecb..9be4a5cef 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -340,8 +340,22 @@ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA +//=========================================================================== +//============================== Endstop Settings =========================== +//=========================================================================== + // @section homing +// Specify here all the endstop connectors that are connected to any endstop or probe. +// Almost all printers will be using one per axis. Probes will use one or more of the +// extra connectors. Leave undefined any used for non-endstop and non-probe purposes. +#define USE_XMIN_PLUG +#define USE_YMIN_PLUG +#define USE_ZMIN_PLUG +//#define USE_XMAX_PLUG +//#define USE_YMAX_PLUG +//#define USE_ZMAX_PLUG + // coarse Endstop Settings #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors @@ -364,8 +378,6 @@ const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic o const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -#define DISABLE_MAX_ENDSTOPS -//#define DISABLE_MIN_ENDSTOPS //=========================================================================== //============================= Z Probe Options ============================= diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index f7ee5404c..e21b350e1 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -374,8 +374,22 @@ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA +//=========================================================================== +//============================== Endstop Settings =========================== +//=========================================================================== + // @section homing +// Specify here all the endstop connectors that are connected to any endstop or probe. +// Almost all printers will be using one per axis. Probes will use one or more of the +// extra connectors. Leave undefined any used for non-endstop and non-probe purposes. +//#define USE_XMIN_PLUG +//#define USE_YMIN_PLUG +#define USE_ZMIN_PLUG // a Z probe +#define USE_XMAX_PLUG +#define USE_YMAX_PLUG +#define USE_ZMAX_PLUG + // coarse Endstop Settings //#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors @@ -398,8 +412,6 @@ const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -//#define DISABLE_MAX_ENDSTOPS -//#define DISABLE_MIN_ENDSTOPS //=========================================================================== //============================= Z Probe Options ============================= From d819a4aff9c7ab2737f2a7391b96d589d91cdd84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Mon, 4 Apr 2016 14:51:47 +0100 Subject: [PATCH 03/10] Fixes #3346, followup #3343: variables must defined with the static keyword to work with PROGMEM when defined inside functions --- Marlin/Marlin_main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 529492e46..0eaf33109 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4357,16 +4357,16 @@ inline void gcode_M110() { inline void gcode_M111() { marlin_debug_flags = code_seen('S') ? code_value_short() : DEBUG_NONE; - const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO; - const char str_debug_2[] PROGMEM = MSG_DEBUG_INFO; - const char str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS; - const char str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN; - const char str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION; + const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO; + const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO; + const static char str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS; + const static char str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN; + const static char str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION; #if ENABLED(DEBUG_LEVELING_FEATURE) - const char str_debug_32[] PROGMEM = MSG_DEBUG_LEVELING; + const static char str_debug_32[] PROGMEM = MSG_DEBUG_LEVELING; #endif - const char* const debug_strings[] PROGMEM = { + const static char* const debug_strings[] PROGMEM = { str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16, #if ENABLED(DEBUG_LEVELING_FEATURE) str_debug_32 From 3cd2beb750a89164d4bd53462f35785c04a5adb0 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Mon, 4 Apr 2016 16:54:26 +0200 Subject: [PATCH 04/10] Update language_cz.h --- Marlin/language_cz.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 3681b2231..8c1e08cda 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -47,11 +47,11 @@ #define MSG_DISABLE_STEPPERS "Uvolnit motory" #define MSG_AUTO_HOME "Domovska pozice" #define MSG_LEVEL_BED_HOMING "Mereni podlozky" -#define MSG_LEVEL_BED_WAITING "Click to Begin" -#define MSG_LEVEL_BED_DONE "Leveling Done!" -#define MSG_LEVEL_BED_CANCEL "Cancel" +#define MSG_LEVEL_BED_WAITING "Kliknutim spustte" +#define MSG_LEVEL_BED_DONE "Mereni hotovo!" +#define MSG_LEVEL_BED_CANCEL "Storno" #define MSG_SET_HOME_OFFSETS "Nastavit ofsety" -#define MSG_HOME_OFFSETS_APPLIED "Offsets applied" +#define MSG_HOME_OFFSETS_APPLIED "Ofsety nastaveny" #define MSG_SET_ORIGIN "Nastavit pocatek" #define MSG_PREHEAT_PLA "Zahrat PLA" #define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " " From 8b843e997a25b07c94a66fc481232f803e687b95 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Mon, 4 Apr 2016 17:26:19 +0200 Subject: [PATCH 05/10] Update language_cz.h --- Marlin/language_cz.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 8c1e08cda..2cc2d2549 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -78,6 +78,7 @@ #define MSG_MOVE_1MM "Posunout o 1mm" #define MSG_MOVE_10MM "Posunout o 10mm" #define MSG_SPEED "Rychlost" +#define MSG_BED_Z "Vyska podl." #define MSG_NOZZLE "Tryska" #define MSG_BED "Podlozka" #define MSG_FAN_SPEED "Rychlost vent." From 040a0c49db8d64c4288a3cff5ba8348686d526dd Mon Sep 17 00:00:00 2001 From: barus93 Date: Mon, 4 Apr 2016 20:22:34 +0200 Subject: [PATCH 06/10] Update language_it.h ADD missing translation --- Marlin/language_it.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Marlin/language_it.h b/Marlin/language_it.h index e801133be..f711fc543 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -151,6 +151,19 @@ #define MSG_ENDSTOP_ABORT "Finecorsa abort" #define MSG_END_HOUR "ore" #define MSG_END_MINUTE "minuti" +#define MSG_BED_Z "piatto Z" +#define MSG_A_TRAVEL "A-Spostamento" +#define MSG_HEATING_FAILED_LCD "Riscald. Fallito" +#define MSG_ERR_REDUNDANT_TEMP "Err: TERM RINDONDANTI" +#define MSG_THERMAL_RUNAWAY "SURRISCALDAMENTO" +#define MSG_ERR_MAXTEMP "Err: TEMP MAX" +#define MSG_ERR_MINTEMP "Err: TEMP MIN" +#define MSG_ERR_MAXTEMP_BED "Err: TMAX PIATTO" +#define MSG_ERR_MINTEMP_BED "Err: TMIN PIATTO" +#define MSG_HEATING "Riscaldamento.." +#define MSG_HEATING_COMPLETE "Riscald completo" +#define MSG_BED_HEATING "Risc. Piatto.." +#define MSG_BED_DONE "Risc. Piatto Completo" #if ENABLED(DELTA_CALIBRATION_MENU) #define MSG_DELTA_CALIBRATE "Calibraz. Delta" From 4a4b797dca73aa090abc0f5dccc07c80b27bae49 Mon Sep 17 00:00:00 2001 From: paulusjacobus Date: Mon, 4 Apr 2016 18:11:10 +1000 Subject: [PATCH 07/10] Update language_nl.h Added these messages with Dutch translation #define MSG_BED_Z #define MSG_A_TRAVEL #define MSG_HEATING_FAILED_LCD #define MSG_ERR_REDUNDANT_TEMP #define MSG_THERMAL_RUNAWAY #define MSG_ERR_MAXTEMP #define MSG_ERR_MINTEMP #define MSG_ERR_MAXTEMP_BED #define MSG_ERR_MINTEMP_BED #define MSG_HEATING #define MSG_HEATING_COMPLETE #define MSG_BED_HEATING #define MSG_BED_DONE --- Marlin/language_nl.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 717bf321e..ec1d7dcd1 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -46,7 +46,7 @@ #define MSG_LEVEL_BED_WAITING "Click to Begin" #define MSG_LEVEL_BED_DONE "Leveling Done!" #define MSG_LEVEL_BED_CANCEL "Cancel" -#define MSG_SET_HOME_OFFSETS "Set home offsets" +#define MSG_SET_HOME_OFFSETS "Zet home offsets" #define MSG_HOME_OFFSETS_APPLIED "Offsets applied" #define MSG_SET_ORIGIN "Nulpunt instellen" #define MSG_PREHEAT_PLA "PLA voorverwarmen" @@ -128,8 +128,8 @@ #define MSG_RESUMING "Print hervatten" #define MSG_PRINT_ABORTED "Print afgebroken" #define MSG_NO_MOVE "Geen beweging." -#define MSG_KILLED "AFGEBROKEN. " -#define MSG_STOPPED "GESTOPT. " +#define MSG_KILLED "Afgebroken. " +#define MSG_STOPPED "Gestopt. " #define MSG_CONTROL_RETRACT "Retract mm" #define MSG_CONTROL_RETRACT_SWAP "Ruil Retract mm" #define MSG_CONTROL_RETRACTF "Retract F" @@ -140,7 +140,7 @@ #define MSG_AUTORETRACT "AutoRetr." #define MSG_FILAMENTCHANGE "Verv. Filament" #define MSG_INIT_SDCARD "Init. SD kaart" -#define MSG_CNG_SDCARD "Verv. SD card" +#define MSG_CNG_SDCARD "Verv. SD Kaart" #define MSG_ZPROBE_OUT "Z probe uit. bed" #define MSG_YX_UNHOMED "Home X/Y voor Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" @@ -150,6 +150,19 @@ #define MSG_ENDSTOP_ABORT "Endstop afbr." #define MSG_END_HOUR "uur" #define MSG_END_MINUTE "minuten" +#define MSG_BED_Z "Bed Z" +#define MSG_A_TRAVEL "A-travel" +#define MSG_HEATING_FAILED_LCD "voorverw. fout" +#define MSG_ERR_REDUNDANT_TEMP "Fout: Redundant temp fout" +#define MSG_THERMAL_RUNAWAY "Thermische wegloop" +#define MSG_ERR_MAXTEMP "Fout: Max. temp" +#define MSG_ERR_MINTEMP "Fout: Min. temp" +#define MSG_ERR_MAXTEMP_BED "Fout: Max. temp bed" +#define MSG_ERR_MINTEMP_BED "Fout: Min. temp bed" +#define MSG_HEATING "Voorwarmen..." +#define MSG_HEATING_COMPLETE "voorverw. kompleet" +#define MSG_BED_HEATING "Bed voorverwarmen" +#define MSG_BED_DONE "Bed is voorverw." #if ENABLED(DELTA_CALIBRATION_MENU) #define MSG_DELTA_CALIBRATE "Delta Calibratie" From 1bfaf57ee5148a81a9590c0cd9a1af6b32d42593 Mon Sep 17 00:00:00 2001 From: RicardoGA Date: Mon, 4 Apr 2016 00:11:37 -0500 Subject: [PATCH 08/10] Add Missing Spanish translation Add the missing translation (Spanish) issue #3353 --- Marlin/language_es.h | 71 ++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 08716e875..e91418c3f 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -39,33 +39,33 @@ #define MSG_SD_INSERTED "Tarjeta colocada" #define MSG_SD_REMOVED "Tarjeta retirada" #define MSG_MAIN "Menu principal" -#define MSG_AUTOSTART "Autostart" +#define MSG_AUTOSTART "Inicio automatico" #define MSG_DISABLE_STEPPERS "Apagar motores" #define MSG_AUTO_HOME "Llevar al origen" -#define MSG_LEVEL_BED_HOMING "Homing XYZ" +#define MSG_LEVEL_BED_HOMING "Origen XYZ" #define MSG_LEVEL_BED_WAITING "Click to Begin" #define MSG_LEVEL_BED_DONE "Leveling Done!" #define MSG_LEVEL_BED_CANCEL "Cancel" -#define MSG_SET_HOME_OFFSETS "Ajustar offsets" +#define MSG_SET_HOME_OFFSETS "Ajustar desfases" #define MSG_HOME_OFFSETS_APPLIED "Offsets applied" -#define MSG_SET_ORIGIN "Establecer cero" +#define MSG_SET_ORIGIN "Establecer origen" #define MSG_PREHEAT_PLA "Precalentar PLA" -#define MSG_PREHEAT_PLA_N "Precalentar PLA " -#define MSG_PREHEAT_PLA_ALL "Precal. PLA Todo" -#define MSG_PREHEAT_PLA_BEDONLY "Precal. PLA Base" -#define MSG_PREHEAT_PLA_SETTINGS "Ajustar temp. PLA" +#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " " +#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA "Todo" +#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA"Plataforma" +#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA "Config" #define MSG_PREHEAT_ABS "Precalentar ABS" -#define MSG_PREHEAT_ABS_N "Precalentar ABS " -#define MSG_PREHEAT_ABS_ALL "Precal. ABS Todo" -#define MSG_PREHEAT_ABS_BEDONLY "Precal. ABS Base" -#define MSG_PREHEAT_ABS_SETTINGS "Ajustar temp. ABS" +#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " " +#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS "Todo" +#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS "Plataforma" +#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS "Config" #define MSG_COOLDOWN "Enfriar" #define MSG_SWITCH_PS_ON "Encender" #define MSG_SWITCH_PS_OFF "Apagar" #define MSG_EXTRUDE "Extruir" #define MSG_RETRACT "Retraer" #define MSG_MOVE_AXIS "Mover ejes" -#define MSG_LEVEL_BED "Nivelar cama" +#define MSG_LEVEL_BED "Nivelar plataforma" #define MSG_MOVE_X "Mover X" #define MSG_MOVE_Y "Mover Y" #define MSG_MOVE_Z "Mover Z" @@ -74,22 +74,22 @@ #define MSG_MOVE_1MM "Mover 1mm" #define MSG_MOVE_10MM "Mover 10mm" #define MSG_SPEED "Velocidad" -#define MSG_NOZZLE "Fusor" -#define MSG_BED "Base" +#define MSG_NOZZLE "Boquilla" +#define MSG_BED "Plataforma" #define MSG_FAN_SPEED "Ventilador" #define MSG_FLOW "Flujo" #define MSG_CONTROL "Control" #define MSG_MIN LCD_STR_THERMOMETER " Min" #define MSG_MAX LCD_STR_THERMOMETER " Max" #define MSG_FACTOR LCD_STR_THERMOMETER " Fact" -#define MSG_AUTOTEMP "Autotemp" -#define MSG_ON "On" -#define MSG_OFF "Off" +#define MSG_AUTOTEMP "Temperatura Automatica" +#define MSG_ON "Encender" +#define MSG_OFF "Apagar" #define MSG_PID_P "PID-P" #define MSG_PID_I "PID-I" #define MSG_PID_D "PID-D" #define MSG_PID_C "PID-C" -#define MSG_ACC "Acel" +#define MSG_ACC "Aceleracion" #define MSG_VXY_JERK "Vxy-jerk" #define MSG_VZ_JERK "Vz-jerk" #define MSG_VE_JERK "Ve-jerk" @@ -99,9 +99,9 @@ #define MSG_Z "z" #define MSG_E "e" #define MSG_VMIN "Vmin" -#define MSG_VTRAV_MIN "Vvacio min" -#define MSG_AMAX "Amax" -#define MSG_A_RETRACT "A-retrac." +#define MSG_VTRAV_MIN "Vel. viaje min" +#define MSG_AMAX "Acel. max" +#define MSG_A_RETRACT "Acel. retrac." #define MSG_XSTEPS "X pasos/mm" #define MSG_YSTEPS "Y pasos/mm" #define MSG_ZSTEPS "Z pasos/mm" @@ -114,23 +114,23 @@ #define MSG_CONTRAST "Contraste" #define MSG_STORE_EPROM "Guardar memoria" #define MSG_LOAD_EPROM "Cargar memoria" -#define MSG_RESTORE_FAILSAFE "Rest. de emergen." +#define MSG_RESTORE_FAILSAFE "Restaurar memoria." #define MSG_REFRESH "Volver a cargar" #define MSG_WATCH "Monitorizar" #define MSG_PREPARE "Preparar" #define MSG_TUNE "Ajustar" #define MSG_PAUSE_PRINT "Pausar impresion" -#define MSG_RESUME_PRINT "Reanudar impres." +#define MSG_RESUME_PRINT "Reanudar impresion" #define MSG_STOP_PRINT "Detener impresion" #define MSG_CARD_MENU "Menu de SD" #define MSG_NO_CARD "No hay tarjeta SD" #define MSG_DWELL "Reposo..." #define MSG_USERWAIT "Esperando ordenes" #define MSG_RESUMING "Resumiendo impre." -#define MSG_PRINT_ABORTED "Print aborted" +#define MSG_PRINT_ABORTED "Impresion cancelada" #define MSG_NO_MOVE "Sin movimiento" -#define MSG_KILLED "PARADA DE EMERG." -#define MSG_STOPPED "PARADA" +#define MSG_KILLED "Parada de emergencia." +#define MSG_STOPPED "Detenida" #define MSG_CONTROL_RETRACT "Retraer mm" #define MSG_CONTROL_RETRACT_SWAP "Interc. Retraer mm" #define MSG_CONTROL_RETRACTF "Retraer V" @@ -138,19 +138,32 @@ #define MSG_CONTROL_RETRACT_RECOVER "DesRet +mm" #define MSG_CONTROL_RETRACT_RECOVER_SWAP "Interc. DesRet +mm" #define MSG_CONTROL_RETRACT_RECOVERF "DesRet V" -#define MSG_AUTORETRACT "AutoRetr." +#define MSG_AUTORETRACT "Retraccion Auto." #define MSG_FILAMENTCHANGE "Cambiar filamento" #define MSG_INIT_SDCARD "Iniciando tarjeta" #define MSG_CNG_SDCARD "Cambiar tarjeta" #define MSG_ZPROBE_OUT "Sonda Z fuera" #define MSG_YX_UNHOMED "Reiniciar X/Y y Z" -#define MSG_ZPROBE_ZOFFSET "Offset Z" +#define MSG_ZPROBE_ZOFFSET "Desfase Z" #define MSG_BABYSTEP_X "Micropaso X" #define MSG_BABYSTEP_Y "Micropaso Y" #define MSG_BABYSTEP_Z "Micropaso Z" #define MSG_ENDSTOP_ABORT "Endstop abort" #define MSG_END_HOUR "horas" #define MSG_END_MINUTE "minutos" +#define MSG_BED_Z "Plataforma Z" +#define MSG_A_TRAVEL "Acel. Viaje" +#define MSG_HEATING_FAILED_LCD "Error: al calentar" +#define MSG_ERR_REDUNDANT_TEMP "Error: temperatura redundante" +#define MSG_THERMAL_RUNAWAY "Error de temperatura" +#define MSG_ERR_MAXTEMP "Error: Temp Maxima" +#define MSG_ERR_MINTEMP "Error: Temp Minima" +#define MSG_ERR_MAXTEMP_BED "Error: Temp Max Plataforma" +#define MSG_ERR_MINTEMP_BED "Error: Temp Min Plataforma" +#define MSG_HEATING "Calentando..." +#define MSG_HEATING_COMPLETE "Calentamiento Completo" +#define MSG_BED_HEATING "Calentando plataforma ..." +#define MSG_BED_DONE "Plataforma Caliente" #if ENABLED(DELTA_CALIBRATION_MENU) #define MSG_DELTA_CALIBRATE "Calibracion Delta" From ad61a8684a4671bea3dc8671e07ea831951f2cdd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 31 Mar 2016 21:01:55 -0700 Subject: [PATCH 09/10] Comments for legibility, test DEBUG_LEVELING --- .travis.yml | 112 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 92 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7c220d06..a2e58f228 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ --- language: c - + # before_install: # Travis runs a detached head. We need to find the current branch - git checkout `git branch --contains HEAD | grep -v '*'` # Also tags for the root(s) of the minor version(s) - git fetch origin --tags - mkdir ~/bin + # install: # Install arduino 1.6.4 - wget http://downloads-02.arduino.cc/arduino-1.6.4-linux64.tar.xz @@ -26,144 +27,215 @@ install: - mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C - git clone https://github.com/lincomatic/LiquidTWI2.git - mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2 + # before_script: # arduino requires an X server even with command line # https://github.com/arduino/Arduino/issues/1981 - Xvfb :1 -screen 0 1024x768x16 &> xvfb.log & # change back to home directory for compiling - cd $TRAVIS_BUILD_DIR + # script: - # build default config - - build_marlin + # # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h + # - cp Marlin/Configuration.h Marlin/Configuration.h.backup - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup - cp Marlin/pins_RAMPS_14.h Marlin/pins_RAMPS_14.h.backup - # add sensor for bed + # + # Build with the default configurations + # + - build_marlin + # + # Test heated bed temperature sensor + # - opt_set TEMP_SENSOR_BED 1 - build_marlin - # change extruder numbers from 1 to 2 + # + # Test 2 extruders on basic RAMPS 1.4 + # - opt_set MOTHERBOARD BOARD_RAMPS_14_EEB - opt_set EXTRUDERS 2 - opt_set TEMP_SENSOR_1 1 - #- cat Marlin/Configuration.h - build_marlin - # change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h + # + # Test 3 extruders on RUMBA (can use any board with >=3 extruders defined) + # - opt_set MOTHERBOARD BOARD_RUMBA - opt_set EXTRUDERS 3 - opt_set TEMP_SENSOR_2 1 - build_marlin - # enable PIDTEMPBED + # + # Test PIDTEMPBED + # - restore_configs - opt_enable PIDTEMPBED - build_marlin - # enable AUTO_BED_LEVELING + # + # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE + # - restore_configs - - opt_enable ENABLE_AUTO_BED_LEVELING + - opt_enable ENABLE_AUTO_BED_LEVELING DEBUG_LEVELING_FEATURE - build_marlin - # enable AUTO_BED_LEVELING with servos - - restore_configs - - opt_enable ENABLE_AUTO_BED_LEVELING NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE + # + # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos + # + - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - build_marlin - # enable EEPROM_SETTINGS & EEPROM_CHITCHAT + # + # Test EEPROM_SETTINGS & EEPROM_CHITCHAT + # - restore_configs - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT - build_marlin + # ### LCDS ### + # + # # ULTIMAKERCONTROLLER + # - restore_configs - opt_enable ULTIMAKERCONTROLLER - build_marlin + # # MAKRPANEL - # Needs to use melzi and sanguino hardware + # Needs to use Melzi and Sanguino hardware + # #- restore_configs #- opt_enable MAKRPANEL #- build_marlin + # # REPRAP_DISCOUNT_SMART_CONTROLLER + # - restore_configs - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT - build_marlin + # # G3D_PANEL + # - restore_configs - opt_enable G3D_PANEL SDSUPPORT - build_marlin + # # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + # - restore_configs - - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT - build_marlin + # # REPRAPWORLD_KEYPAD + # # Cant find configuration details to get it to compile #- restore_configs #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP #- build_marlin + # # RA_CONTROL_PANEL + # - restore_configs - opt_enable RA_CONTROL_PANEL - build_marlin + # ### I2C PANELS ### + # # LCD_I2C_SAINSMART_YWROBOT # Failing at the moment needs different library #- restore_configs #- opt_enable LCD_I2C_SAINSMART_YWROBOT #- build_marlin + # # LCD_I2C_PANELOLU2 + # - restore_configs - opt_enable LCD_I2C_PANELOLU2 - build_marlin + # # LCD_I2C_VIKI + # - restore_configs - opt_enable LCD_I2C_VIKI - build_marlin + # # LCM1602 + # - restore_configs - opt_enable LCM1602 - build_marlin + # # Enable FILAMENTCHANGEENABLE + # - restore_configs - - opt_enable FILAMENTCHANGEENABLE + - opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER - build_marlin + # # Enable filament sensor + # - restore_configs - opt_enable FILAMENT_WIDTH_SENSOR - build_marlin + # # Enable filament sensor with LCD display - - restore_configs - - opt_enable ULTIMAKERCONTROLLER FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY + # + - opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY - build_marlin + # # Enable COREXY + # - restore_configs - opt_enable COREXY - build_marlin + # # Enable COREXZ + # - restore_configs - opt_enable COREXZ - build_marlin + # # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS + # - restore_configs - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS - pins_set RAMPS_14 X_MAX_PIN -1 - opt_set_adv Z2_MAX_PIN 2 - build_marlin - - restore_configs + # + # ######## Example Configurations ############## + # # Delta Config (generic) + - restore_configs - use_example_configs delta/generic - build_marlin + # # Delta Config (generic) + ABL + ALLEN_KEY + # - use_example_configs delta/generic - opt_disable DISABLE_MIN_ENDSTOPS - opt_enable AUTO_BED_LEVELING_FEATURE Z_PROBE_ALLEN_KEY - build_marlin + # # Delta Config (Mini Kossel) + # - use_example_configs delta/kossel_mini - build_marlin + # # Makibox Config need to check board type for Teensy++ 2.0 + # #- use_example_configs makibox #- build_marlin + # # SCARA Config + # - use_example_configs SCARA - build_marlin + # # tvrrug Config need to check board type for sanguino atmega644p + # #- use_example_configs tvrrug/Round2 #- build_marlin + # + # ######## Board Types ############# + # + # To be added in nightly test branch + # From 1220dfd5d6af93d316cd53a3865939d9460fc0d3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 4 Apr 2016 16:36:04 -0700 Subject: [PATCH 10/10] Fix: menu edit items saving position twice --- Marlin/ultralcd.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 483d021fe..b9ee875ca 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1778,8 +1778,6 @@ static void lcd_control_volumetric_menu() { void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \ void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \ static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \ - lcd_save_previous_menu(); \ - \ lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW; \ currentMenu = menu_edit_ ## _name; \ \