瀏覽代碼

Merge pull request #474 from xifle/Marlin_v1

Fixed "Cooldown" Selection not reseting bed temp
ErikZalm 12 年之前
父節點
當前提交
c9cf2174dd
共有 1 個文件被更改,包括 12 次插入1 次删除
  1. 12
    1
      Marlin/ultralcd.cpp

+ 12
- 1
Marlin/ultralcd.cpp 查看文件

252
     setTargetBed(plaPreheatHPBTemp);
252
     setTargetBed(plaPreheatHPBTemp);
253
     fanSpeed = plaPreheatFanSpeed;
253
     fanSpeed = plaPreheatFanSpeed;
254
     lcd_return_to_status();
254
     lcd_return_to_status();
255
+	setWatch();	// heater sanity check timer
255
 }
256
 }
256
 
257
 
257
 void lcd_preheat_abs()
258
 void lcd_preheat_abs()
262
     setTargetBed(absPreheatHPBTemp);
263
     setTargetBed(absPreheatHPBTemp);
263
     fanSpeed = absPreheatFanSpeed;
264
     fanSpeed = absPreheatFanSpeed;
264
     lcd_return_to_status();
265
     lcd_return_to_status();
266
+	setWatch();	// heater sanity check timer
267
+}
268
+
269
+static void lcd_cooldown()
270
+{
271
+	setTargetHotend0(0);
272
+	setTargetHotend1(0);
273
+	setTargetHotend2(0);
274
+	setTargetBed(0);
275
+	lcd_return_to_status();
265
 }
276
 }
266
 
277
 
267
 static void lcd_tune_menu()
278
 static void lcd_tune_menu()
299
     //MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
310
     //MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
300
     MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla);
311
     MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla);
301
     MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs);
312
     MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs);
302
-    MENU_ITEM(gcode, MSG_COOLDOWN, PSTR("M104 S0\nM140 S0"));
313
+    MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
303
     MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu);
314
     MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu);
304
     END_MENU();
315
     END_MENU();
305
 }
316
 }

Loading…
取消
儲存