Browse Source

Merge pull request #846 from Dim3nsioneer/Marlin_v1

Extended Preheat options
nothinman 11 years ago
parent
commit
51c6bd6b72
2 changed files with 276 additions and 39 deletions
  1. 119
    6
      Marlin/language.h
  2. 157
    33
      Marlin/ultralcd.cpp

+ 119
- 6
Marlin/language.h View File

@@ -77,8 +77,18 @@
77 77
 	#define MSG_AUTO_HOME "Auto home"
78 78
 	#define MSG_SET_ORIGIN "Set origin"
79 79
 	#define MSG_PREHEAT_PLA "Preheat PLA"
80
+	#define MSG_PREHEAT_PLA0 "Preheat PLA 1"
81
+	#define MSG_PREHEAT_PLA1 "Preheat PLA 2"
82
+	#define MSG_PREHEAT_PLA2 "Preheat PLA 3"
83
+	#define MSG_PREHEAT_PLA012 "Preheat PLA All"
84
+	#define MSG_PREHEAT_PLA_BEDONLY "Preheat PLA Bed"
80 85
 	#define MSG_PREHEAT_PLA_SETTINGS "Preheat PLA conf"
81 86
 	#define MSG_PREHEAT_ABS "Preheat ABS"
87
+	#define MSG_PREHEAT_ABS0 "Preheat ABS 1"
88
+	#define MSG_PREHEAT_ABS1 "Preheat ABS 2"
89
+	#define MSG_PREHEAT_ABS2 "Preheat ABS 3"
90
+	#define MSG_PREHEAT_ABS012 "Preheat ABS All"
91
+	#define MSG_PREHEAT_ABS_BEDONLY "Preheat ABS Bed"
82 92
 	#define MSG_PREHEAT_ABS_SETTINGS "Preheat ABS conf"
83 93
 	#define MSG_COOLDOWN "Cooldown"
84 94
 	#define MSG_SWITCH_PS_ON "Switch power on"
@@ -251,7 +261,6 @@
251 261
 
252 262
 #if LANGUAGE_CHOICE == 2
253 263
 
254
-
255 264
 // LCD Menu Messages
256 265
 // Please note these are limited to 17 characters!
257 266
 
@@ -264,8 +273,18 @@
264 273
 	#define MSG_AUTO_HOME "Auto. poz. zerowa"
265 274
 	#define MSG_SET_ORIGIN "Ustaw punkt zero"
266 275
 	#define MSG_PREHEAT_PLA "Rozgrzej PLA"
276
+	#define MSG_PREHEAT_PLA0 "Rozgrzej PLA 1"
277
+	#define MSG_PREHEAT_PLA1 "Rozgrzej PLA 2"
278
+	#define MSG_PREHEAT_PLA2 "Rozgrzej PLA 3"
279
+	#define MSG_PREHEAT_PLA012 "Roz. PLA Wszystko"
280
+	#define MSG_PREHEAT_PLA_BEDONLY "Rozgrzej PLA Loze"
267 281
 	#define MSG_PREHEAT_PLA_SETTINGS "Ustaw. rozg. PLA"
268 282
 	#define MSG_PREHEAT_ABS "Rozgrzej ABS"
283
+	#define MSG_PREHEAT_ABS0 "Rozgrzej ABS 1"
284
+	#define MSG_PREHEAT_ABS1 "Rozgrzej ABS 2"
285
+	#define MSG_PREHEAT_ABS2 "Rozgrzej ABS 3"
286
+	#define MSG_PREHEAT_ABS012 "Roz. ABS Wszystko"
287
+	#define MSG_PREHEAT_ABS_BEDONLY "Rozgrzej ABS Loze"
269 288
 	#define MSG_PREHEAT_ABS_SETTINGS "Ustaw. rozg. ABS"
270 289
 	#define MSG_COOLDOWN "Chlodzenie"
271 290
 	#define MSG_SWITCH_PS_ON "Wlacz zasilacz"
