From eb68bb9b43d7e6ce582c399466ae20c25a28fa46 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 15 Aug 2019 17:46:29 +0200 Subject: [PATCH] Add ASA preheat. --- Firmware/ultralcd.cpp | 11 +++++++++++ Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 6 +++++- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 4 ++++ 9 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d8290a503..33a4257e7 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1697,6 +1697,16 @@ void lcd_preheat_pla() if (wizard_active) lcd_wizard(WizState::Unload); } +void lcd_preheat_asa() +{ + setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); + if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); + fanSpeed = ASA_PREHEAT_FAN_SPEED; + lcd_return_to_status(); + setWatch(); // heater sanity check timer + if (wizard_active) lcd_wizard(WizState::Unload); +} + void lcd_preheat_abs() { setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); @@ -2030,6 +2040,7 @@ static void lcd_preheat_menu() } else { MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); + MENU_ITEM_FUNCTION_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)), lcd_preheat_pet); MENU_ITEM_FUNCTION_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); MENU_ITEM_FUNCTION_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); MENU_ITEM_FUNCTION_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 442e8b944..2539e82c3 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -324,7 +324,11 @@ PREHEAT SETTINGS #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 55 -#define PLA_PREHEAT_FAN_SPEED 0 +#define PLA_PREHEAT_FAN_SPEED 0 + +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 44fee01ec..fbbc332da 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -325,6 +325,10 @@ PREHEAT SETTINGS #define PLA_PREHEAT_HPB_TEMP 55 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index a979503ae..d0d0341ca 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -383,6 +383,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index bb897fd74..c931b7db0 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -384,6 +384,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 8425dfd72..c5df948c2 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -383,6 +383,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 525c2206f..cc2498d63 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -384,6 +384,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index b3828ce53..b2b266171 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -493,6 +493,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 5f1009a50..5736b632f 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -495,6 +495,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0