thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Cleanup of language.h

Scott Lahteine 9 years ago
parent
2db384a21d
commit
2c892fca6a
2 changed files with 17 additions and 16 deletions
Split View Show Diff Stats
  1. 9
    8
      Marlin/configurator/config/language.h
  2. 8
    8
      Marlin/language.h

+ 9
- 8
Marlin/configurator/config/language.h View File 

@@ -30,6 +30,7 @@
30 30 
 // eu       Basque-Euskera
31 31 
 // kana     Japanese
32 32 
 // kana_utf Japanese
33 
+// cn       Chinese
33 34
34 35 
 #ifndef LANGUAGE_INCLUDE
35 36 
   // pick your language from the list above
 
@@ -130,13 +131,15 @@
130 131 
 #define MSG_FILE_PRINTED                    "Done printing file"
131 132 
 #define MSG_BEGIN_FILE_LIST                 "Begin file list"
132 133 
 #define MSG_END_FILE_LIST                   "End file list"
133 
-#define MSG_M104_INVALID_EXTRUDER           "M104 Invalid extruder "
134 
-#define MSG_M105_INVALID_EXTRUDER           "M105 Invalid extruder "
135 
-#define MSG_M200_INVALID_EXTRUDER           "M200 Invalid extruder "
136 
-#define MSG_M218_INVALID_EXTRUDER           "M218 Invalid extruder "
137 
-#define MSG_M221_INVALID_EXTRUDER           "M221 Invalid extruder "
134 
+#define MSG_INVALID_EXTRUDER                "Invalid extruder"
135 
+#define MSG_INVALID_SOLENOID                "Invalid solenoid"
136 
+#define MSG_M104_INVALID_EXTRUDER           "M104 " MSG_INVALID_EXTRUDER " "
137 
+#define MSG_M105_INVALID_EXTRUDER           "M105 " MSG_INVALID_EXTRUDER " "
138 
+#define MSG_M109_INVALID_EXTRUDER           "M109 " MSG_INVALID_EXTRUDER " "
139 
+#define MSG_M200_INVALID_EXTRUDER           "M200 " MSG_INVALID_EXTRUDER " "
140 
+#define MSG_M218_INVALID_EXTRUDER           "M218 " MSG_INVALID_EXTRUDER " "
141 
+#define MSG_M221_INVALID_EXTRUDER           "M221 " MSG_INVALID_EXTRUDER " "
138 142 
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
139 
-#define MSG_M109_INVALID_EXTRUDER           "M109 Invalid extruder "
140 143 
 #define MSG_HEATING                         "Heating..."
141 144 
 #define MSG_HEATING_COMPLETE                "Heating done."
142 145 
 #define MSG_BED_HEATING                     "Bed Heating."
 
@@ -148,8 +151,6 @@
148 151 
 #define MSG_RESEND                          "Resend: "
149 152 
 #define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
150 153 
 #define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "
151 
-#define MSG_INVALID_EXTRUDER                "Invalid extruder"
152 
-#define MSG_INVALID_SOLENOID                "Invalid solenoid"
153 154 
 #define MSG_X_MIN                           "x_min: "
154 155 
 #define MSG_X_MAX                           "x_max: "
155 156 
 #define MSG_Y_MIN                           "y_min: "

+ 8
- 8
Marlin/language.h View File 

@@ -131,13 +131,15 @@
131 131 
 #define MSG_FILE_PRINTED                    "Done printing file"
132 132 
 #define MSG_BEGIN_FILE_LIST                 "Begin file list"
133 133 
 #define MSG_END_FILE_LIST                   "End file list"
134 
-#define MSG_M104_INVALID_EXTRUDER           "M104 Invalid extruder "
135 
-#define MSG_M105_INVALID_EXTRUDER           "M105 Invalid extruder "
136 
-#define MSG_M200_INVALID_EXTRUDER           "M200 Invalid extruder "
137 
-#define MSG_M218_INVALID_EXTRUDER           "M218 Invalid extruder "
138 
-#define MSG_M221_INVALID_EXTRUDER           "M221 Invalid extruder "
134 
+#define MSG_INVALID_EXTRUDER                "Invalid extruder"
135 
+#define MSG_INVALID_SOLENOID                "Invalid solenoid"
136 
+#define MSG_M104_INVALID_EXTRUDER           "M104 " MSG_INVALID_EXTRUDER " "
137 
+#define MSG_M105_INVALID_EXTRUDER           "M105 " MSG_INVALID_EXTRUDER " "
138 
+#define MSG_M109_INVALID_EXTRUDER           "M109 " MSG_INVALID_EXTRUDER " "
139 
+#define MSG_M200_INVALID_EXTRUDER           "M200 " MSG_INVALID_EXTRUDER " "
140 
+#define MSG_M218_INVALID_EXTRUDER           "M218 " MSG_INVALID_EXTRUDER " "
141 
+#define MSG_M221_INVALID_EXTRUDER           "M221 " MSG_INVALID_EXTRUDER " "
139 142 
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
140 
-#define MSG_M109_INVALID_EXTRUDER           "M109 Invalid extruder "
141 143 
 #define MSG_HEATING                         "Heating..."
142 144 
 #define MSG_HEATING_COMPLETE                "Heating done."
143 145 
 #define MSG_BED_HEATING                     "Bed Heating."
 
@@ -149,8 +151,6 @@
149 151 
 #define MSG_RESEND                          "Resend: "
150 152 
 #define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
151 153 
 #define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "
152 
-#define MSG_INVALID_EXTRUDER                "Invalid extruder"
153 
-#define MSG_INVALID_SOLENOID                "Invalid solenoid"
154 154 
 #define MSG_X_MIN                           "x_min: "
155 155 
 #define MSG_X_MAX                           "x_max: "
156 156 
 #define MSG_Y_MIN                           "y_min: "

Write Preview
Loading…
Cancel
Save