@@ -453,8 +472,18 @@
453 472
 	#define MSG_AUTO_HOME "Home auto."
454 473
 	#define MSG_SET_ORIGIN "Regler origine"
455 474
 	#define MSG_PREHEAT_PLA " Prechauffage PLA"
456
-	#define MSG_PREHEAT_PLA_SETTINGS " Regl. prech. PLA"
475
+	#define MSG_PREHEAT_PLA0 "Prechauff. PLA 1"
476
+        #define MSG_PREHEAT_PLA1 "Prechauff. PLA 2"
477
+	#define MSG_PREHEAT_PLA2 "Prechauff. PLA 3"
478
+	#define MSG_PREHEAT_PLA012 "Prech. PLA Tout"
479
+	#define MSG_PREHEAT_PLA_BEDONLY "Prech. PLA Plateau"
480
+	#define MSG_PREHEAT_PLA_SETTINGS "Regl. prech. PLA"
457 481
 	#define MSG_PREHEAT_ABS "Prechauffage ABS"
482
+	#define MSG_PREHEAT_ABS0 "Prechauff. ABS 1"
483
+	#define MSG_PREHEAT_ABS1 "Prechauff. ABS 2"
484
+	#define MSG_PREHEAT_ABS2 "Prechauff. ABS 3"
485
+	#define MSG_PREHEAT_ABS012 "Prech. ABS Tout"
486
+	#define MSG_PREHEAT_ABS_BEDONLY "Prech. ABS Plateau"
458 487
 	#define MSG_PREHEAT_ABS_SETTINGS "Regl. prech. ABS"
459 488
 	#define MSG_COOLDOWN "Refroidir"
460 489
 	#define MSG_SWITCH_PS_ON "Allumer alim."
@@ -643,8 +672,18 @@
643 672
 	#define MSG_AUTO_HOME        "Auto Nullpunkt"
644 673
 	#define MSG_SET_ORIGIN       "Setze Nullpunkt"
645 674
 	#define MSG_PREHEAT_PLA      "Vorwärmen PLA"
675
+	#define MSG_PREHEAT_PLA0     "Vorwärmen PLA 1"
676
+	#define MSG_PREHEAT_PLA1     "Vorwärmen PLA 2"
677
+	#define MSG_PREHEAT_PLA2     "Vorwärmen PLA 3"
678
+	#define MSG_PREHEAT_PLA012   "Vorw. PLA Alle"
679
+	#define MSG_PREHEAT_PLA_BEDONLY "Vorw. PLA Bett"
646 680
 	#define MSG_PREHEAT_PLA_SETTINGS "Vorwärm. PLA Ein."
647 681
 	#define MSG_PREHEAT_ABS      "Vorwärmen ABS"
682
+	#define MSG_PREHEAT_ABS0     "Vorwärmen ABS 1"
683
+	#define MSG_PREHEAT_ABS1     "Vorwärmen ABS 2"
684
+	#define MSG_PREHEAT_ABS2     "Vorwärmen ABS 3"
685
+	#define MSG_PREHEAT_ABS012   "Vorw. ABS Alle"
686
+	#define MSG_PREHEAT_ABS_BEDONLY "Vorw. ABS Bett"
648 687
 	#define MSG_PREHEAT_ABS_SETTINGS "Vorwärm. ABS Ein."
649 688
 	#define MSG_COOLDOWN         "Abkühlen"
650 689
 	#define MSG_SWITCH_PS_ON     "Switch Power On"
@@ -832,8 +871,18 @@
832 871
 	#define MSG_AUTO_HOME "Llevar al origen"
833 872
 	#define MSG_SET_ORIGIN "Establecer cero"
834 873
 	#define MSG_PREHEAT_PLA "Precalentar PLA"
