浏览代码

Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel"

Erik de Bruijn 13 年前
父节点
当前提交
5aa80e6c05
共有 1 个文件被更改,包括 18 次插入9 次删除
  1. 18
    9
      Marlin/language.h

+ 18
- 9
Marlin/language.h 查看文件

10
 
10
 
11
 #define LANGUAGE_CHOICE 1  // Pick your language from the list above
11
 #define LANGUAGE_CHOICE 1  // Pick your language from the list above
12
 
12
 
13
+#define PROTOCOL_VERSION "1.0"
14
+
15
+#ifdef MOTHERBOARD == 7
16
+	#define MACHINE_NAME "Ultimaker"
17
+	#define FIRMWARE_URL "http://firmware.ultimaker.com"
18
+#else
19
+	#define MACHINE_NAME "Mendel"
20
+	#define FIRMWARE_URL "http://www.mendel-parts.com"
21
+#endif
22
+
13
 #if LANGUAGE_CHOICE == 1
23
 #if LANGUAGE_CHOICE == 1
14
 
24
 
15
 // LCD Menu Messages
25
 // LCD Menu Messages
16
-
17
-	#define WELCOME_MSG "Printer Ready."
26
+	#define WELCOME_MSG MACHINE_NAME " Ready."
18
 	#define MSG_SD_INSERTED "Card inserted"
27
 	#define MSG_SD_INSERTED "Card inserted"
19
 	#define MSG_SD_REMOVED "Card removed"
28
 	#define MSG_SD_REMOVED "Card removed"
20
 	#define MSG_MAIN " Main \003"
29
 	#define MSG_MAIN " Main \003"
63
 	#define MSG_MAIN_WIDE " Main        \003"
72
 	#define MSG_MAIN_WIDE " Main        \003"
64
 	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
73
 	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
65
 	#define MSG_MOTION_WIDE " Motion      \x7E"
74
 	#define MSG_MOTION_WIDE " Motion      \x7E"
66
-	#define MSG_STORE_EPROM " Store EPROM"
67
-	#define MSG_LOAD_EPROM " Load EPROM"
75
+	#define MSG_STORE_EPROM " Store memory"
76
+	#define MSG_LOAD_EPROM " Load memory"
68
 	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
77
 	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
69
 	#define MSG_REFRESH "\004Refresh"
78
 	#define MSG_REFRESH "\004Refresh"
70
 	#define MSG_WATCH " Watch   \003"
79
 	#define MSG_WATCH " Watch   \003"
76
 	#define MSG_CARD_MENU " Card Menu    \x7E"
85
 	#define MSG_CARD_MENU " Card Menu    \x7E"
77
 	#define MSG_NO_CARD " No Card"
86
 	#define MSG_NO_CARD " No Card"
78
 	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
87
 	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
79
-	#define MSG_DWELL "DWELL..."		
88
+	#define MSG_DWELL "Sleep..."
80
 	#define MSG_NO_MOVE "No move."
89
 	#define MSG_NO_MOVE "No move."
81
 	#define MSG_PART_RELEASE "Partial Release"
90
 	#define MSG_PART_RELEASE "Partial Release"
82
 	#define MSG_KILLED "KILLED. "
91
 	#define MSG_KILLED "KILLED. "
94
 	#define MSG_BROWNOUT_RESET " Brown out Reset"
103
 	#define MSG_BROWNOUT_RESET " Brown out Reset"
95
 	#define MSG_WATCHDOG_RESET " Watchdog Reset"
104
 	#define MSG_WATCHDOG_RESET " Watchdog Reset"
96
 	#define MSG_SOFTWARE_RESET " Software Reset"
105
 	#define MSG_SOFTWARE_RESET " Software Reset"
97
-	#define MSG_MARLIN "Marlin: "
106
+	#define MSG_MARLIN "Marlin "
98
 	#define MSG_AUTHOR " | Author: "
107
 	#define MSG_AUTHOR " | Author: "
99
 	#define MSG_CONFIGURATION_VER " Last Updated: "
108
 	#define MSG_CONFIGURATION_VER " Last Updated: "
100
 	#define MSG_FREE_MEMORY " Free Memory: "
109
 	#define MSG_FREE_MEMORY " Free Memory: "
116
 	#define MSG_HEATING_COMPLETE "Heating done."
125
 	#define MSG_HEATING_COMPLETE "Heating done."
117
 	#define MSG_BED_HEATING "Bed Heating."
126
 	#define MSG_BED_HEATING "Bed Heating."
118
 	#define MSG_BED_DONE "Bed done."
127
 	#define MSG_BED_DONE "Bed done."
119
-	#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1\n"
128
+	#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:1\n"
120
 	#define MSG_COUNT_X " Count X:"
129
 	#define MSG_COUNT_X " Count X:"
121
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
130
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
122
 	#define MSG_ERR_STOPPED "Printer stopped deu to errors. Fix the error and use M999 to restart!. (Temperature is reset. Set it before restarting)"
131
 	#define MSG_ERR_STOPPED "Printer stopped deu to errors. Fix the error and use M999 to restart!. (Temperature is reset. Set it before restarting)"
157
 
166
 
158
 // LCD Menu Messages
167
 // LCD Menu Messages
159
 
168
 
160
-	#define WELCOME_MSG "UltiMARLIN Ready."
169
+	#define WELCOME_MSG MACHINE_NAME " Ready."
161
 
170
 
162
 	#define MSG_SD_INSERTED "Card inserted"
171
 	#define MSG_SD_INSERTED "Card inserted"
163
 	#define MSG_SD_REMOVED "Card removed"
172
 	#define MSG_SD_REMOVED "Card removed"
263
 	#define MSG_HEATING_COMPLETE "Heating done."
272
 	#define MSG_HEATING_COMPLETE "Heating done."
264
 	#define MSG_BED_HEATING "Bed Heating."
273
 	#define MSG_BED_HEATING "Bed Heating."
265
 	#define MSG_BED_DONE "Bed done."
274
 	#define MSG_BED_DONE "Bed done."
266
-	#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1\n"
275
+	#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:\n"
267
 	#define MSG_COUNT_X " Count X:"
276
 	#define MSG_COUNT_X " Count X:"
268
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
277
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
269
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!"
278
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!"

正在加载...
取消
保存