From 822fbc00cb986fcccda9106e04983ef5c3ceda70 Mon Sep 17 00:00:00 2001
From: Aaron Yourk <ayourk@gmail.com>
Date: Sat, 4 Mar 2017 18:35:49 -0700
Subject: [PATCH] Fixing conficts due to recent changes involving "Farm Mode".

---
 Firmware/ultralcd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 63d0ac71f..0982a958f 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -97,8 +97,8 @@ int8_t SilentModeMenu = 0;
 int lcd_commands_type=LCD_COMMAND_IDLE;
 int lcd_commands_step=0;
 bool isPrintPaused = false;
-int oldFanSpeed = 0;
-bool farm_mode = false;
+uint8_t oldFanSpeed = 0;
+uint8_t farm_mode = 0;
 int farm_no = 0;
 int farm_timer = 30;
 int farm_status = 0;