|
@@ -41,7 +41,6 @@
|
41
|
41
|
#endif
|
42
|
42
|
|
43
|
43
|
#define PROTOCOL_VERSION "1.0"
|
44
|
|
-#define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
|
45
|
44
|
|
46
|
45
|
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
|
47
|
46
|
#undef FIRMWARE_URL
|
|
@@ -69,13 +68,28 @@
|
69
|
68
|
#define MACHINE_NAME "HEPHESTOS"
|
70
|
69
|
#undef FIRMWARE_URL
|
71
|
70
|
#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
|
72
|
|
-#else // Default firmware set to Mendel
|
73
|
|
- #define MACHINE_NAME "Mendel"
|
|
71
|
+#else
|
|
72
|
+ #ifndef MACHINE_NAME
|
|
73
|
+ #define MACHINE_NAME "Mendel"
|
|
74
|
+ #endif
|
74
|
75
|
#endif
|
75
|
76
|
|
76
|
77
|
#ifdef CUSTOM_MENDEL_NAME
|
|
78
|
+ #warning CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
|
|
79
|
+ #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
|
|
80
|
+#endif
|
|
81
|
+
|
|
82
|
+#ifdef CUSTOM_MACHINE_NAME
|
77
|
83
|
#undef MACHINE_NAME
|
78
|
|
- #define MACHINE_NAME CUSTOM_MENDEL_NAME
|
|
84
|
+ #define MACHINE_NAME CUSTOM_MACHINE_NAME
|
|
85
|
+#endif
|
|
86
|
+
|
|
87
|
+#ifndef FIRMWARE_URL
|
|
88
|
+ #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
|
|
89
|
+#endif
|
|
90
|
+
|
|
91
|
+#ifndef BUILD_VERSION
|
|
92
|
+ #define BUILD_VERSION "V1; Sprinter/grbl mashup for gen6"
|
79
|
93
|
#endif
|
80
|
94
|
|
81
|
95
|
#ifndef MACHINE_UUID
|
|
@@ -126,7 +140,7 @@
|
126
|
140
|
#define MSG_HEATING_COMPLETE "Heating done."
|
127
|
141
|
#define MSG_BED_HEATING "Bed Heating."
|
128
|
142
|
#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:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
|
|
143
|
+#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
|
130
|
144
|
#define MSG_COUNT_X " Count X: "
|
131
|
145
|
#define MSG_ERR_KILLED "Printer halted. kill() called!"
|
132
|
146
|
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
|