874
+	#define MSG_PREHEAT_PLA0 "Precalentar PLA 1"
875
+	#define MSG_PREHEAT_PLA1 "Precalentar PLA 2"
876
+	#define MSG_PREHEAT_PLA2 "Precalentar PLA 3"
877
+	#define MSG_PREHEAT_PLA012 "Precal. PLA Todo"
878
+	#define MSG_PREHEAT_PLA_BEDONLY "Precal. PLA Base"
835 879
 	#define MSG_PREHEAT_PLA_SETTINGS "Ajustar temp. PLA"
836 880
 	#define MSG_PREHEAT_ABS "Precalentar ABS"
881
+	#define MSG_PREHEAT_ABS0 "Precalentar ABS 1"
882
+	#define MSG_PREHEAT_ABS1 "Precalentar ABS 2"
883
+	#define MSG_PREHEAT_ABS2 "Precalentar ABS 3"
884
+	#define MSG_PREHEAT_ABS012 "Precal. ABS Todo"
885
+	#define MSG_PREHEAT_ABS_BEDONLY "Precal. ABS Base"
837 886
 	#define MSG_PREHEAT_ABS_SETTINGS "Ajustar temp. ABS"
838 887
 	#define MSG_COOLDOWN "Enfriar"
839 888
 	#define MSG_SWITCH_PS_ON "Switch Power On"
@@ -1017,17 +1066,27 @@
1017 1066
 // LCD Menu Messages
1018 1067
 // Please note these are limited to 17 characters!
1019 1068
 
1020
-	#define WELCOME_MSG MACHINE_NAME			" Готов."
1069
+	#define WELCOME_MSG MACHINE_NAME			        "Готов."
1021 1070
 	#define MSG_SD_INSERTED						"Карта вставлена"
1022 1071
 	#define MSG_SD_REMOVED						"Карта извлечена"
1023
-	#define MSG_MAIN							"Меню            \003"
1072
+	#define MSG_MAIN							"Меню \003"
1024 1073
 	#define MSG_AUTOSTART						"Автостарт"
1025 1074
 	#define MSG_DISABLE_STEPPERS 				"Выкл. двигатели"
1026 1075
 	#define MSG_AUTO_HOME						"Парковка"
1027 1076
 	#define MSG_SET_ORIGIN						"Запомнить ноль"
1028 1077
 	#define MSG_PREHEAT_PLA 					"Преднагрев PLA"
1078
+	#define MSG_PREHEAT_PLA0					"Преднагрев PLA0"
1079
+	#define MSG_PREHEAT_PLA1					"Преднагрев PLA1"
1080
+	#define MSG_PREHEAT_PLA2					"Преднагрев PLA2"
1081
+	#define MSG_PREHEAT_PLA012 					"Преднаг. PLA все"
1082
+	#define MSG_PREHEAT_PLA_BEDONLY 			"Пред. PLA Кровать"
1029 1083
 	#define MSG_PREHEAT_PLA_SETTINGS  			"Настройки PLA"
1030 1084
 	#define MSG_PREHEAT_ABS						"Преднагрев ABS"
1085
+	#define MSG_PREHEAT_ABS0					"Преднагрев ABS0"
1086
+	#define MSG_PREHEAT_ABS1					"Преднагрев ABS1"
1087
+	#define MSG_PREHEAT_ABS2					"Преднагрев ABS2"
1088
+	#define MSG_PREHEAT_ABS012 					"Преднаг. ABS все "
1089
+	#define MSG_PREHEAT_ABS_BEDONLY 			"Пред. ABS Кровать"
1031 1090
 	#define MSG_PREHEAT_ABS_SETTINGS  			"Настройки ABS"
1032 1091
 	#define MSG_COOLDOWN						"Охлаждение"
1033 1092
 	#define MSG_SWITCH_PS_ON					"Switch Power On"
@@ -1091,8 +1150,8 @@
1091 1150
 	#define MSG_WATCH							"Обзор           \003"
1092 1151
 	#define MSG_PREPARE							"Действия        \x7E"
