|
@@ -83,8 +83,8 @@
|
83
|
83
|
#error BUILD_VERSION Information must be specified
|
84
|
84
|
#endif
|
85
|
85
|
|
86
|
|
-#ifndef UUID
|
87
|
|
- #define UUID "00000000-0000-0000-0000-000000000000"
|
|
86
|
+#ifndef MACHINE_UUID
|
|
87
|
+ #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
|
88
|
88
|
#endif
|
89
|
89
|
|
90
|
90
|
|
|
@@ -124,7 +124,7 @@
|
124
|
124
|
#define MSG_INVALID_EXTRUDER "Invalid extruder"
|
125
|
125
|
#define MSG_INVALID_SOLENOID "Invalid solenoid"
|
126
|
126
|
#define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature"
|
127
|
|
-#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" UUID "\n"
|
|
127
|
+#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
|
128
|
128
|
#define MSG_COUNT_X " Count X: "
|
129
|
129
|
#define MSG_COUNT_A " Count A: "
|
130
|
130
|
#define MSG_ERR_KILLED "Printer halted. kill() called!"
|