소스 검색

Fix MSG_En messages for consistency (#13788)

Marcio Teixeira 6 년 전
부모
커밋
ca7f6ff287
2개의 변경된 파일42개의 추가작업 그리고 43개의 파일을 삭제
  1. 0
    1
      Marlin/src/core/language.h
  2. 42
    42
      Marlin/src/lcd/menu/menu_tmc.cpp

+ 0
- 1
Marlin/src/core/language.h 파일 보기

344
 #define MSG_LCD_N3 " 4"
344
 #define MSG_LCD_N3 " 4"
345
 #define MSG_LCD_N4 " 5"
345
 #define MSG_LCD_N4 " 5"
346
 #define MSG_LCD_N5 " 6"
346
 #define MSG_LCD_N5 " 6"
347
-#define MSG_E0 "E0"
348
 #define MSG_E1 "E1"
347
 #define MSG_E1 "E1"
349
 #define MSG_E2 "E2"
348
 #define MSG_E2 "E2"
350
 #define MSG_E3 "E3"
349
 #define MSG_E3 "E3"

+ 42
- 42
Marlin/src/lcd/menu/menu_tmc.cpp 파일 보기

32
 #include "../../module/stepper_indirection.h"
32
 #include "../../module/stepper_indirection.h"
33
 #include "../../feature/tmc_util.h"
33
 #include "../../feature/tmc_util.h"
34
 
34
 
35
-#define TMC_EDIT_STORED_I_RMS(ST) MENU_ITEM_EDIT_CALLBACK(uint16_4, MSG_##ST, &stepper##ST.val_mA, 100, 3000, refresh_stepper_current_##ST)
35
+#define TMC_EDIT_STORED_I_RMS(ST,MSG) MENU_ITEM_EDIT_CALLBACK(uint16_4, MSG, &stepper##ST.val_mA, 100, 3000, refresh_stepper_current_##ST)
36
 
36
 
37
 #if AXIS_IS_TMC(X)
37
 #if AXIS_IS_TMC(X)
38
   void refresh_stepper_current_X()  { stepperX.refresh_stepper_current();  }
38
   void refresh_stepper_current_X()  { stepperX.refresh_stepper_current();  }
78
   START_MENU();
78
   START_MENU();
79
   MENU_BACK(MSG_TMC_DRIVERS);
79
   MENU_BACK(MSG_TMC_DRIVERS);
80
   #if AXIS_IS_TMC(X)
80
   #if AXIS_IS_TMC(X)
81
-    TMC_EDIT_STORED_I_RMS(X);
81
+    TMC_EDIT_STORED_I_RMS(X, MSG_X);
82
   #endif
82
   #endif
83
   #if AXIS_IS_TMC(Y)
83
   #if AXIS_IS_TMC(Y)
84
-    TMC_EDIT_STORED_I_RMS(Y);
84
+    TMC_EDIT_STORED_I_RMS(Y, MSG_Y);
85
   #endif
85
   #endif
86
   #if AXIS_IS_TMC(Z)
86
   #if AXIS_IS_TMC(Z)
87
-    TMC_EDIT_STORED_I_RMS(Z);
87
+    TMC_EDIT_STORED_I_RMS(Z, MSG_Z);
88
   #endif
88
   #endif
89
   #if AXIS_IS_TMC(X2)
89
   #if AXIS_IS_TMC(X2)
90
-    TMC_EDIT_STORED_I_RMS(X2);
90
+    TMC_EDIT_STORED_I_RMS(X2, MSG_X2);
91
   #endif
91
   #endif
92
   #if AXIS_IS_TMC(Y2)
92
   #if AXIS_IS_TMC(Y2)
93
-    TMC_EDIT_STORED_I_RMS(Y2);
93
+    TMC_EDIT_STORED_I_RMS(Y2, MSG_Y2);
94
   #endif
94
   #endif
95
   #if AXIS_IS_TMC(Z2)
95
   #if AXIS_IS_TMC(Z2)
96
-    TMC_EDIT_STORED_I_RMS(Z2);
96
+    TMC_EDIT_STORED_I_RMS(Z2, MSG_Z2);
97
   #endif
97
   #endif
98
   #if AXIS_IS_TMC(Z3)
98
   #if AXIS_IS_TMC(Z3)
99
-    TMC_EDIT_STORED_I_RMS(Z3);
99
+    TMC_EDIT_STORED_I_RMS(Z3, MSG_Z3);
100
   #endif
100
   #endif
101
   #if AXIS_IS_TMC(E0)
101
   #if AXIS_IS_TMC(E0)
102
-    TMC_EDIT_STORED_I_RMS(E0);
102
+    TMC_EDIT_STORED_I_RMS(E0, MSG_E1);
103
   #endif
103
   #endif
104
   #if AXIS_IS_TMC(E1)
104
   #if AXIS_IS_TMC(E1)
105
-    TMC_EDIT_STORED_I_RMS(E1);
105
+    TMC_EDIT_STORED_I_RMS(E1, MSG_E2);
106
   #endif
106
   #endif
107
   #if AXIS_IS_TMC(E2)
107
   #if AXIS_IS_TMC(E2)
108
-    TMC_EDIT_STORED_I_RMS(E2);
108
+    TMC_EDIT_STORED_I_RMS(E2, MSG_E3);
109
   #endif
109
   #endif
110
   #if AXIS_IS_TMC(E3)
110
   #if AXIS_IS_TMC(E3)
111
-    TMC_EDIT_STORED_I_RMS(E3);
111
+    TMC_EDIT_STORED_I_RMS(E3, MSG_E4);
112
   #endif
112
   #endif
113
   #if AXIS_IS_TMC(E4)
113
   #if AXIS_IS_TMC(E4)
114
-    TMC_EDIT_STORED_I_RMS(E4);
114
+    TMC_EDIT_STORED_I_RMS(E4, MSG_E5);
115
   #endif
115
   #endif
116
   #if AXIS_IS_TMC(E5)
116
   #if AXIS_IS_TMC(E5)
117
-    TMC_EDIT_STORED_I_RMS(E5);
117
+    TMC_EDIT_STORED_I_RMS(E5, MSG_E6);
118
   #endif
118
   #endif
119
   END_MENU();
119
   END_MENU();
120
 }