1093 1152
 	#define MSG_TUNE							"Настройки       \x7E"
1094
-	#define MSG_RESUME_PRINT  					"Продолжить печать"
1095
-	#define MSG_RESUME_PRINT					"Продолжить печать"
1153
+	#define MSG_PAUSE_PRINT  					"Продолжить печать"
1154
+	#define MSG_RESUME_PRINT					"возобн. печать"
1096 1155
 	#define MSG_STOP_PRINT 						"Остановить печать"
1097 1156
 	#define MSG_CARD_MENU						"Меню карты      \x7E"
1098 1157
 	#define MSG_NO_CARD							"Нет карты"
@@ -1211,8 +1270,18 @@
1211 1270
 	#define MSG_AUTO_HOME            "Auto Home"
1212 1271
 	#define MSG_SET_ORIGIN           "Imposta Origine"
1213 1272
 	#define MSG_PREHEAT_PLA          "Preriscalda PLA"
1273
+	#define MSG_PREHEAT_PLA0         "Preriscalda PLA 1"
1274
+	#define MSG_PREHEAT_PLA1         "Preriscalda PLA 2"
1275
+	#define MSG_PREHEAT_PLA2         "Preriscalda PLA 3"
1276
+	#define MSG_PREHEAT_PLA012       "Preris. PLA Tutto"
1277
+	#define MSG_PREHEAT_PLA_BEDONLY  "Preri. PLA Piatto"
1214 1278
 	#define MSG_PREHEAT_PLA_SETTINGS "Preris. PLA Conf"
1215 1279
 	#define MSG_PREHEAT_ABS          "Preriscalda ABS"
1280
+	#define MSG_PREHEAT_ABS0         "Preriscalda ABS 1"
1281
+	#define MSG_PREHEAT_ABS1         "Preriscalda ABS 2"
1282
+	#define MSG_PREHEAT_ABS2         "Preriscalda ABS 3"
1283
+	#define MSG_PREHEAT_ABS012       "Preris. ABS Tutto"
1284
+	#define MSG_PREHEAT_ABS_BEDONLY  "Preri. ABS Piatto"
1216 1285
 	#define MSG_PREHEAT_ABS_SETTINGS "Preris. ABS Conf"
1217 1286
 	#define MSG_COOLDOWN             "Raffredda"
1218 1287
 	#define MSG_SWITCH_PS_ON         "Switch Power On"
@@ -1398,8 +1467,18 @@
1398 1467
 	#define MSG_AUTO_HOME "Ir para origen"
1399 1468
 	#define MSG_SET_ORIGIN "Estabelecer orig."
1400 1469
 	#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
1470
+	#define MSG_PREHEAT_PLA0 " pre-aquecer PLA 1"
1471
+	#define MSG_PREHEAT_PLA1 " pre-aquecer PLA 2"
1472
+	#define MSG_PREHEAT_PLA2 " pre-aquecer PLA 3"
1473
+	#define MSG_PREHEAT_PLA012 " pre-aq. PLA Tudo"
1474
+	#define MSG_PREHEAT_PLA_BEDONLY  " pre-aq. PLA \002Base"
1401 1475
 	#define MSG_PREHEAT_PLA_SETTINGS "PLA setting"
1402 1476
 	#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
1477
+	#define MSG_PREHEAT_ABS0 " pre-aquecer ABS 1"
1478
+	#define MSG_PREHEAT_ABS1 " pre-aquecer ABS 2"
1479
+	#define MSG_PREHEAT_ABS2 " pre-aquecer ABS 3"
1480
+	#define MSG_PREHEAT_ABS012 " pre-aq. ABS Tudo"
1481
+	#define MSG_PREHEAT_ABS_BEDONLY  " pre-aq. ABS \002Base"
1403 1482
 	#define MSG_PREHEAT_ABS_SETTINGS "ABS setting"
1404 1483
 	#define MSG_COOLDOWN "Esfriar"
