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

Fix bad merge.

This commit is contained in:
Marek Bel 2019-08-27 22:22:36 +02:00
parent 3f04c4db87
commit 29c8cb2927
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/ultralcd.cpp
View File

@ -2305,12 +2305,6 @@ static void mFilamentItem_ASA()
mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP); mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP);
} }
static void mFilamentItem_ASA()
{
bFilamentPreheatState=false;
mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP);
}
static void mFilamentItem_ABS() static void mFilamentItem_ABS()
{ {
bFilamentPreheatState = false; bFilamentPreheatState = false;