120
 }
121
 
121
 
122
 #if ENABLED(HYBRID_THRESHOLD)
122
 #if ENABLED(HYBRID_THRESHOLD)
123
 
123
 
124
-  #define TMC_EDIT_STORED_HYBRID_THRS(ST) MENU_ITEM_EDIT_CALLBACK(uint8, MSG_##ST, &stepper##ST.stored.hybrid_thrs, 0, 255, refresh_hybrid_thrs_##ST);
124
+  #define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) MENU_ITEM_EDIT_CALLBACK(uint8, MSG, &stepper##ST.stored.hybrid_thrs, 0, 255, refresh_hybrid_thrs_##ST);
125
 
125
 
126
   #if AXIS_HAS_STEALTHCHOP(X)
126
   #if AXIS_HAS_STEALTHCHOP(X)
127
     void refresh_hybrid_thrs_X()  {  stepperX.refresh_hybrid_thrs(planner.settings.axis_steps_per_mm[X_AXIS]); }
127
     void refresh_hybrid_thrs_X()  {  stepperX.refresh_hybrid_thrs(planner.settings.axis_steps_per_mm[X_AXIS]); }
167
     START_MENU();
167
     START_MENU();
168
     MENU_BACK(MSG_TMC_DRIVERS);
168
     MENU_BACK(MSG_TMC_DRIVERS);
169
     #if AXIS_HAS_STEALTHCHOP(X)
169
     #if AXIS_HAS_STEALTHCHOP(X)
170
-      TMC_EDIT_STORED_HYBRID_THRS(X);
170
+      TMC_EDIT_STORED_HYBRID_THRS(X, MSG_X);
171
     #endif
171
     #endif
172
     #if AXIS_HAS_STEALTHCHOP(Y)
172
     #if AXIS_HAS_STEALTHCHOP(Y)
173
-      TMC_EDIT_STORED_HYBRID_THRS(Y);
173
+      TMC_EDIT_STORED_HYBRID_THRS(Y, MSG_Y);
174
     #endif
174
     #endif
175
     #if AXIS_HAS_STEALTHCHOP(Z)
175
     #if AXIS_HAS_STEALTHCHOP(Z)
176
-      TMC_EDIT_STORED_HYBRID_THRS(Z);
176
+      TMC_EDIT_STORED_HYBRID_THRS(Z, MSG_Z);
177
     #endif
177
     #endif
178
     #if AXIS_HAS_STEALTHCHOP(X2)
178
     #if AXIS_HAS_STEALTHCHOP(X2)
179
-      TMC_EDIT_STORED_HYBRID_THRS(X2);
179
+      TMC_EDIT_STORED_HYBRID_THRS(X2, MSG_X2);
180
     #endif
