Browse Source

Add UUID support to M115 responses.

Kaz Walker 11 years ago
parent
commit
a5e8575829
2 changed files with 18 additions and 11 deletions
  1. 6
    2
      Marlin/Configuration.h
  2. 12
    9
      Marlin/language.h

+ 6
- 2
Marlin/Configuration.h View File

70
 // Define this to set a custom name for your generic Mendel,
70
 // Define this to set a custom name for your generic Mendel,
71
 // #define CUSTOM_MENDEL_NAME "This Mendel"
71
 // #define CUSTOM_MENDEL_NAME "This Mendel"
72
 
72
 
73
+// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
74
+// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
75
+// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
76
+
73
 // This defines the number of extruders
77
 // This defines the number of extruders
74
 #define EXTRUDERS 1
78
 #define EXTRUDERS 1
75
 
79
 
96
 // 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
100
 // 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
97
 // 3 is mendel-parts thermistor (4.7k pullup)
101
 // 3 is mendel-parts thermistor (4.7k pullup)
98
 // 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
102
 // 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
99
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan) (4.7k pullup)
103
+// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
100
 // 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
104
 // 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
101
 // 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
105
 // 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
102
 // 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
106
 // 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
109
 //                          (but gives greater accuracy and more stable PID)
113
 //                          (but gives greater accuracy and more stable PID)
110
 // 51 is 100k thermistor - EPCOS (1k pullup)
114
 // 51 is 100k thermistor - EPCOS (1k pullup)
111
 // 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
115
 // 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
112
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan) (1k pullup)
116
+// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
113
 
117
 
114
 #define TEMP_SENSOR_0 -1
118
 #define TEMP_SENSOR_0 -1
115
 #define TEMP_SENSOR_1 -1
119
 #define TEMP_SENSOR_1 -1

+ 12
- 9
Marlin/language.h View File

38
 	#else
38
 	#else
39
 		#define MACHINE_NAME "Mendel"
39
 		#define MACHINE_NAME "Mendel"
40
 	#endif
40
 	#endif
41
+	#ifndef MACHINE_UUID
42
+		#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
43
+	#endif
41
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
44
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
42
 #endif
45
 #endif
43
 
46
 
163
 	#define MSG_HEATING_COMPLETE "Heating done."
166
 	#define MSG_HEATING_COMPLETE "Heating done."
164
 	#define MSG_BED_HEATING "Bed Heating."
167
 	#define MSG_BED_HEATING "Bed Heating."
165
 	#define MSG_BED_DONE "Bed done."
168
 	#define MSG_BED_DONE "Bed done."
166
-	#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"
169
+	#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"
167
 	#define MSG_COUNT_X " Count X: "
170
 	#define MSG_COUNT_X " Count X: "
168
 	#define MSG_ERR_KILLED "Printer halted. kill() called!"
171
 	#define MSG_ERR_KILLED "Printer halted. kill() called!"
169
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
172
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
328
 	#define MSG_HEATING_COMPLETE "Nagrzewanie ekstrudera zakonczone."
331
 	#define MSG_HEATING_COMPLETE "Nagrzewanie ekstrudera zakonczone."
329
 	#define MSG_BED_HEATING "Nagrzewanie loza..."
332
 	#define MSG_BED_HEATING "Nagrzewanie loza..."
330
 	#define MSG_BED_DONE "Nagrzewanie loza zakonczone."
333
 	#define MSG_BED_DONE "Nagrzewanie loza zakonczone."
331
-	#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"
334
+	#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"
332
 	#define MSG_COUNT_X " Liczenie X: "
335
 	#define MSG_COUNT_X " Liczenie X: "
333
 	#define MSG_ERR_KILLED "Drukarka zatrzymana. Wywolano kill()"
336
 	#define MSG_ERR_KILLED "Drukarka zatrzymana. Wywolano kill()"
334
 	#define MSG_ERR_STOPPED "Drukarka zatrzymana z powodu bledu. Usun problem i zrestartuj drukartke komenda M999. (temperatura zostala zresetowana; ustaw temperature po restarcie)"
