Quellcode durchsuchen

Merge remote-tracking branch 'upstream/RCBugFix' into RCBugFix

Gege2B vor 9 Jahren
Ursprung
Commit
03d5c9a482

+ 92
- 20
.travis.yml Datei anzeigen

@@ -1,12 +1,13 @@
1 1
 ---
2 2
 language: c
3
-
3
+  #
4 4
 before_install:
5 5
   # Travis runs a detached head. We need to find the current branch
6 6
   - git checkout `git branch --contains HEAD | grep -v '*'`
7 7
   # Also tags for the root(s) of the minor version(s)
8 8
   - git fetch origin --tags
9 9
   - mkdir ~/bin
10
+  #
10 11
 install:
11 12
   # Install arduino 1.6.4
12 13
   - wget http://downloads-02.arduino.cc/arduino-1.6.4-linux64.tar.xz
@@ -26,144 +27,215 @@ install:
26 27
   - mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C
27 28
   - git clone https://github.com/lincomatic/LiquidTWI2.git
28 29
   - mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
30
+  #
29 31
 before_script:
30 32
   # arduino requires an X server even with command line
31 33
   # https://github.com/arduino/Arduino/issues/1981
32 34
   - Xvfb :1 -screen 0 1024x768x16 &> xvfb.log &
33 35
   # change back to home directory for compiling
34 36
   - cd $TRAVIS_BUILD_DIR
37
+  #
35 38
 script:
36
-  # build default config
37
-  - build_marlin
39
+  #
38 40
   # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h
41
+  #
39 42
   - cp Marlin/Configuration.h Marlin/Configuration.h.backup
40 43
   - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
41 44
   - cp Marlin/pins_RAMPS_14.h Marlin/pins_RAMPS_14.h.backup
42
-  # add sensor for bed
45
+  #
46
+  # Build with the default configurations
47
+  #
48
+  - build_marlin
49
+  #
50
+  # Test heated bed temperature sensor
51
+  #
43 52
   - opt_set TEMP_SENSOR_BED 1
44 53
   - build_marlin
45
-  # change extruder numbers from 1 to 2
54
+  #
55
+  # Test 2 extruders on basic RAMPS 1.4
56
+  #
46 57
   - opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
47 58
   - opt_set EXTRUDERS 2
48 59
   - opt_set TEMP_SENSOR_1 1
49
-  #- cat Marlin/Configuration.h
50 60
   - build_marlin
51
-  # change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h 
61
+  #
62
+  # Test 3 extruders on RUMBA (can use any board with >=3 extruders defined)
63
+  #
52 64
   - opt_set MOTHERBOARD BOARD_RUMBA
53 65
   - opt_set EXTRUDERS 3
54 66
   - opt_set TEMP_SENSOR_2 1
55 67
   - build_marlin
56
-  # enable PIDTEMPBED 
68
+  #
69
+  # Test PIDTEMPBED
70
+  #
57 71
   - restore_configs
58 72
   - opt_enable PIDTEMPBED
59 73
   - build_marlin
60
-  # enable AUTO_BED_LEVELING
74
+  #
75
+  # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE
76
+  #
61 77
   - restore_configs
62
-  - opt_enable ENABLE_AUTO_BED_LEVELING
78
+  - opt_enable ENABLE_AUTO_BED_LEVELING DEBUG_LEVELING_FEATURE
63 79
   - build_marlin
64
-  # enable AUTO_BED_LEVELING with servos
65
-  - restore_configs
66
-  - opt_enable ENABLE_AUTO_BED_LEVELING NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
80
+  #
81
+  # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos
82
+  #
83
+  - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
67 84
   - build_marlin
68
-  # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
85
+  #
86
+  # Test EEPROM_SETTINGS & EEPROM_CHITCHAT
87
+  #
69 88
   - restore_configs
70 89
   - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
71 90
   - build_marlin
91
+  #
72 92
   ### LCDS ###
93
+  #
94
+  #
73 95
   # ULTIMAKERCONTROLLER
