diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index abfdf3080..868ac170f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2043,6 +2043,12 @@ static void mFilamentItem_ABS() mFilamentItem(ABS_PREHEAT_HOTEND_TEMP, ABS_PREHEAT_HPB_TEMP); } +static void mFilamentItem_PA() +{ + bFilamentPreheatState = false; + mFilamentItem(PA_PREHEAT_HOTEND_TEMP, PA_PREHEAT_HPB_TEMP); +} + static void mFilamentItem_HIPS() { bFilamentPreheatState = false; @@ -2099,6 +2105,7 @@ void lcd_generic_preheat_menu() MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); MENU_ITEM_SUBMENU_P(PSTR("PC - " STRINGIFY(PC_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PC_PREHEAT_HPB_TEMP)),mFilamentItem_PC); MENU_ITEM_SUBMENU_P(PSTR("PVB - " STRINGIFY(PVB_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PVB_PREHEAT_HPB_TEMP)),mFilamentItem_PVB); + MENU_ITEM_SUBMENU_P(PSTR("PA - " STRINGIFY(PA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PA_PREHEAT_HPB_TEMP)),mFilamentItem_PA); MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); 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); diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 720757ec8..c6b15fab7 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -388,6 +388,9 @@ #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 105 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index ba72bf228..8aa40cbde 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -389,6 +389,9 @@ #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 105 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 9c64bdbd9..ced87fa21 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -388,6 +388,9 @@ #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 105 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index d7348c73b..5a6c3eb0e 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -389,6 +389,9 @@ #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 105 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 92f129c0a..e35a58f9a 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -544,6 +544,9 @@ #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 110 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 2eb94d88b..3560e484e 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -548,6 +548,9 @@ #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 110 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index e7bee2cea..6d8f205b5 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -304,6 +304,9 @@ PREHEAT SETTINGS #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 105 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 788ab7906..f43b22ccc 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -303,6 +303,9 @@ PREHEAT SETTINGS #define PC_PREHEAT_HOTEND_TEMP 275 #define PC_PREHEAT_HPB_TEMP 105 +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100