Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for loading PHA filament #3536

Open
wants to merge 2 commits into
base: MK3
Choose a base branch
from
Open

Add support for loading PHA filament #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8eed73
Add support for loading PHA filament
dhiltonp Jul 6, 2022
ab68b48
Merge branch 'prusa3d:MK3' into PHA
dhiltonp Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Firmware/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,6 +2090,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 ||
Expand Down Expand Up @@ -2126,6 +2132,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();
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,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
*------------------------------------*/
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,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
*------------------------------------*/
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,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
*------------------------------------*/
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,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
*------------------------------------*/
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,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
*------------------------------------*/
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,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
*------------------------------------*/
Expand Down
4 changes: 4 additions & 0 deletions Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@ 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
#define PHA_PREHEAT_FAN_SPEED 0

/*------------------------------------
THERMISTORS SETTINGS
*------------------------------------*/
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,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
*------------------------------------*/
Expand Down