1405 1484
 	#define MSG_SWITCH_PS_ON "Switch Power On"
@@ -1592,8 +1671,18 @@
1592 1671
 	#define MSG_AUTO_HOME "Aja referenssiin"
1593 1672
 	#define MSG_SET_ORIGIN "Aseta origo"
1594 1673
 	#define MSG_PREHEAT_PLA "Esilammita PLA"
1674
+	#define MSG_PREHEAT_PLA0 "Esilammita PLA 1"
1675
+	#define MSG_PREHEAT_PLA1 "Esilammita PLA 2"
1676
+	#define MSG_PREHEAT_PLA2 "Esilammita PLA 3"
1677
+	#define MSG_PREHEAT_PLA012 "Esila. PLA Kaikki"
1678
+	#define MSG_PREHEAT_PLA_BEDONLY  "Esila. PLA Alusta"
1595 1679
 	#define MSG_PREHEAT_PLA_SETTINGS "Esilamm. PLA konf"
1596 1680
 	#define MSG_PREHEAT_ABS "Esilammita ABS"
1681
+	#define MSG_PREHEAT_ABS0 "Esilammita ABS 1"
1682
+	#define MSG_PREHEAT_ABS1 "Esilammita ABS 2"
1683
+	#define MSG_PREHEAT_ABS2 "Esilammita ABS 3"
1684
+	#define MSG_PREHEAT_ABS012 "Esila. ABS Kaikki"
1685
+	#define MSG_PREHEAT_ABS_BEDONLY  "Esila. ABS Alusta"
1597 1686
 	#define MSG_PREHEAT_ABS_SETTINGS "Esilamm. ABS konf"
1598 1687
 	#define MSG_COOLDOWN "Jaahdyta"
1599 1688
 	#define MSG_SWITCH_PS_ON "Virta paalle"
@@ -1779,8 +1868,18 @@
1779 1868
 	#define MSG_AUTO_HOME "Levar a l'orichen"
1780 1869
 	#define MSG_SET_ORIGIN "Establir zero"
1781 1870
 	#define MSG_PREHEAT_PLA "Precalentar PLA"
1871
+	#define MSG_PREHEAT_PLA0 "Precalentar PLA0"
1872
+	#define MSG_PREHEAT_PLA1 "Precalentar PLA1"
1873
+	#define MSG_PREHEAT_PLA2 "Precalentar PLA2"
1874
+	#define MSG_PREHEAT_PLA012 "Precalentar PLA a"
1875
+	#define MSG_PREHEAT_PLA_BEDONLY  "Prec. PLA Base"
1782 1876
 	#define MSG_PREHEAT_PLA_SETTINGS "Achustar tem. PLA"
1783 1877
 	#define MSG_PREHEAT_ABS "Precalentar ABS"
1878
+	#define MSG_PREHEAT_ABS0 "Precalentar ABS0"
1879
+	#define MSG_PREHEAT_ABS1 "Precalentar ABS1"
1880
+	#define MSG_PREHEAT_ABS2 "Precalentar ABS2"
1881
+	#define MSG_PREHEAT_ABS012 "Precalentar ABS a"
1882
+	#define MSG_PREHEAT_ABS_BEDONLY  "Prec. ABS Base"
1784 1883
 	#define MSG_PREHEAT_ABS_SETTINGS "Achustar tem. ABS"
1785 1884
 	#define MSG_COOLDOWN "Enfriar"
1786 1885
 	#define MSG_SWITCH_PS_ON "Enchegar Fuent"
@@ -1972,8 +2071,18 @@
1972 2071
 	#define MSG_AUTO_HOME "Auto home"
1973 2072
 	#define MSG_SET_ORIGIN "Nulpunt instellen"
1974 2073
 	#define MSG_PREHEAT_PLA "PLA voorverwarmen"
