From b9f9f8f7d39cedfe30e64ed9d15af154e2e83bf6 Mon Sep 17 00:00:00 2001 From: Blair Thompson Date: Mon, 20 Aug 2012 21:49:37 +0100 Subject: [PATCH 1/2] The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed. --- Marlin/ultralcd.pde | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde index 9be357c..98d9f4b 100644 --- a/Marlin/ultralcd.pde +++ b/Marlin/ultralcd.pde @@ -530,14 +530,16 @@ void MainMenu::showPrepare() case ItemP_preheat_pla: MENUITEM( lcdprintPGM(MSG_PREHEAT_PLA) , BLOCK;setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP);setTargetBed(PLA_PREHEAT_HPB_TEMP); #if FAN_PIN > -1 - analogWrite(FAN_PIN, PLA_PREHEAT_FAN_SPEED); + FanSpeed=PLA_PREHEAT_FAN_SPEED; + analogWrite(FAN_PIN, FanSpeed); #endif beepshort(); ); break; case ItemP_preheat_abs: MENUITEM( lcdprintPGM(MSG_PREHEAT_ABS) , BLOCK;setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP);setTargetBed(ABS_PREHEAT_HPB_TEMP); #if FAN_PIN > -1 - analogWrite(FAN_PIN, ABS_PREHEAT_FAN_SPEED); + FanSpeed=ABS_PREHEAT_FAN_SPEED; + analogWrite(FAN_PIN, FanSpeed); #endif beepshort(); ); break; From 6c050b8440f6493f449df851cd7f3fbf467c513b Mon Sep 17 00:00:00 2001 From: Blair Thompson Date: Mon, 20 Aug 2012 21:54:47 +0100 Subject: [PATCH 2/2] Fixes error introduced at commit aee475aa55f3a53428ed6b60bb8d6662046cd16c which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde --- Marlin/language.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Marlin/language.h b/Marlin/language.h index 12461a6..99c6751 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -37,6 +37,7 @@ #define MSG_SET_ORIGIN " Set Origin" #define MSG_COOLDOWN " Cooldown" #define MSG_EXTRUDE " Extrude" + #define MSG_RETRACT " Extract" #define MSG_PREHEAT_PLA " Preheat PLA" #define MSG_PREHEAT_ABS " Preheat ABS" #define MSG_MOVE_AXIS " Move Axis \x7E" @@ -87,6 +88,8 @@ #define MSG_CONTROL_ARROW " Control \x7E" #define MSG_RETRACT_ARROW " Control \x7E" #define MSG_TUNE " Tune \x7E" + #define MSG_PAUSE_PRINT " Pause Print \x7E" + #define MSG_RESUME_PRINT " Resume Print \x7E" #define MSG_STOP_PRINT " Stop Print \x7E" #define MSG_CARD_MENU " Card Menu \x7E" #define MSG_NO_CARD " No Card"