337
 	#define MSG_ERR_STOPPED "Drukarka zatrzymana z powodu bledu. Usun problem i zrestartuj drukartke komenda M999. (temperatura zostala zresetowana; ustaw temperature po restarcie)"
492
 	#define MSG_HEATING_COMPLETE "Chauffe terminee."
495
 	#define MSG_HEATING_COMPLETE "Chauffe terminee."
493
 	#define MSG_BED_HEATING "Chauffe du lit."
496
 	#define MSG_BED_HEATING "Chauffe du lit."
494
 	#define MSG_BED_DONE "Chauffe du lit terminee."
497
 	#define MSG_BED_DONE "Chauffe du lit terminee."
495
-	#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"
498
+	#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"
496
 	#define MSG_COUNT_X " Compteur X: "
499
 	#define MSG_COUNT_X " Compteur X: "
497
 	#define MSG_ERR_KILLED "Impression arretee. kill() appelee!"
500
 	#define MSG_ERR_KILLED "Impression arretee. kill() appelee!"
498
 	#define MSG_ERR_STOPPED "Impression arretee a cause d'erreurs. Corriger les erreurs et utiliser M999 pour la reprendre. (Temperature remise a zero. Reactivez la apres redemarrage)"
501
 	#define MSG_ERR_STOPPED "Impression arretee a cause d'erreurs. Corriger les erreurs et utiliser M999 pour la reprendre. (Temperature remise a zero. Reactivez la apres redemarrage)"
659
 	#define MSG_HEATING_COMPLETE "Heating done."
662
 	#define MSG_HEATING_COMPLETE "Heating done."
660
 	#define MSG_BED_HEATING "Bed Heating."
663
 	#define MSG_BED_HEATING "Bed Heating."
661
 	#define MSG_BED_DONE "Bed done."
664
 	#define MSG_BED_DONE "Bed done."
662
-	#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"
665
+	#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"
663
 	#define MSG_COUNT_X " Count X:"
666
 	#define MSG_COUNT_X " Count X:"
664
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
667
 	#define MSG_ERR_KILLED "Printer halted. kill() called !!"
665
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!"
668
 	#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!"
830
 	#define MSG_HEATING_COMPLETE "Calentamiento Hecho."
833
 	#define MSG_HEATING_COMPLETE "Calentamiento Hecho."
831
 	#define MSG_BED_HEATING "Calentando la base."
834
 	#define MSG_BED_HEATING "Calentando la base."
832
 	#define MSG_BED_DONE "Base Caliente."
835
 	#define MSG_BED_DONE "Base Caliente."
833
-	#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"
836
+	#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"
834
 	#define MSG_COUNT_X " Cuenta X:"
837
 	#define MSG_COUNT_X " Cuenta X:"
835
 	#define MSG_ERR_KILLED "¡¡Impresora Parada con kill()!!"
838
 	#define MSG_ERR_KILLED "¡¡Impresora Parada con kill()!!"
836
 	#define MSG_ERR_STOPPED "¡Impresora parada por errores. Arregle el error y use M999 Para reiniciar!. (La temperatura se reestablece. Ajustela antes de continuar)"
839
 	#define MSG_ERR_STOPPED "¡Impresora parada por errores. Arregle el error y use M999 Para reiniciar!. (La temperatura se reestablece. Ajustela antes de continuar)"
991
 	#define MSG_HEATING_COMPLETE				"Наргето.    "
994
 	#define MSG_HEATING_COMPLETE				"Наргето.    "
992
 	#define MSG_BED_HEATING						"Нагрев стола...     "
995
 	#define MSG_BED_HEATING						"Нагрев стола...     "
993
 	#define MSG_BED_DONE						"Стол нагрет.        "
996
 	#define MSG_BED_DONE						"Стол нагрет.        "
994
-	#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"
997
+	#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"
995
 	#define MSG_COUNT_X							" Count X:"
998
 	#define MSG_COUNT_X							" Count X:"
996
 	#define MSG_ERR_KILLED						"Принтер остановлен. вызов kill() !!"
999
 	#define MSG_ERR_KILLED						"Принтер остановлен. вызов kill() !!"
997
 	#define MSG_ERR_STOPPED						"Ошибка принтера, останов. Устраните неисправность и используйте M999 для перезагрузки!. (Температура недоступна. Проверьте датчики)"