180
     #endif
181
     #if AXIS_HAS_STEALTHCHOP(Y2)
181
     #if AXIS_HAS_STEALTHCHOP(Y2)
182
-      TMC_EDIT_STORED_HYBRID_THRS(Y2);
182
+      TMC_EDIT_STORED_HYBRID_THRS(Y2, MSG_Y2);
183
     #endif
183
     #endif
184
     #if AXIS_HAS_STEALTHCHOP(Z2)
184
     #if AXIS_HAS_STEALTHCHOP(Z2)
185
-      TMC_EDIT_STORED_HYBRID_THRS(Z2);
185
+      TMC_EDIT_STORED_HYBRID_THRS(Z2, MSG_Z2);
186
     #endif
186
     #endif
187
     #if AXIS_HAS_STEALTHCHOP(Z3)
187
     #if AXIS_HAS_STEALTHCHOP(Z3)
188
-      TMC_EDIT_STORED_HYBRID_THRS(Z3);
188
+      TMC_EDIT_STORED_HYBRID_THRS(Z3, MSG_Z3);
189
     #endif
189
     #endif
190
     #if AXIS_HAS_STEALTHCHOP(E0)
190
     #if AXIS_HAS_STEALTHCHOP(E0)
191
-      TMC_EDIT_STORED_HYBRID_THRS(E0);
191
+      TMC_EDIT_STORED_HYBRID_THRS(E0, MSG_E1);
192
     #endif
192
     #endif
193
     #if AXIS_HAS_STEALTHCHOP(E1)
193
     #if AXIS_HAS_STEALTHCHOP(E1)
194
-      TMC_EDIT_STORED_HYBRID_THRS(E1);
194
+      TMC_EDIT_STORED_HYBRID_THRS(E1, MSG_E2);
195
     #endif
195
     #endif
196
     #if AXIS_HAS_STEALTHCHOP(E2)
196
     #if AXIS_HAS_STEALTHCHOP(E2)
197
-      TMC_EDIT_STORED_HYBRID_THRS(E2);
197
+      TMC_EDIT_STORED_HYBRID_THRS(E2, MSG_E3);
198
     #endif
198
     #endif
199
     #if AXIS_HAS_STEALTHCHOP(E3)
199
     #if AXIS_HAS_STEALTHCHOP(E3)
200
-      TMC_EDIT_STORED_HYBRID_THRS(E3);
200
+      TMC_EDIT_STORED_HYBRID_THRS(E3, MSG_E4);
201
     #endif
201
     #endif
202
     #if AXIS_HAS_STEALTHCHOP(E4)
202
     #if AXIS_HAS_STEALTHCHOP(E4)
203
-      TMC_EDIT_STORED_HYBRID_THRS(E4);
203
+      TMC_EDIT_STORED_HYBRID_THRS(E4, MSG_E5);
204
     #endif
204
     #endif
205
     #if AXIS_HAS_STEALTHCHOP(E5)
205
     #if AXIS_HAS_STEALTHCHOP(E5)
206
-      TMC_EDIT_STORED_HYBRID_THRS(E5);
206
+      TMC_EDIT_STORED_HYBRID_THRS(E5, MSG_E6);
207
     #endif
207
     #endif
208
     END_MENU();
208
     END_MENU();
209
   }
209
   }
243
 
243
 
244
 #if HAS_STEALTHCHOP
244
 #if HAS_STEALTHCHOP
245
 
245
 
246
-  #define TMC_EDIT_STEP_MODE(ST) MENU_ITEM_EDIT_CALLBACK(bool, MSG_##ST, &stepper##ST.stored.stealthChop_enabled, refresh_stepping_mode_##ST)
246
+  #define TMC_EDIT_STEP_MODE(ST, MSG) MENU_ITEM_EDIT_CALLBACK(bool, MSG, &stepper##ST.stored.stealthChop_enabled, refresh_stepping_mode_##ST)
247
 
247
 
248
   #if AXIS_HAS_STEALTHCHOP(X)
248
   #if AXIS_HAS_STEALTHCHOP(X)
249
     void refresh_stepping_mode_X()  { stepperX.refresh_stepping_mode();  }
249
     void refresh_stepping_mode_X()  { stepperX.refresh_stepping_mode();  }
290
     STATIC_ITEM(MSG_TMC_STEALTH_ENABLED);
290
     STATIC_ITEM(MSG_TMC_STEALTH_ENABLED);
