thomas
/
marlin
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Merge pull request #1303 from wgm4321/Development 

Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
Bo Herrmannsen 10 år sedan
förälder
b5c6f11e41 04fb34c7ff
incheckning
3d9f4ac757
13 ändrade filer med 64 tillägg och 0 borttagningar
Delad Vy Visa Diff Statistik
  1. 4
    0
      Marlin/dogm_lcd_implementation.h
  2. 5
    0
      Marlin/language_an.h
  3. 5
    0
      Marlin/language_ca.h
  4. 5
    0
      Marlin/language_de.h
  5. 5
    0
      Marlin/language_es.h
  6. 5
    0
      Marlin/language_eu.h
  7. 5
    0
      Marlin/language_fi.h
  8. 5
    0
      Marlin/language_fr.h
  9. 5
    0
      Marlin/language_it.h
  10. 5
    0
      Marlin/language_nl.h
  11. 5
    0
      Marlin/language_pl.h
  12. 5
    0
      Marlin/language_pt.h
  13. 5
    0
      Marlin/language_ru.h

+ 4
- 0
Marlin/dogm_lcd_implementation.h Visa fil 

@@ -366,6 +366,8 @@ static void _drawmenu_setting_edit_generic(uint8_t row, const char* pstr, char p
366 366 
 #define lcd_implementation_drawmenu_setting_edit_float3(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr3(*(data)))
367 367 
 #define lcd_implementation_drawmenu_setting_edit_float32_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr32(*(data)))
368 368 
 #define lcd_implementation_drawmenu_setting_edit_float32(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr32(*(data)))
369 
+#define lcd_implementation_drawmenu_setting_edit_float43_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr43(*(data)))
370 
+#define lcd_implementation_drawmenu_setting_edit_float43(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr43(*(data)))
369 371 
 #define lcd_implementation_drawmenu_setting_edit_float5_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr5(*(data)))
370 372 
 #define lcd_implementation_drawmenu_setting_edit_float5(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr5(*(data)))
371 373 
 #define lcd_implementation_drawmenu_setting_edit_float52_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr52(*(data)))
 
@@ -384,6 +386,8 @@ static void _drawmenu_setting_edit_generic(uint8_t row, const char* pstr, char p
384 386 
 #define lcd_implementation_drawmenu_setting_edit_callback_float3(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr3(*(data)))
385 387 
 #define lcd_implementation_drawmenu_setting_edit_callback_float32_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr32(*(data)))
386 388 
 #define lcd_implementation_drawmenu_setting_edit_callback_float32(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr32(*(data)))
389 
+#define lcd_implementation_drawmenu_setting_edit_callback_float43_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr43(*(data)))
390 
+#define lcd_implementation_drawmenu_setting_edit_callback_float43(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr43(*(data)))
387 391 
 #define lcd_implementation_drawmenu_setting_edit_callback_float5_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr5(*(data)))
388 392 
 #define lcd_implementation_drawmenu_setting_edit_callback_float5(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr5(*(data)))
389 393 
 #define lcd_implementation_drawmenu_setting_edit_callback_float52_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr52(*(data)))

+ 5
- 0
Marlin/language_an.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "E trangos/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatura"
88 88 
 #define MSG_MOTION                          "Movimiento"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "Contrast"
90 95 
 #define MSG_STORE_EPROM                     "Alzar Memoria"
91 96 
 #define MSG_LOAD_EPROM                      "Cargar Memoria"

+ 5
- 0
Marlin/language_ca.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Epassos/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatura"
88 88 
 #define MSG_MOTION                          "Moviment"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "Contrast de LCD"
90 95 
 #define MSG_STORE_EPROM                     "Desar a memoria"
91 96 
 #define MSG_LOAD_EPROM                      "Carregar de mem."

+ 5
- 0
Marlin/language_de.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Esteps/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatur"
88 88 
 #define MSG_MOTION                          "Bewegung"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "LCD contrast"
90 95 
 #define MSG_STORE_EPROM                     "EPROM speichern"
91 96 
 #define MSG_LOAD_EPROM                      "EPROM laden"

+ 5
- 0
Marlin/language_es.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "E pasos/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatura"
88 88 
 #define MSG_MOTION                          "Movimiento"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "Contraste"
90 95 
 #define MSG_STORE_EPROM                     "Guardar memoria"
91 96 
 #define MSG_LOAD_EPROM                      "Cargar memoria"

+ 5
- 0
Marlin/language_eu.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "E pausoak/mm"
87 87 
 #define MSG_TEMPERATURE                     "Tenperatura"
88 88 
 #define MSG_MOTION                          "Mugimendua"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "LCD kontrastea"
90 95 
 #define MSG_STORE_EPROM                     "Gorde memoria"
91 96 
 #define MSG_LOAD_EPROM                      "Kargatu memoria"

+ 5
- 0
Marlin/language_fi.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Esteps/mm"
87 87 
 #define MSG_TEMPERATURE                     "Lampotila"
88 88 
 #define MSG_MOTION                          "Liike"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "LCD contrast"
90 95 
 #define MSG_STORE_EPROM                     "Tallenna muistiin"
91 96 
 #define MSG_LOAD_EPROM                      "Lataa muistista"

+ 5
- 0
Marlin/language_fr.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Epas/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperature"
88 88 
 #define MSG_MOTION                          "Mouvement"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "Contraste LCD"
90 95 
 #define MSG_STORE_EPROM                     "Sauver config"
91 96 
 #define MSG_LOAD_EPROM                      "Lire config"

+ 5
- 0
Marlin/language_it.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Epassi/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatura"
88 88 
 #define MSG_MOTION                          "Movimento"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "LCD contrast"
90 95 
 #define MSG_STORE_EPROM                     "Salva in EEPROM"
91 96 
 #define MSG_LOAD_EPROM                      "Carica da EEPROM"

+ 5
- 0
Marlin/language_nl.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Esteps/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatuur"
88 88 
 #define MSG_MOTION                          "Beweging"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "LCD contrast"
90 95 
 #define MSG_STORE_EPROM                     "Geheugen opslaan"
91 96 
 #define MSG_LOAD_EPROM                      "Geheugen laden"

+ 5
- 0
Marlin/language_pl.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "krokiE/mm"
87 87 
 #define MSG_TEMPERATURE                     "Temperatura"
88 88 
 #define MSG_MOTION                          "Ruch"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "Kontrast LCD"
90 95 
 #define MSG_STORE_EPROM                     "Zapisz w pamieci"
91 96 
 #define MSG_LOAD_EPROM                      "Wczytaj z pamieci"

+ 5
- 0
Marlin/language_pt.h Visa fil 

@@ -86,6 +86,11 @@
86 86 
 #define MSG_ESTEPS                          "Epasso/mm:"
87 87 
 #define MSG_TEMPERATURE                     "Temperatura"
88 88 
 #define MSG_MOTION                          "Movimento"
89 
+#define MSG_VOLUMETRIC                      "Filament"
90 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94 
 #define MSG_CONTRAST                        "Contrast"
90 95 
 #define MSG_STORE_EPROM                     "Guardar memoria"
91 96 
 #define MSG_LOAD_EPROM                      "Carregar memoria"

+ 5
- 0
Marlin/language_ru.h Visa fil 

@@ -88,6 +88,11 @@
88 88 
 #define MSG_ESTEPS                          "E шаг/mm:"
89 89 
 #define MSG_TEMPERATURE                     "Температура     \x7E"
90 90 
 #define MSG_MOTION                          "Скорости        \x7E"
91 
+#define MSG_VOLUMETRIC                      "Filament"
92 
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
93 
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
94 
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
95 
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
91 96 
 #define MSG_CONTRAST                        "LCD contrast"
92 97 
 #define MSG_STORE_EPROM                     "Сохранить в EPROM"
93 98 
 #define MSG_LOAD_EPROM                      "Загруз. из EPROM"

Write Förhandsgranska
Laddar…
Avbryt
Spara