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

Fixing conficts due to recent changes involving "Farm Mode".

Browse Source
This commit is contained in:
Aaron Yourk 2017-03-04 18:35:49 -07:00
parent bcc0e83d76
commit 822fbc00cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/ultralcd.cpp
View File

@ -97,8 +97,8 @@ int8_t SilentModeMenu = 0;
int lcd_commands_type=LCD_COMMAND_IDLE; int lcd_commands_type=LCD_COMMAND_IDLE;
int lcd_commands_step=0; int lcd_commands_step=0;
bool isPrintPaused = false; bool isPrintPaused = false;
int oldFanSpeed = 0; uint8_t oldFanSpeed = 0;
bool farm_mode = false; uint8_t farm_mode = 0;
int farm_no = 0; int farm_no = 0;
int farm_timer = 30; int farm_timer = 30;
int farm_status = 0; int farm_status = 0;