Bläddra i källkod

Add strigification for extruder amount in M115 report.

Daid 13 år sedan
förälder
incheckning
b59724e42b
1 ändrade filer med 5 tillägg och 2 borttagningar
  1. 5
    2
      Marlin/language.h

+ 5
- 2
Marlin/language.h Visa fil

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

Laddar…
Avbryt
Spara