浏览代码

Add strigification for extruder amount in M115 report.

Daid 13 年前
父节点
当前提交
b59724e42b
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5
    2
      Marlin/language.h

+ 5
- 2
Marlin/language.h 查看文件

20
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
20
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
21
 #endif
21
 #endif
22
 
22
 
23
+#define STRINGIFY_(n) #n
24
+#define STRINGIFY(n) STRINGIFY_(n)
25
+
23
 #if LANGUAGE_CHOICE == 1
26
 #if LANGUAGE_CHOICE == 1
24
 
27
 
25
 // LCD Menu Messages
28
 // LCD Menu Messages
126
 	#define MSG_HEATING_COMPLETE "Heating done."
129
 	#define MSG_HEATING_COMPLETE "Heating done."
127
 	#define MSG_BED_HEATING "Bed Heating."
130
 	#define MSG_BED_HEATING "Bed Heating."
128
 	#define MSG_BED_DONE "Bed done."
131
 	#define MSG_BED_DONE "Bed done."
129
-	#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"
132
+	#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:" STRINGIFY(EXTRUDERS) "\n"
130
 	#define MSG_COUNT_X " Count X:"
133
 	#define MSG_COUNT_X " Count X:"
131
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
134
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
132
 	#define MSG_ERR_STOPPED "Printer stopped deu to errors. Fix the error and use M999 to restart!. (Temperature is reset. Set it before restarting)"
135
 	#define MSG_ERR_STOPPED "Printer stopped deu to errors. Fix the error and use M999 to restart!. (Temperature is reset. Set it before restarting)"
273
 	#define MSG_HEATING_COMPLETE "Heating done."
276
 	#define MSG_HEATING_COMPLETE "Heating done."
274
 	#define MSG_BED_HEATING "Bed Heating."
277
 	#define MSG_BED_HEATING "Bed Heating."
275
 	#define MSG_BED_DONE "Bed done."
278
 	#define MSG_BED_DONE "Bed done."
276
-	#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"
279
+	#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:" STRINGIFY(EXTRUDERS) "\n"
277
 	#define MSG_COUNT_X " Count X:"
280
 	#define MSG_COUNT_X " Count X:"
278
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
281
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
279
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!"
282
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!"

正在加载...
取消
保存