96
+  #
74 97
   - restore_configs
75 98
   - opt_enable ULTIMAKERCONTROLLER
76 99
   - build_marlin
100
+  #
77 101
   # MAKRPANEL
78
-  # Needs to use melzi and sanguino hardware
102
+  # Needs to use Melzi and Sanguino hardware
103
+  #
79 104
   #- restore_configs
80 105
   #- opt_enable MAKRPANEL
81 106
   #- build_marlin
107
+  #
82 108
   # REPRAP_DISCOUNT_SMART_CONTROLLER
109
+  #
83 110
   - restore_configs
84 111
   - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
85 112
   - build_marlin
113
+  #
86 114
   # G3D_PANEL
115
+  #
87 116
   - restore_configs
88 117
   - opt_enable G3D_PANEL SDSUPPORT
89 118
   - build_marlin
119
+  #
90 120
   # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
121
+  #
91 122
   - restore_configs
92
-  - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
123
+  - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
93 124
   - build_marlin
125
+  #
94 126
   # REPRAPWORLD_KEYPAD
127
+  #
95 128
   # Cant find configuration details to get it to compile
96 129
   #- restore_configs
97 130
   #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
98 131
   #- build_marlin
132
+  #
99 133
   # RA_CONTROL_PANEL
134
+  #
100 135
   - restore_configs
101 136
   - opt_enable RA_CONTROL_PANEL
102 137
   - build_marlin
138
+  #
103 139
   ### I2C PANELS ###
140
+  #
104 141
   # LCD_I2C_SAINSMART_YWROBOT
105 142
   # Failing at the moment needs different library 
106 143
   #- restore_configs
107 144
   #- opt_enable LCD_I2C_SAINSMART_YWROBOT
108 145
   #- build_marlin
146
+  #
109 147
   # LCD_I2C_PANELOLU2
148
+  #
110 149
   - restore_configs
111 150
   - opt_enable LCD_I2C_PANELOLU2
112 151
   - build_marlin
152
+  #
113 153
   # LCD_I2C_VIKI
154
+  #
114 155
   - restore_configs
115 156
   - opt_enable LCD_I2C_VIKI
116 157
   - build_marlin
158
+  #
117 159
   # LCM1602
160
+  #
118 161
   - restore_configs
119 162
   - opt_enable LCM1602
120 163
   - build_marlin
164
+  #
121 165
   # Enable FILAMENTCHANGEENABLE
166
+  #
122 167
   - restore_configs
123
-  - opt_enable FILAMENTCHANGEENABLE
168
+  - opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER
124 169
   - build_marlin
170
+  #
125 171
   # Enable filament sensor
172
+  #
126 173
   - restore_configs
127 174
   - opt_enable FILAMENT_WIDTH_SENSOR
128 175
   - build_marlin
176
+  #
129 177
   # Enable filament sensor with LCD display
130
-  - restore_configs
131
-  - opt_enable ULTIMAKERCONTROLLER FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY
178
+  #
179
+  - opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY
132 180
   - build_marlin
181
+  #
133 182
   # Enable COREXY
183
+  #
134 184
   - restore_configs
135 185
   - opt_enable COREXY
136 186
   - build_marlin
187
+  #
137 188
   # Enable COREXZ
189
+  #
138 190
   - restore_configs
139 191
   - opt_enable COREXZ
140 192
   - build_marlin
193
+  #
141 194
   # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
195
+  #
142 196
   - restore_configs
143 197
   - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
144 198
   - pins_set RAMPS_14 X_MAX_PIN -1
145 199
   - opt_set_adv Z2_MAX_PIN 2
146 200
   - build_marlin
147
-  - restore_configs
201
+  #
202
+  #
148 203
   ######## Example Configurations ##############
204
+  #
149 205
   # Delta Config (generic)
206
+  - restore_configs
150 207
   - use_example_configs delta/generic
151 208
   - build_marlin
209
+  #
152 210
   # Delta Config (generic) + ABL + ALLEN_KEY
