diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9862f82fa4..0b2e8bde44 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2091,6 +2091,12 @@ static void mFilamentItem_PVB() mFilamentItem(PVB_PREHEAT_HOTEND_TEMP, PVB_PREHEAT_HPB_TEMP); } +static void mFilamentItem_PHA() +{ + bFilamentPreheatState = false; + mFilamentItem(PHA_PREHEAT_HOTEND_TEMP, PHA_PREHEAT_HPB_TEMP); +} + void mFilamentBack() { if (eFilamentAction == FilamentAction::AutoLoad || @@ -2127,6 +2133,7 @@ void lcd_generic_preheat_menu() MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + MENU_ITEM_SUBMENU_P(PSTR("PHA - " STRINGIFY(PHA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PHA_PREHEAT_HPB_TEMP)),mFilamentItem_PHA); } if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && eFilamentAction == FilamentAction::Preheat) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); MENU_END(); diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 4a777f75c0..b0bbc5c1f2 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -410,6 +410,9 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 83199ffcb2..8813f49bc4 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -411,6 +411,9 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 377dfe6500..f3da1cdc59 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -410,6 +410,9 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 0bebe79274..40552d4640 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -411,6 +411,9 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index f31999afdc..767d74a145 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -540,6 +540,9 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 65e6c47f10..2497288b84 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -544,6 +544,9 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 4fc5fd8cec..68fe78913f 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -340,6 +340,10 @@ PREHEAT SETTINGS #define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_FAN_SPEED 0 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 +#define PHA_PREHEAT_FAN_SPEED 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 674f3c36f4..f844cd3227 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -329,6 +329,9 @@ PREHEAT SETTINGS #define FLEX_PREHEAT_HOTEND_TEMP 230 #define FLEX_PREHEAT_HPB_TEMP 50 +#define PHA_PREHEAT_HOTEND_TEMP 195 +#define PHA_PREHEAT_HPB_TEMP 0 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/