2074
+	#define MSG_PREHEAT_PLA0 "PLA voorverw. 0"
2075
+	#define MSG_PREHEAT_PLA1 "PLA voorverw. 1"
2076
+	#define MSG_PREHEAT_PLA2 "PLA voorverw. 2"
2077
+	#define MSG_PREHEAT_PLA012 "PLA voorverw. aan"
2078
+	#define MSG_PREHEAT_PLA_BEDONLY  "PLA voorverw. Bed"
1975 2079
 	#define MSG_PREHEAT_PLA_SETTINGS "PLA verw. conf"
1976 2080
 	#define MSG_PREHEAT_ABS "ABS voorverwarmen"
2081
+	#define MSG_PREHEAT_ABS0 "ABS voorverw. 0"
2082
+	#define MSG_PREHEAT_ABS1 "ABS voorverw. 1"
2083
+	#define MSG_PREHEAT_ABS2 "ABS voorverw. 2"
2084
+	#define MSG_PREHEAT_ABS012 "ABS voorverw. aan"
2085
+	#define MSG_PREHEAT_ABS_BEDONLY  "ABS voorverw. Bed"
1977 2086
 	#define MSG_PREHEAT_ABS_SETTINGS "ABS verw. conf"
1978 2087
 	#define MSG_COOLDOWN "Afkoelen"
1979 2088
 	#define MSG_SWITCH_PS_ON "Stroom aan"
@@ -1995,6 +2104,9 @@
1995 2104
 	#define MSG_BED "Bed"
1996 2105
 	#define MSG_FAN_SPEED "Fan snelheid"
1997 2106
 	#define MSG_FLOW "Flow"
2107
+	#define MSG_FLOW0 "Flow 0"
2108
+	#define MSG_FLOW1 "Flow 1"
2109
+	#define MSG_FLOW2 "Flow 2"
1998 2110
 	#define MSG_CONTROL "Control"
1999 2111
 	#define MSG_MIN " \002 Min"
2000 2112
 	#define MSG_MAX " \002 Max"
@@ -2087,6 +2199,7 @@
2087 2199
 	#define MSG_M105_INVALID_EXTRUDER "M105 Ongeldige extruder "
2088 2200
 	#define MSG_M200_INVALID_EXTRUDER "M200 Ongeldige extruder "
2089 2201
 	#define MSG_M218_INVALID_EXTRUDER "M218 Ongeldige extruder "
2202
+	#define MSG_M221_INVALID_EXTRUDER "M221 Ongeldige extruder "
2090 2203
 	#define MSG_ERR_NO_THERMISTORS "Geen thermistors - geen temperatuur"
2091 2204
 	#define MSG_M109_INVALID_EXTRUDER "M109 Ongeldige extruder "
2092 2205
 	#define MSG_HEATING "Opwarmen..."

+ 157
- 33
Marlin/ultralcd.cpp View File

@@ -304,37 +304,6 @@ static void lcd_autostart_sd()
304 304
 }
305 305
 #endif
306 306
 
307
-void lcd_preheat_pla()
308
-{
309
-    setTargetHotend0(plaPreheatHotendTemp);
310
-    setTargetHotend1(plaPreheatHotendTemp);
311
-    setTargetHotend2(plaPreheatHotendTemp);
312
-    setTargetBed(plaPreheatHPBTemp);
313
-    fanSpeed = plaPreheatFanSpeed;
314
-    lcd_return_to_status();
315
-    setWatch(); // heater sanity check timer
316
-}
317
-
318
-void lcd_preheat_abs()
319
-{
320
-    setTargetHotend0(absPreheatHotendTemp);
321
-    setTargetHotend1(absPreheatHotendTemp);
322
-    setTargetHotend2(absPreheatHotendTemp);
323
-    setTargetBed(absPreheatHPBTemp);
324
-    fanSpeed = absPreheatFanSpeed;
325
-    lcd_return_to_status();
326
-    setWatch(); // heater sanity check timer
327
-}
328
-
329
-static void lcd_cooldown()
330
-{
331
-    setTargetHotend0(0);
332
-    setTargetHotend1(0);
333
-    setTargetHotend2(0);
334
-    setTargetBed(0);
335
-    lcd_return_to_status();
336
-}
337
-
338 307
 #ifdef BABYSTEPPING
