3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes in filament

Browse Source 
Add fiber wood
  Change order
This commit is contained in:
Przemek Grondek 2021-08-25 00:18:07 +02:00
parent 2b009fb816
commit 2e04aed42e
9 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Firmware/ultralcd.cpp
View File

@ -2406,6 +2406,12 @@ static void mFilamentItem_PVB()
mFilamentItem(PVB_PREHEAT_HOTEND_TEMP, PVB_PREHEAT_HPB_TEMP); mFilamentItem(PVB_PREHEAT_HOTEND_TEMP, PVB_PREHEAT_HPB_TEMP);
} }
static void mFilamentItem_FIBERWOOD()
{
bFilamentPreheatState = false;
mFilamentItem(FIBERWOOD_PREHEAT_HOTEND_TEMP, FIBERWOOD_PREHEAT_HPB_TEMP);
}
void mFilamentBack() void mFilamentBack()
{ {
menu_back(); menu_back();
@ -2440,13 +2446,14 @@ void lcd_generic_preheat_menu()
{ {
MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA);
MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET);
MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS);
MENU_ITEM_SUBMENU_P(PSTR("WOOD - " STRINGIFY(FIBERWOOD_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FIBERWOOD_PREHEAT_HPB_TEMP)),mFilamentItem_FIBERWOOD);
MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX);
MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); 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("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("PVB - " STRINGIFY(PVB_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PVB_PREHEAT_HPB_TEMP)),mFilamentItem_PVB);
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("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("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);
} }
if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && eFilamentAction == FilamentAction::Preheat) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && eFilamentAction == FilamentAction::Preheat) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown);
MENU_END(); MENU_END();

2
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

@ -359,6 +359,8 @@ PREHEAT SETTINGS
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FLEX_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_FAN_SPEED 0
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

@ -348,6 +348,9 @@ PREHEAT SETTINGS
#define FLEX_PREHEAT_HOTEND_TEMP 230 #define FLEX_PREHEAT_HOTEND_TEMP 230
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View File

@ -413,6 +413,9 @@
#define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HOTEND_TEMP 240
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View File

@ -414,6 +414,9 @@
#define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HOTEND_TEMP 240
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h
View File

@ -413,6 +413,9 @@
#define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HOTEND_TEMP 240
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h
View File

@ -414,6 +414,9 @@
#define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HOTEND_TEMP 240
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View File

@ -541,6 +541,9 @@
#define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HOTEND_TEMP 240
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/

3
Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View File

@ -545,6 +545,9 @@
#define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HOTEND_TEMP 240
#define FLEX_PREHEAT_HPB_TEMP 50 #define FLEX_PREHEAT_HPB_TEMP 50
#define FIBERWOOD_PREHEAT_HOTEND_TEMP 200
#define FIBERWOOD_PREHEAT_HPB_TEMP 60
/*------------------------------------ /*------------------------------------
THERMISTORS SETTINGS THERMISTORS SETTINGS
*------------------------------------*/ *------------------------------------*/