thomas
/
marlin
關注 1
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

Merge branch 'Development' into marlin_configurator 

Latest upstream changes
Scott Lahteine 10 年之前
父節點
da275c72ab 266ff227cf
當前提交
f238c7428d
共有 2 個檔案被更改，包括 39 行新增 和 39 行删除
分割檢視 顯示文件統計
  1. 38
    38
      Marlin/language_fi.h
  2. 1
    1
      Marlin/stepper.cpp

+ 38
- 38
Marlin/language_fi.h 查看文件 

@@ -17,38 +17,38 @@
17 17 
 #define MSG_AUTO_HOME                       "Aja referenssiin"
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Aseta origo"
20 
-#define MSG_PREHEAT_PLA                     "Esilammita PLA"
21 
-#define MSG_PREHEAT_PLA_N                   "Esilammita PLA "
22 
-#define MSG_PREHEAT_PLA_ALL                 "Esila. PLA Kaikki"
23 
-#define MSG_PREHEAT_PLA_BEDONLY             "Esila. PLA Alusta"
24 
-#define MSG_PREHEAT_PLA_SETTINGS            "Esilamm. PLA konf"
25 
-#define MSG_PREHEAT_ABS                     "Esilammita ABS"
26 
-#define MSG_PREHEAT_ABS_N                   "Esilammita ABS "
27 
-#define MSG_PREHEAT_ABS_ALL                 "Esila. ABS Kaikki"
28 
-#define MSG_PREHEAT_ABS_BEDONLY             "Esila. ABS Alusta"
29 
-#define MSG_PREHEAT_ABS_SETTINGS            "Esilamm. ABS konf"
30 
-#define MSG_COOLDOWN                        "Jaahdyta"
31 
-#define MSG_SWITCH_PS_ON                    "Virta paalle"
20 
+#define MSG_PREHEAT_PLA                     "Esil" STR_ae "mmit" STR_ae " PLA"
21 
+#define MSG_PREHEAT_PLA_N                   "Esil" STR_ae "mmit" STR_ae " PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Esil" STR_ae ". PLA Kaikki"
23 
+#define MSG_PREHEAT_PLA_BEDONLY             "Esil" STR_ae ". PLA Alusta"
24 
+#define MSG_PREHEAT_PLA_SETTINGS            "Esil" STR_ae "mm. PLA konf"
25 
+#define MSG_PREHEAT_ABS                     "Esil" STR_ae "mmit" STR_ae " ABS"
26 
+#define MSG_PREHEAT_ABS_N                   "Esil" STR_ae "mmit" STR_ae " ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Esil" STR_ae ". ABS Kaikki"
28 
+#define MSG_PREHEAT_ABS_BEDONLY             "Esil" STR_ae ". ABS Alusta"
29 
+#define MSG_PREHEAT_ABS_SETTINGS            "Esil" STR_ae "mm. ABS konf"
30 
+#define MSG_COOLDOWN                        "J" STR_ae "" STR_ae "hdyt" STR_ae ""
31 
+#define MSG_SWITCH_PS_ON                    "Virta p" STR_ae "" STR_ae "lle"
32 32 
 #define MSG_SWITCH_PS_OFF                   "Virta pois"
33 33 
 #define MSG_EXTRUDE                         "Pursota"
34 
-#define MSG_RETRACT                         "Veda takaisin"
34 
+#define MSG_RETRACT                         "Ved" STR_ae " takaisin"
35 35 
 #define MSG_MOVE_AXIS                       "Liikuta akseleita"
36 
-#define MSG_MOVE_X                          "Move X"
37 
-#define MSG_MOVE_Y                          "Move Y"
38 
-#define MSG_MOVE_Z                          "Move Z"
36 
+#define MSG_MOVE_X                          "Liikuta X"
37 
+#define MSG_MOVE_Y                          "Liikuta Y"
38 
+#define MSG_MOVE_Z                          "Liikuta Z"
39 39 
 #define MSG_MOVE_E                          "Extruder"
40 
-#define MSG_MOVE_01MM                       "Move 0.1mm"
41 
-#define MSG_MOVE_1MM                        "Move 1mm"
42 
-#define MSG_MOVE_10MM                       "Move 10mm"
40 
+#define MSG_MOVE_01MM                       "Liikuta 0.1mm"
41 
+#define MSG_MOVE_1MM                        "Liikuta 1mm"
42 
+#define MSG_MOVE_10MM                       "Liikuta 10mm"
43 43 
 #define MSG_SPEED                           "Nopeus"
44 44 
 #define MSG_NOZZLE                          "Suutin"
45 45 
 #define MSG_BED                             "Alusta"
46 46 
 #define MSG_FAN_SPEED                       "Tuul. nopeus"
47 47 
 #define MSG_FLOW                            "Virtaus"
48 48 
 #define MSG_CONTROL                         "Kontrolli"
49 
-#define MSG_MIN                             " \002 Min"
50 
-#define MSG_MAX                             " \002 Max"
51 
-#define MSG_FACTOR                          " \002 Kerr"
49 
+#define MSG_MIN                             STR_THERMOMETER " Min"
50 
+#define MSG_MAX                             STR_THERMOMETER " Max"
51 
+#define MSG_FACTOR                          STR_THERMOMETER " Kerr"
52 52 
 #define MSG_AUTOTEMP                        "Autotemp"