339 308
 static void lcd_babystep_x()
340 309
 {
@@ -435,6 +404,154 @@ static void lcd_tune_menu()
435 404
     END_MENU();
436 405
 }
437 406
 
407
+void lcd_preheat_pla0()
408
+{
409
+    setTargetHotend0(plaPreheatHotendTemp);
410
+    setTargetBed(plaPreheatHPBTemp);
411
+    fanSpeed = plaPreheatFanSpeed;
412
+    lcd_return_to_status();
413
+    setWatch(); // heater sanity check timer
414
+}
415
+
416
+void lcd_preheat_abs0()
417
+{
418
+    setTargetHotend0(absPreheatHotendTemp);
419
+    setTargetBed(absPreheatHPBTemp);
420
+    fanSpeed = absPreheatFanSpeed;
421
+    lcd_return_to_status();
422
+    setWatch(); // heater sanity check timer
423
+}
424
+
425
+#if TEMP_SENSOR_1 != 0 //2nd extruder preheat
426
+void lcd_preheat_pla1()
427
+{
428
+    setTargetHotend1(plaPreheatHotendTemp);
429
+    setTargetBed(plaPreheatHPBTemp);
430
+    fanSpeed = plaPreheatFanSpeed;
431
+    lcd_return_to_status();
432
+    setWatch(); // heater sanity check timer
433
+}
434
+
435
+void lcd_preheat_abs1()
436
+{
437
+    setTargetHotend1(absPreheatHotendTemp);
438
+    setTargetBed(absPreheatHPBTemp);
439
+    fanSpeed = absPreheatFanSpeed;
440
+    lcd_return_to_status();
441
+    setWatch(); // heater sanity check timer
442
+}
443
+#endif //2nd extruder preheat
444
+
445
+#if TEMP_SENSOR_2 != 0 //3 extruder preheat
446
+void lcd_preheat_pla2()
447
+{
448
+    setTargetHotend2(plaPreheatHotendTemp);
449
+    setTargetBed(plaPreheatHPBTemp);
450
+    fanSpeed = plaPreheatFanSpeed;
451
+    lcd_return_to_status();
452
+    setWatch(); // heater sanity check timer
453
+}
454
+
455
+void lcd_preheat_abs2()
456
+{
457
+    setTargetHotend2(absPreheatHotendTemp);
458
+    setTargetBed(absPreheatHPBTemp);
459
+    fanSpeed = absPreheatFanSpeed;
460
+    lcd_return_to_status();
461
+    setWatch(); // heater sanity check timer
462
+}
463
+#endif //3 extruder preheat
464
+
465
+#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 //more than one extruder present
466
+void lcd_preheat_pla012()
467
+{
468
+    setTargetHotend0(plaPreheatHotendTemp);
469
+    setTargetHotend1(plaPreheatHotendTemp);
470
+    setTargetHotend2(plaPreheatHotendTemp);
471
+    setTargetBed(plaPreheatHPBTemp);
472
+    fanSpeed = plaPreheatFanSpeed;
473
+    lcd_return_to_status();
474
+    setWatch(); // heater sanity check timer
475
+}
476
+
477
+void lcd_preheat_abs012()
478
+{
479
+    setTargetHotend0(absPreheatHotendTemp);
480
+    setTargetHotend1(absPreheatHotendTemp);
481
+    setTargetHotend2(absPreheatHotendTemp);
482
+    setTargetBed(absPreheatHPBTemp);
483
+    fanSpeed = absPreheatFanSpeed;
484
+    lcd_return_to_status();
485
+    setWatch(); // heater sanity check timer
486
+}
487
+#endif //more than one extruder present
488
+
489
+void lcd_preheat_pla_bedonly()
490
+{
491
+    setTargetBed(plaPreheatHPBTemp);
492
+    fanSpeed = plaPreheatFanSpeed;
493
+    lcd_return_to_status();
494
+    setWatch(); // heater sanity check timer
495
+}
496
+
497
+void lcd_preheat_abs_bedonly()
498
+{
499
+    setTargetBed(absPreheatHPBTemp);
500
+    fanSpeed = absPreheatFanSpeed;
501
+    lcd_return_to_status();
502
+    setWatch(); // heater sanity check timer
503
+}
504
+
505
+static void lcd_preheat_pla_menu()
506
+{
507
+    START_MENU();
508
+    MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
509
+    MENU_ITEM(function, MSG_PREHEAT_PLA0, lcd_preheat_pla0);
510
+#if TEMP_SENSOR_1 != 0 //2 extruder preheat
511
+    MENU_ITEM(function, MSG_PREHEAT_PLA1, lcd_preheat_pla1);
512
+#endif //2 extruder preheat
513
+#if TEMP_SENSOR_2 != 0 //3 extruder preheat
514
+    MENU_ITEM(function, MSG_PREHEAT_PLA2, lcd_preheat_pla2);
515
+#endif //3 extruder preheat
516
+#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 //all extruder preheat
517
+    MENU_ITEM(function, MSG_PREHEAT_PLA012, lcd_preheat_pla012);
518
+#endif //2 extruder preheat
519
+#if TEMP_SENSOR_BED != 0
520
+    MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
521
+#endif
522
+    END_MENU();
523
+}
524
+
525
+static void lcd_preheat_abs_menu()
526
+{
527
+    START_MENU();
528
+    MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
529
+    MENU_ITEM(function, MSG_PREHEAT_ABS0, lcd_preheat_abs0);
530
+#if TEMP_SENSOR_1 != 0 //2 extruder preheat
531
+    MENU_ITEM(function, MSG_PREHEAT_ABS1, lcd_preheat_abs1);
532
+#endif //2 extruder preheat
533
+#if TEMP_SENSOR_2 != 0 //3 extruder preheat
534
+    MENU_ITEM(function, MSG_PREHEAT_ABS2, lcd_preheat_abs2);
535
+#endif //3 extruder preheat
536
+#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 //all extruder preheat
537
+    MENU_ITEM(function, MSG_PREHEAT_ABS012, lcd_preheat_abs012);
538
+#endif //2 extruder preheat
539
+#if TEMP_SENSOR_BED != 0
540
+    MENU_ITEM(function, MSG_PREHEAT_ABS_BEDONLY, lcd_preheat_abs_bedonly);
541
+#endif
542
+    END_MENU();
543
+}
544
+
545
+void lcd_cooldown()
546
+{
547
+    setTargetHotend0(0);
548
+    setTargetHotend1(0);
549
+    setTargetHotend2(0);
550
+    setTargetBed(0);
551
+    fanSpeed = 0;
552
+    lcd_return_to_status();
553
+}
554
+
438 555
 static void lcd_prepare_menu()
439 556
 {
440 557
     START_MENU();
@@ -447,8 +564,15 @@ static void lcd_prepare_menu()
447 564
     MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
448 565
     MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
449 566
     //MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
450
-    MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla);
451
-    MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs);
567
+#if TEMP_SENSOR_0 != 0
568
+  #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_BED != 0
569
+    MENU_ITEM(submenu, MSG_PREHEAT_PLA, lcd_preheat_pla_menu);
570
+    MENU_ITEM(submenu, MSG_PREHEAT_ABS, lcd_preheat_abs_menu);
571
+  #else
572
+    MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
573
+    MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
574
+  #endif
575
+#endif
452 576
     MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
453 577
 #if PS_ON_PIN > -1
454 578
     if (powersupply)

Loading…
Cancel
Save