291
     MENU_BACK(MSG_TMC_DRIVERS);
291
     MENU_BACK(MSG_TMC_DRIVERS);
292
     #if AXIS_HAS_STEALTHCHOP(X)
292
     #if AXIS_HAS_STEALTHCHOP(X)
293
-      TMC_EDIT_STEP_MODE(X);
293
+      TMC_EDIT_STEP_MODE(X, MSG_X);
294
     #endif
294
     #endif
295
     #if AXIS_HAS_STEALTHCHOP(Y)
295
     #if AXIS_HAS_STEALTHCHOP(Y)
296
-      TMC_EDIT_STEP_MODE(Y);
296
+      TMC_EDIT_STEP_MODE(Y, MSG_Y);
297
     #endif
297
     #endif
298
     #if AXIS_HAS_STEALTHCHOP(Z)
298
     #if AXIS_HAS_STEALTHCHOP(Z)
299
-      TMC_EDIT_STEP_MODE(Z);
299
+      TMC_EDIT_STEP_MODE(Z, MSG_Z);
300
     #endif
300
     #endif
301
     #if AXIS_HAS_STEALTHCHOP(X2)
301
     #if AXIS_HAS_STEALTHCHOP(X2)
302
-      TMC_EDIT_STEP_MODE(X2);
302
+      TMC_EDIT_STEP_MODE(X2, MSG_X2);
303
     #endif
303
     #endif
304
     #if AXIS_HAS_STEALTHCHOP(Y2)
304
     #if AXIS_HAS_STEALTHCHOP(Y2)
305
-      TMC_EDIT_STEP_MODE(Y2);
305
+      TMC_EDIT_STEP_MODE(Y2, MSG_Y2);
306
     #endif
306
     #endif
307
     #if AXIS_HAS_STEALTHCHOP(Z2)
307
     #if AXIS_HAS_STEALTHCHOP(Z2)
308
-      TMC_EDIT_STEP_MODE(Z2);
308
+      TMC_EDIT_STEP_MODE(Z2, MSG_Z2);
309
     #endif
309
     #endif
310
     #if AXIS_HAS_STEALTHCHOP(Z3)
310
     #if AXIS_HAS_STEALTHCHOP(Z3)
311
-      TMC_EDIT_STEP_MODE(Z3);
311
+      TMC_EDIT_STEP_MODE(Z3, MSG_Z3);
312
     #endif
312
     #endif
313
     #if AXIS_HAS_STEALTHCHOP(E0)
313
     #if AXIS_HAS_STEALTHCHOP(E0)
314
-      TMC_EDIT_STEP_MODE(E0);
314
+      TMC_EDIT_STEP_MODE(E0, MSG_E1);
315
     #endif
315
     #endif
316
     #if AXIS_HAS_STEALTHCHOP(E1)
316
     #if AXIS_HAS_STEALTHCHOP(E1)
317
-      TMC_EDIT_STEP_MODE(E1);
317
+      TMC_EDIT_STEP_MODE(E1, MSG_E2);
318
     #endif
318
     #endif
319
     #if AXIS_HAS_STEALTHCHOP(E2)
319
     #if AXIS_HAS_STEALTHCHOP(E2)
320
-      TMC_EDIT_STEP_MODE(E2);
320
+      TMC_EDIT_STEP_MODE(E2, MSG_E3);
321
     #endif
321
     #endif
322
     #if AXIS_HAS_STEALTHCHOP(E3)
322
     #if AXIS_HAS_STEALTHCHOP(E3)
323
-      TMC_EDIT_STEP_MODE(E3);
323
+      TMC_EDIT_STEP_MODE(E3, MSG_E4);
324
     #endif
324
     #endif
325
     #if AXIS_HAS_STEALTHCHOP(E4)
325
     #if AXIS_HAS_STEALTHCHOP(E4)
326
-      TMC_EDIT_STEP_MODE(E4);
326
+      TMC_EDIT_STEP_MODE(E4, MSG_E5);
327
     #endif
327
     #endif
328
     #if AXIS_HAS_STEALTHCHOP(E5)
328
     #if AXIS_HAS_STEALTHCHOP(E5)
329
-      TMC_EDIT_STEP_MODE(E5);
329
+      TMC_EDIT_STEP_MODE(E5, MSG_E6);
330
     #endif
330
     #endif
331
     END_MENU();
331
     END_MENU();
332
   }
332
   }

Loading…
취소
저장