53 53 
 #define MSG_ON                              "On "
54 54 
 #define MSG_OFF                             "Off"
 
@@ -73,24 +73,24 @@
73 73 
 #define MSG_YSTEPS                          "Ysteps/mm"
74 74 
 #define MSG_ZSTEPS                          "Zsteps/mm"
75 75 
 #define MSG_ESTEPS                          "Esteps/mm"
76 
-#define MSG_TEMPERATURE                     "Lampotila"
76 
+#define MSG_TEMPERATURE                     "L" STR_ae "mp" STR_oe "tila"
77 77 
 #define MSG_MOTION                          "Liike"
78 78 
 #define MSG_VOLUMETRIC                      "Filament"
79 
-#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
79 
+#define MSG_VOLUMETRIC_ENABLED              "E in mm3"
80 80 
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
81 81 
 #define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
82 82 
 #define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
83 
-#define MSG_CONTRAST                        "LCD contrast"
83 
+#define MSG_CONTRAST                        "LCD kontrasti"
84 84 
 #define MSG_STORE_EPROM                     "Tallenna muistiin"
85 85 
 #define MSG_LOAD_EPROM                      "Lataa muistista"
86 86 
 #define MSG_RESTORE_FAILSAFE                "Palauta oletus"
87 
-#define MSG_REFRESH                         "Paivita"
87 
+#define MSG_REFRESH                         "P" STR_ae "ivit" STR_ae ""
88 88 
 #define MSG_WATCH                           "Seuraa"
89 89 
 #define MSG_PREPARE                         "Valmistele"
90 
-#define MSG_TUNE                            "Saada"
91 
-#define MSG_PAUSE_PRINT                     "Keskeyta tulostus"
90 
+#define MSG_TUNE                            "S" STR_ae "" STR_ae "d" STR_ae ""
91 
+#define MSG_PAUSE_PRINT                     "Keskeyt" STR_ae " tulostus"
92 92 
 #define MSG_RESUME_PRINT                    "Jatka tulostusta"
93 
-#define MSG_STOP_PRINT                      "Pysayta tulostus"
93 
+#define MSG_STOP_PRINT                      "Pys" STR_ae "yt" STR_ae " tulostus"
94 94 
 #define MSG_CARD_MENU                       "Korttivalikko"
95 95 
 #define MSG_NO_CARD                         "Ei korttia"
96 96 
 #define MSG_DWELL                           "Nukkumassa..."
 
@@ -100,9 +100,9 @@
100 100 
 #define MSG_NO_MOVE                         "Ei liiketta."
101 101 
 #define MSG_KILLED                          "KILLED. "
102 102 
 #define MSG_STOPPED                         "STOPPED. "
103 
-#define MSG_CONTROL_RETRACT                 "Veda mm"
104 
-#define MSG_CONTROL_RETRACT_SWAP            "Va. Veda mm"
105 
-#define MSG_CONTROL_RETRACTF                "Veda V"
103 
+#define MSG_CONTROL_RETRACT                 "Ved" STR_ae " mm"
104 
+#define MSG_CONTROL_RETRACT_SWAP            "Va. Ved" STR_ae " mm"
105 
+#define MSG_CONTROL_RETRACTF                "Ved" STR_ae " V"
106 106 
 #define MSG_CONTROL_RETRACT_ZLIFT           "Z mm"
107 107 
 #define MSG_CONTROL_RETRACT_RECOVER         "UnRet +mm"
108 108 
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Va. UnRet +mm"
 
@@ -120,11 +120,11 @@
120 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
121 121
122 122 
 #ifdef DELTA_CALIBRATION_MENU
123 
-    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
124 
-    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
125 
-    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
126 
-    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
127 
-    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
123 
+    #define MSG_DELTA_CALIBRATE             "Delta Kalibrointi"
124 
+    #define MSG_DELTA_CALIBRATE_X           "Kalibroi X"
125 
+    #define MSG_DELTA_CALIBRATE_Y           "Kalibroi Y"
126 
+    #define MSG_DELTA_CALIBRATE_Z           "Kalibroi Z"
127 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Kalibroi Center"
128 128 
 #endif // DELTA_CALIBRATION_MENU
129 129
130 
-#endif // LANGUAGE_FI_H
130 
+#endif // LANGUAGE_FI_H

+ 1
- 1
Marlin/stepper.cpp 查看文件 

@@ -43,7 +43,7 @@ block_t *current_block;  // A pointer to the block currently being traced
43 43 
 //===========================================================================
44 44 
 //=============================private variables ============================
45 45 
 //===========================================================================
46 
-//static makes it inpossible to be called from outside of this file by extern.!
46 
+//static makes it impossible to be called from outside of this file by extern.!
47 47
48 48 
 // Variables used by The Stepper Driver Interrupt
49 49 
 static unsigned char out_bits;        // The next stepping-bits to be output

Write Preview
Loading…
取消
儲存