211
+  #
153 212
   - use_example_configs delta/generic
154 213
   - opt_disable DISABLE_MIN_ENDSTOPS
155 214
   - opt_enable AUTO_BED_LEVELING_FEATURE Z_PROBE_ALLEN_KEY
156 215
   - build_marlin
216
+  #
157 217
   # Delta Config (Mini Kossel)
218
+  #
158 219
   - use_example_configs delta/kossel_mini
159 220
   - build_marlin
221
+  #
160 222
   # Makibox Config  need to check board type for Teensy++ 2.0
223
+  #
161 224
   #- use_example_configs makibox
162 225
   #- build_marlin
226
+  #
163 227
   # SCARA Config
228
+  #
164 229
   - use_example_configs SCARA
165 230
   - build_marlin
231
+  #
166 232
   # tvrrug Config need to check board type for sanguino atmega644p
233
+  #
167 234
   #- use_example_configs tvrrug/Round2
168 235
   #- build_marlin
236
+  #
237
+  #
169 238
   ######## Board Types #############
239
+  #
240
+  # To be added in nightly test branch
241
+  #

+ 7
- 7
Marlin/Marlin_main.cpp Datei anzeigen

@@ -4357,16 +4357,16 @@ inline void gcode_M110() {
4357 4357
 inline void gcode_M111() {
4358 4358
   marlin_debug_flags = code_seen('S') ? code_value_short() : DEBUG_NONE;
4359 4359
 
4360
-  const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO;
4361
-  const char str_debug_2[] PROGMEM = MSG_DEBUG_INFO;
4362
-  const char str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS;
4363
-  const char str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN;
4364
-  const char str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION;
4360
+  const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO;
4361
+  const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO;
4362
+  const static char str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS;
4363
+  const static char str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN;
4364
+  const static char str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION;
4365 4365
   #if ENABLED(DEBUG_LEVELING_FEATURE)
4366
-    const char str_debug_32[] PROGMEM = MSG_DEBUG_LEVELING;
4366
+    const static char str_debug_32[] PROGMEM = MSG_DEBUG_LEVELING;
4367 4367
   #endif
4368 4368
 
4369
-  const char* const debug_strings[] PROGMEM = {
4369
+  const static char* const debug_strings[] PROGMEM = {
4370 4370
     str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16,
4371 4371
     #if ENABLED(DEBUG_LEVELING_FEATURE)
4372 4372
       str_debug_32

+ 14
- 2
Marlin/example_configurations/Hephestos_2/Configuration.h Datei anzeigen

@@ -340,8 +340,22 @@
340 340
 // Enable this option for Toshiba steppers
341 341
 //#define CONFIG_STEPPERS_TOSHIBA
342 342
 
343
+//===========================================================================
344
+//============================== Endstop Settings ===========================
345
+//===========================================================================
346
+
343 347
 // @section homing
344 348
 
349
+// Specify here all the endstop connectors that are connected to any endstop or probe.
350
+// Almost all printers will be using one per axis. Probes will use one or more of the
351
+// extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
352
+#define USE_XMIN_PLUG
353
+#define USE_YMIN_PLUG
354
+#define USE_ZMIN_PLUG
355
+//#define USE_XMAX_PLUG
356
+//#define USE_YMAX_PLUG
357
+//#define USE_ZMAX_PLUG
358
+
345 359
 // coarse Endstop Settings
346 360
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
347 361
 
@@ -364,8 +378,6 @@ const bool X_MAX_ENDSTOP_INVERTING = true;  // set to true to invert the logic o
364 378
 const bool Y_MAX_ENDSTOP_INVERTING = true;  // set to true to invert the logic of the endstop.
365 379
 const bool Z_MAX_ENDSTOP_INVERTING = true;  // set to true to invert the logic of the endstop.
366 380
 const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
367
-#define DISABLE_MAX_ENDSTOPS
368
-//#define DISABLE_MIN_ENDSTOPS
369 381
 
370 382
 //===========================================================================
371 383
 //============================= Z Probe Options =============================

+ 14
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration.h Datei anzeigen

@@ -374,8 +374,22 @@
374 374
 // Enable this option for Toshiba steppers
375 375
 //#define CONFIG_STEPPERS_TOSHIBA
376 376
 
377
+//===========================================================================
378
+//============================== Endstop Settings ===========================
379
+//===========================================================================
380
+
377 381
 // @section homing
378 382
 
383
+// Specify here all the endstop connectors that are connected to any endstop or probe.
384
+// Almost all printers will be using one per axis. Probes will use one or more of the
385
+// extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
386
+//#define USE_XMIN_PLUG
387
+//#define USE_YMIN_PLUG
388
+#define USE_ZMIN_PLUG // a Z probe
389
+#define USE_XMAX_PLUG
390
+#define USE_YMAX_PLUG
391
+#define USE_ZMAX_PLUG
392
+
379 393
 // coarse Endstop Settings
380 394
 //#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
381 395
 
@@ -398,8 +412,6 @@ const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
398 412
 const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
399 413
 const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
400 414
 const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
401
-//#define DISABLE_MAX_ENDSTOPS
402
-//#define DISABLE_MIN_ENDSTOPS
403 415
 
404 416
 //===========================================================================
405 417
 //============================= Z Probe Options =============================

+ 5
- 4
Marlin/language_cz.h Datei anzeigen

@@ -47,11 +47,11 @@
47 47
 #define MSG_DISABLE_STEPPERS                "Uvolnit motory"
48 48
 #define MSG_AUTO_HOME                       "Domovska pozice"
49 49
 #define MSG_LEVEL_BED_HOMING                "Mereni podlozky"
50
-#define MSG_LEVEL_BED_WAITING               "Click to Begin"
51
-#define MSG_LEVEL_BED_DONE                  "Leveling Done!"
52
-#define MSG_LEVEL_BED_CANCEL                "Cancel"
50
+#define MSG_LEVEL_BED_WAITING               "Kliknutim spustte"
51
+#define MSG_LEVEL_BED_DONE                  "Mereni hotovo!"
52
+#define MSG_LEVEL_BED_CANCEL                "Storno"
53 53
 #define MSG_SET_HOME_OFFSETS                "Nastavit ofsety"
54
-#define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
54
+#define MSG_HOME_OFFSETS_APPLIED            "Ofsety nastaveny"
55 55
 #define MSG_SET_ORIGIN                      "Nastavit pocatek"
56 56
 #define MSG_PREHEAT_PLA                     "Zahrat PLA"
57 57
 #define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
@@ -78,6 +78,7 @@
78 78
 #define MSG_MOVE_1MM                        "Posunout o 1mm"
79 79
 #define MSG_MOVE_10MM                       "Posunout o 10mm"
80 80
 #define MSG_SPEED                           "Rychlost"
81
+#define MSG_BED_Z                           "Vyska podl."
81 82
 #define MSG_NOZZLE                          "Tryska"
82 83
 #define MSG_BED                             "Podlozka"
83 84
 #define MSG_FAN_SPEED                       "Rychlost vent."

+ 42
- 29
Marlin/language_es.h Datei anzeigen

@@ -39,33 +39,33 @@
39 39
 #define MSG_SD_INSERTED                     "Tarjeta colocada"
40 40
 #define MSG_SD_REMOVED                      "Tarjeta retirada"
41 41
 #define MSG_MAIN                            "Menu principal"
42
-#define MSG_AUTOSTART                       "Autostart"
42
+#define MSG_AUTOSTART                       "Inicio automatico"
43 43
 #define MSG_DISABLE_STEPPERS                "Apagar motores"
44 44
 #define MSG_AUTO_HOME                       "Llevar al origen"
45
-#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
45
+#define MSG_LEVEL_BED_HOMING                "Origen XYZ"
46 46
 #define MSG_LEVEL_BED_WAITING               "Click to Begin"
47 47
 #define MSG_LEVEL_BED_DONE                  "Leveling Done!"
48 48
 #define MSG_LEVEL_BED_CANCEL                "Cancel"
49
-#define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
49
+#define MSG_SET_HOME_OFFSETS                "Ajustar desfases"
50 50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
51
-#define MSG_SET_ORIGIN                      "Establecer cero"
51
+#define MSG_SET_ORIGIN                      "Establecer origen"
52 52
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
53
-#define MSG_PREHEAT_PLA_N                   "Precalentar PLA "
54
-#define MSG_PREHEAT_PLA_ALL                 "Precal. PLA Todo"
55
-#define MSG_PREHEAT_PLA_BEDONLY             "Precal. PLA Base"
56
-#define MSG_PREHEAT_PLA_SETTINGS            "Ajustar temp. PLA"
53
+#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
54
+#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA "Todo"
55
+#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA"Plataforma"
56
+#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA "Config"
57 57
 #define MSG_PREHEAT_ABS                     "Precalentar ABS"
58
-#define MSG_PREHEAT_ABS_N                   "Precalentar ABS "
59
-#define MSG_PREHEAT_ABS_ALL                 "Precal. ABS Todo"
60
-#define MSG_PREHEAT_ABS_BEDONLY             "Precal. ABS Base"
61
-#define MSG_PREHEAT_ABS_SETTINGS            "Ajustar temp. ABS"
58
+#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
59
+#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS "Todo"
60
+#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS "Plataforma"
61
+#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS "Config"
62 62
 #define MSG_COOLDOWN                        "Enfriar"
63 63
 #define MSG_SWITCH_PS_ON                    "Encender"
64 64
 #define MSG_SWITCH_PS_OFF                   "Apagar"
65 65
 #define MSG_EXTRUDE                         "Extruir"
66 66
 #define MSG_RETRACT                         "Retraer"
67 67
 #define MSG_MOVE_AXIS                       "Mover ejes"
68
-#define MSG_LEVEL_BED                       "Nivelar cama"
68
+#define MSG_LEVEL_BED                       "Nivelar plataforma"
69 69
 #define MSG_MOVE_X                          "Mover X"
70 70
 #define MSG_MOVE_Y                          "Mover Y"
71 71
 #define MSG_MOVE_Z                          "Mover Z"
@@ -74,22 +74,22 @@
74 74
 #define MSG_MOVE_1MM                        "Mover 1mm"
75 75
 #define MSG_MOVE_10MM                       "Mover 10mm"
76 76
 #define MSG_SPEED                           "Velocidad"
77
-#define MSG_NOZZLE                          "Fusor"
78
-#define MSG_BED                             "Base"
77
+#define MSG_NOZZLE                          "Boquilla"
78
+#define MSG_BED                             "Plataforma"
79 79
 #define MSG_FAN_SPEED                       "Ventilador"
80 80
 #define MSG_FLOW                            "Flujo"
81 81
 #define MSG_CONTROL                         "Control"
82 82
 #define MSG_MIN                             LCD_STR_THERMOMETER " Min"
83 83
 #define MSG_MAX                             LCD_STR_THERMOMETER " Max"
84 84
 #define MSG_FACTOR                          LCD_STR_THERMOMETER " Fact"
85
-#define MSG_AUTOTEMP                        "Autotemp"
86
-#define MSG_ON                              "On"
87
-#define MSG_OFF                             "Off"
85
+#define MSG_AUTOTEMP                        "Temperatura Automatica"
86
+#define MSG_ON                              "Encender"
87
+#define MSG_OFF                             "Apagar"
88 88
 #define MSG_PID_P                           "PID-P"
89 89
 #define MSG_PID_I                           "PID-I"
90 90
 #define MSG_PID_D                           "PID-D"
91 91
 #define MSG_PID_C                           "PID-C"
92
-#define MSG_ACC                             "Acel"
92
+#define MSG_ACC                             "Aceleracion"
93 93
 #define MSG_VXY_JERK                        "Vxy-jerk"
94 94
 #define MSG_VZ_JERK                         "Vz-jerk"
95 95
 #define MSG_VE_JERK                         "Ve-jerk"
@@ -99,9 +99,9 @@
99 99
 #define MSG_Z                               "z"
100 100
 #define MSG_E                               "e"
101 101
 #define MSG_VMIN                            "Vmin"
102
-#define MSG_VTRAV_MIN                       "Vvacio min"
103
-#define MSG_AMAX                            "Amax"
104
-#define MSG_A_RETRACT                       "A-retrac."
102
+#define MSG_VTRAV_MIN                       "Vel. viaje min"
103
+#define MSG_AMAX                            "Acel. max"
104
+#define MSG_A_RETRACT                       "Acel. retrac."
105 105
 #define MSG_XSTEPS                          "X pasos/mm"
106 106
 #define MSG_YSTEPS                          "Y pasos/mm"
107 107
 #define MSG_ZSTEPS                          "Z pasos/mm"
@@ -114,23 +114,23 @@
114 114
 #define MSG_CONTRAST                        "Contraste"
115 115
 #define MSG_STORE_EPROM                     "Guardar memoria"
116 116
 #define MSG_LOAD_EPROM                      "Cargar memoria"
117
-#define MSG_RESTORE_FAILSAFE                "Rest. de emergen."
117
+#define MSG_RESTORE_FAILSAFE                "Restaurar memoria."
118 118
 #define MSG_REFRESH                         "Volver a cargar"
119 119
 #define MSG_WATCH                           "Monitorizar"
120 120
 #define MSG_PREPARE                         "Preparar"
121 121
 #define MSG_TUNE                            "Ajustar"
122 122
 #define MSG_PAUSE_PRINT                     "Pausar impresion"
123
-#define MSG_RESUME_PRINT                    "Reanudar impres."
123
+#define MSG_RESUME_PRINT                    "Reanudar impresion"
124 124
 #define MSG_STOP_PRINT                      "Detener impresion"
125 125
 #define MSG_CARD_MENU                       "Menu de SD"
126 126
 #define MSG_NO_CARD                         "No hay tarjeta SD"
127 127
 #define MSG_DWELL                           "Reposo..."
128 128
 #define MSG_USERWAIT                        "Esperando ordenes"
129 129
 #define MSG_RESUMING                        "Resumiendo impre."
130
-#define MSG_PRINT_ABORTED                   "Print aborted"
130
+#define MSG_PRINT_ABORTED                   "Impresion cancelada"
131 131
 #define MSG_NO_MOVE                         "Sin movimiento"
132
-#define MSG_KILLED                          "PARADA DE EMERG."
133
-#define MSG_STOPPED                         "PARADA"
132
+#define MSG_KILLED                          "Parada de emergencia."
133
+#define MSG_STOPPED                         "Detenida"
134 134
 #define MSG_CONTROL_RETRACT                 "Retraer mm"
135 135
 #define MSG_CONTROL_RETRACT_SWAP            "Interc. Retraer mm"
136 136
 #define MSG_CONTROL_RETRACTF                "Retraer  V"
@@ -138,19 +138,32 @@
138 138
 #define MSG_CONTROL_RETRACT_RECOVER         "DesRet +mm"
139 139
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Interc. DesRet +mm"
140 140
 #define MSG_CONTROL_RETRACT_RECOVERF        "DesRet V"
141
-#define MSG_AUTORETRACT                     "AutoRetr."
141
+#define MSG_AUTORETRACT                     "Retraccion Auto."
142 142
 #define MSG_FILAMENTCHANGE                  "Cambiar filamento"
143 143
 #define MSG_INIT_SDCARD                     "Iniciando tarjeta"
144 144
 #define MSG_CNG_SDCARD                      "Cambiar tarjeta"
145 145
 #define MSG_ZPROBE_OUT                      "Sonda Z fuera"
146 146
 #define MSG_YX_UNHOMED                      "Reiniciar X/Y y Z"
147
-#define MSG_ZPROBE_ZOFFSET                  "Offset Z"
147
+#define MSG_ZPROBE_ZOFFSET                  "Desfase Z"
148 148
 #define MSG_BABYSTEP_X                      "Micropaso X"
149 149
 #define MSG_BABYSTEP_Y                      "Micropaso Y"
150 150
 #define MSG_BABYSTEP_Z                      "Micropaso Z"
151 151
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
152 152
 #define MSG_END_HOUR                        "horas"
153 153
 #define MSG_END_MINUTE                      "minutos"
154
+#define MSG_BED_Z                           "Plataforma Z"
155
+#define MSG_A_TRAVEL                        "Acel. Viaje"
156
+#define MSG_HEATING_FAILED_LCD              "Error: al calentar"
157
+#define MSG_ERR_REDUNDANT_TEMP              "Error: temperatura redundante"
158
+#define MSG_THERMAL_RUNAWAY                 "Error de temperatura"
159
+#define MSG_ERR_MAXTEMP                     "Error: Temp Maxima"
160
+#define MSG_ERR_MINTEMP                     "Error: Temp Minima"
161
+#define MSG_ERR_MAXTEMP_BED                 "Error: Temp Max Plataforma"
162
+#define MSG_ERR_MINTEMP_BED                 "Error: Temp Min Plataforma"
163
+#define MSG_HEATING                         "Calentando..."
164
+#define MSG_HEATING_COMPLETE                "Calentamiento Completo"
165
+#define MSG_BED_HEATING                     "Calentando plataforma ..."
166
+#define MSG_BED_DONE                        "Plataforma Caliente"
154 167
 
155 168
 #if ENABLED(DELTA_CALIBRATION_MENU)
156 169
   #define MSG_DELTA_CALIBRATE               "Calibracion Delta"

+ 13
- 0
Marlin/language_it.h Datei anzeigen

@@ -151,6 +151,19 @@
151 151
 #define MSG_ENDSTOP_ABORT                   "Finecorsa abort"
152 152
 #define MSG_END_HOUR                        "ore"
153 153
 #define MSG_END_MINUTE                      "minuti"
154
+#define MSG_BED_Z                           "piatto Z"
155
+#define MSG_A_TRAVEL                        "A-Spostamento"
156
+#define MSG_HEATING_FAILED_LCD              "Riscald. Fallito"
157
+#define MSG_ERR_REDUNDANT_TEMP              "Err: TERM RINDONDANTI"
158
+#define MSG_THERMAL_RUNAWAY                 "SURRISCALDAMENTO"
159
+#define MSG_ERR_MAXTEMP                     "Err: TEMP MAX"
160
+#define MSG_ERR_MINTEMP                     "Err: TEMP MIN"
161
+#define MSG_ERR_MAXTEMP_BED                 "Err: TMAX PIATTO"
162
+#define MSG_ERR_MINTEMP_BED                 "Err: TMIN PIATTO"
163
+#define MSG_HEATING                         "Riscaldamento.."
164
+#define MSG_HEATING_COMPLETE                "Riscald completo"
165
+#define MSG_BED_HEATING                     "Risc. Piatto.."
166
+#define MSG_BED_DONE                        "Risc. Piatto Completo"
154 167
 
155 168
 #if ENABLED(DELTA_CALIBRATION_MENU)
156 169
   #define MSG_DELTA_CALIBRATE               "Calibraz. Delta"

+ 17
- 4
Marlin/language_nl.h Datei anzeigen

@@ -46,7 +46,7 @@
46 46
 #define MSG_LEVEL_BED_WAITING               "Click to Begin"
47 47
 #define MSG_LEVEL_BED_DONE                  "Leveling Done!"
48 48
 #define MSG_LEVEL_BED_CANCEL                "Cancel"
49
-#define MSG_SET_HOME_OFFSETS                "Set home offsets"
49
+#define MSG_SET_HOME_OFFSETS                "Zet home offsets"
50 50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
51 51
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
52 52
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
@@ -128,8 +128,8 @@
128 128
 #define MSG_RESUMING                        "Print hervatten"
129 129
 #define MSG_PRINT_ABORTED                   "Print afgebroken"
130 130
 #define MSG_NO_MOVE                         "Geen beweging."
131
-#define MSG_KILLED                          "AFGEBROKEN. "
132
-#define MSG_STOPPED                         "GESTOPT. "
131
+#define MSG_KILLED                          "Afgebroken. "
132
+#define MSG_STOPPED                         "Gestopt. "
133 133
 #define MSG_CONTROL_RETRACT                 "Retract mm"
134 134
 #define MSG_CONTROL_RETRACT_SWAP            "Ruil Retract mm"
135 135
 #define MSG_CONTROL_RETRACTF                "Retract  F"
@@ -140,7 +140,7 @@
140 140
 #define MSG_AUTORETRACT                     "AutoRetr."
141 141
 #define MSG_FILAMENTCHANGE                  "Verv. Filament"
142 142
 #define MSG_INIT_SDCARD                     "Init. SD kaart"
143
-#define MSG_CNG_SDCARD                      "Verv. SD card"
143
+#define MSG_CNG_SDCARD                      "Verv. SD Kaart"
144 144
 #define MSG_ZPROBE_OUT                      "Z probe uit. bed"
145 145
 #define MSG_YX_UNHOMED                      "Home X/Y voor Z"
146 146
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
@@ -150,6 +150,19 @@
150 150
 #define MSG_ENDSTOP_ABORT                   "Endstop afbr."
151 151
 #define MSG_END_HOUR                        "uur"
152 152
 #define MSG_END_MINUTE                      "minuten"
153
+#define MSG_BED_Z                           "Bed Z"
154
+#define MSG_A_TRAVEL                        "A-travel"
155
+#define MSG_HEATING_FAILED_LCD              "voorverw. fout"
156
+#define MSG_ERR_REDUNDANT_TEMP              "Fout: Redundant temp fout"
157
+#define MSG_THERMAL_RUNAWAY                 "Thermische wegloop"
158
+#define MSG_ERR_MAXTEMP                     "Fout: Max. temp"
159
+#define MSG_ERR_MINTEMP                     "Fout: Min. temp"
160
+#define MSG_ERR_MAXTEMP_BED                 "Fout: Max. temp bed"
161
+#define MSG_ERR_MINTEMP_BED                 "Fout: Min. temp bed"
162
+#define MSG_HEATING                         "Voorwarmen..."
163
+#define MSG_HEATING_COMPLETE                "voorverw. kompleet"
164
+#define MSG_BED_HEATING                     "Bed voorverwarmen"
165
+#define MSG_BED_DONE                        "Bed is voorverw."
153 166
 
154 167
 #if ENABLED(DELTA_CALIBRATION_MENU)
155 168
   #define MSG_DELTA_CALIBRATE               "Delta Calibratie"

+ 14
- 0
Marlin/scripts/findMissingTranslations.sh Datei anzeigen

@@ -0,0 +1,14 @@
1
+#!/bin/bash
2
+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"
3
+
4
+for i in `awk '/#define/{print $2}' language_en.h`; do
5
+  for j in `ls language_*.h | grep -v language_en.h`; do
6
+    t=$(grep -c "${i}" ${j})
7
+    if [ "$t" -eq 0 ]; then
8
+      for k in ${IGNORE_DEFINES}; do
9
+        [ "${k}" == "${i}" ] && continue 2;
10
+      done
11
+      echo "${j},${i}"
12
+    fi
13
+  done
14
+done

+ 0
- 2
Marlin/ultralcd.cpp Datei anzeigen

@@ -1778,8 +1778,6 @@ static void lcd_control_volumetric_menu() {
1778 1778
   void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \
1779 1779
   void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \
1780 1780
   static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
1781
-    lcd_save_previous_menu(); \
1782
-    \
1783 1781
     lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW; \
1784 1782
     currentMenu = menu_edit_ ## _name; \
1785 1783
     \

Laden…
Abbrechen
Speichern