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

Attempt #2 at resolving conflicts with upstream for pull request.

This commit is contained in:
Aaron Yourk 2017-03-05 17:47:51 -07:00
parent 822fbc00cb
commit f7a18d3a4e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/ultralcd.cpp
View File

@ -94,10 +94,10 @@ int8_t SDscrool = 0;
int8_t SilentModeMenu = 0; int8_t SilentModeMenu = 0;
uint8_t oldFanSpeed = 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;
uint8_t oldFanSpeed = 0;
uint8_t farm_mode = 0; uint8_t farm_mode = 0;
int farm_no = 0; int farm_no = 0;
int farm_timer = 30; int farm_timer = 30;