Browse Source

Allow M115 to better reflect the build

Richard Wackerbarth 10 years ago
parent
commit
f4599143eb
1 changed files with 19 additions and 5 deletions
  1. 19
    5
      Marlin/language.h

+ 19
- 5
Marlin/language.h View File

41
 #endif
41
 #endif
42
 
42
 
43
 #define PROTOCOL_VERSION "1.0"
43
 #define PROTOCOL_VERSION "1.0"
44
-#define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
45
 
44
 
46
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
45
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
47
   #undef FIRMWARE_URL
46
   #undef FIRMWARE_URL
69
   #define MACHINE_NAME "HEPHESTOS"
68
   #define MACHINE_NAME "HEPHESTOS"
70
   #undef FIRMWARE_URL
69
   #undef FIRMWARE_URL
71
   #define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
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
 #endif
75
 #endif
75
 
76
 
76
 #ifdef CUSTOM_MENDEL_NAME
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
   #undef MACHINE_NAME
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
 #endif
93
 #endif
80
 
94
 
81
 #ifndef MACHINE_UUID
95
 #ifndef MACHINE_UUID
126
 #define MSG_HEATING_COMPLETE                "Heating done."
140
 #define MSG_HEATING_COMPLETE                "Heating done."
127
 #define MSG_BED_HEATING                     "Bed Heating."
141
 #define MSG_BED_HEATING                     "Bed Heating."
128
 #define MSG_BED_DONE                        "Bed done."
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
 #define MSG_COUNT_X                         " Count X: "
144
 #define MSG_COUNT_X                         " Count X: "
131
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
145
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
132
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
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)"

Loading…
Cancel
Save