1000
 	#define MSG_ERR_STOPPED						"Ошибка принтера, останов. Устраните неисправность и используйте M999 для перезагрузки!. (Температура недоступна. Проверьте датчики)"
1152
 	#define MSG_HEATING_COMPLETE     "Stampante Calda."
1155
 	#define MSG_HEATING_COMPLETE     "Stampante Calda."
1153
 	#define MSG_BED_HEATING          "Riscaldamento Piatto."
1156
 	#define MSG_BED_HEATING          "Riscaldamento Piatto."
1154
 	#define MSG_BED_DONE             "Piatto Pronto."
1157
 	#define MSG_BED_DONE             "Piatto Pronto."
1155
-	#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"
1158
+	#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"
1156
 	#define MSG_COUNT_X              " Calcola X: "
1159
 	#define MSG_COUNT_X              " Calcola X: "
1157
 	#define MSG_ERR_KILLED           "Stampante Calda. kill() chiamata !!"
1160
 	#define MSG_ERR_KILLED           "Stampante Calda. kill() chiamata !!"
1158
 	#define MSG_ERR_STOPPED          "Stampante fermata a causa di errori. Risolvi l'errore e usa M999 per ripartire!. (Reset temperatura. Impostala prima di ripartire)"
1161
 	#define MSG_ERR_STOPPED          "Stampante fermata a causa di errori. Risolvi l'errore e usa M999 per ripartire!. (Reset temperatura. Impostala prima di ripartire)"
1322
 	#define MSG_HEATING_COMPLETE "Aquecido."
1325
 	#define MSG_HEATING_COMPLETE "Aquecido."
1323
 	#define MSG_BED_HEATING "Aquecendo a Base."
1326
 	#define MSG_BED_HEATING "Aquecendo a Base."
1324
 	#define MSG_BED_DONE "Base quente."
1327
 	#define MSG_BED_DONE "Base quente."
1325
-	#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"
1328
+	#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"
1326
 	#define MSG_COUNT_X " Conta X:"
1329
 	#define MSG_COUNT_X " Conta X:"
1327
 	#define MSG_ERR_KILLED "Impressora parada com kill() !!"
1330
 	#define MSG_ERR_KILLED "Impressora parada com kill() !!"
1328
 	#define MSG_ERR_STOPPED "Impressora parada por erros. Coserte o erro e use M999 para recomeçar!. (Temperatura reiniciada. Ajuste antes de recomeçar)"
1331
 	#define MSG_ERR_STOPPED "Impressora parada por erros. Coserte o erro e use M999 para recomeçar!. (Temperatura reiniciada. Ajuste antes de recomeçar)"
1488
 	#define MSG_HEATING_COMPLETE "Lammitys valmis."
1491
 	#define MSG_HEATING_COMPLETE "Lammitys valmis."
1489
 	#define MSG_BED_HEATING "Alusta lampiaa."
1492
 	#define MSG_BED_HEATING "Alusta lampiaa."
1490
 	#define MSG_BED_DONE "Alusta valmis."
1493
 	#define MSG_BED_DONE "Alusta valmis."
1491
-	#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"
1494
+	#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"
1492
 	#define MSG_COUNT_X " Laskuri X: "
1495
 	#define MSG_COUNT_X " Laskuri X: "
1493
 	#define MSG_ERR_KILLED "Tulostin pysaytetty. kill():ia kutsuttu!"
1496
 	#define MSG_ERR_KILLED "Tulostin pysaytetty. kill():ia kutsuttu!"
1494
 	#define MSG_ERR_STOPPED "Tulostin pysaytetty virheiden vuoksi. Korjaa virheet ja kayta M999 kaynnistaaksesi uudelleen. (Lampotila nollattiin. Aseta lampotila sen jalkeen kun jatkat.)"
1497
 	#define MSG_ERR_STOPPED "Tulostin pysaytetty virheiden vuoksi. Korjaa virheet ja kayta M999 kaynnistaaksesi uudelleen. (Lampotila nollattiin. Aseta lampotila sen jalkeen kun jatkat.)"

Loading…
Cancel
Save