From f8126587142888feb7a7645c074ee260a39ac8c0 Mon Sep 17 00:00:00 2001
From: Philipp Engel <philipp@filzip.com>
Date: Tue, 16 Dec 2014 17:08:35 +0100
Subject: [PATCH 1/6] changed tornado dependency to local (RPi date fix)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ec212ee2..f40fca5a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 flask==0.9
 werkzeug==0.8.3
-tornado==4.0.1
 sockjs-tornado>=1.0.0
 PyYAML==3.10
 Flask-Login==0.2.2
@@ -12,3 +11,4 @@ watchdog
 sarge
 netifaces
 pylru
+-e ../tornado
\ No newline at end of file

From 08b60784eac25f319286b25685ad8d81ccea7f36 Mon Sep 17 00:00:00 2001
From: Philipp Engel <philipp@filzip.com>
Date: Tue, 16 Dec 2014 17:48:33 +0100
Subject: [PATCH 2/6] new try for fixed deps

---
 requirements.txt | 2 +-
 setup.py         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index f40fca5a..aa8f71bc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,4 +11,4 @@ watchdog
 sarge
 netifaces
 pylru
--e ../tornado
\ No newline at end of file
+tornado
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 26876883..e93856c2 100644
--- a/setup.py
+++ b/setup.py
@@ -268,6 +268,9 @@ def params():
 	include_package_data = True
 	zip_safe = False
 	install_requires = open("requirements.txt").read().split("\n")
+	dependency_links = [
+		'https://github.com/nosyjoe/tornado/archive/master.tar.gz',
+	]
 
 	entry_points = {
 		"console_scripts": [

From c8273e9e1248556c017825deacc81f2d3e21af6c Mon Sep 17 00:00:00 2001
From: Philipp Engel <philipp@filzip.com>
Date: Tue, 16 Dec 2014 18:41:43 +0100
Subject: [PATCH 3/6] Revert "changed tornado dependency to local (RPi date
 fix)"

This reverts commit f8126587142888feb7a7645c074ee260a39ac8c0.
---
 requirements.txt | 2 +-
 setup.py         | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index aa8f71bc..ec212ee2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 flask==0.9
 werkzeug==0.8.3
+tornado==4.0.1
 sockjs-tornado>=1.0.0
 PyYAML==3.10
 Flask-Login==0.2.2
@@ -11,4 +12,3 @@ watchdog
 sarge
 netifaces
 pylru
-tornado
\ No newline at end of file
diff --git a/setup.py b/setup.py
index e93856c2..26876883 100644
--- a/setup.py
+++ b/setup.py
@@ -268,9 +268,6 @@ def params():
 	include_package_data = True
 	zip_safe = False
 	install_requires = open("requirements.txt").read().split("\n")
-	dependency_links = [
-		'https://github.com/nosyjoe/tornado/archive/master.tar.gz',
-	]
 
 	entry_points = {
 		"console_scripts": [

From f1511c2076296892bb306956abe6b4718028c18b Mon Sep 17 00:00:00 2001
From: Philipp Engel <philipp@filzip.com>
Date: Tue, 16 Dec 2014 18:45:52 +0100
Subject: [PATCH 4/6] bumped tornado to version 4.0.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ec212ee2..a09cd5c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 flask==0.9
 werkzeug==0.8.3
-tornado==4.0.1
+tornado==4.0.2
 sockjs-tornado>=1.0.0
 PyYAML==3.10
 Flask-Login==0.2.2

From b85ee58b4e71ae8b3e90f28f4a4aae6263f46465 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Mon, 22 Dec 2014 12:57:29 +0100
Subject: [PATCH 5/6] fixes fan on / off buttons. adds a focus disable button.

---
 src/octoprint/templates/index.jinja2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index ab3f52af..62096b01 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -430,10 +430,10 @@
                             <div class="jog-panel" style="display: none;" data-bind="visible: loginState.isUser">
                                 <h1>{{ _('General') }}</h1>
                                 <div>
-                                    <button id="btn_focus_mode" class="btn btn-block control-box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M3S10'}) }">{{ _('Enable Focus') }}</button>
-                                    <button id="btn_motors_off" class="btn btn-block control-box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M18'}) }">{{ _('Motors off') }}</button>
-                                    <button id="btn_fan_on" class="btn btn-block control-box" data-bind="enable: isOperational() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M106'}) }">{{ _('Fans on') }}</button>
-                                    <button id="btn_fan_off" class="btn btn-block control-box" data-bind="enable: isOperational() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M106 S0'}) }">{{ _('Fans off') }}</button>
+                                    <button id="btn_focus_on" class="btn btn-block control-box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M3S10'}) }">{{ _('Enable Focus') }}</button>
+                                    <button id="btn_focus_off" class="btn btn-block control-box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M5'}) }">{{ _('Disable Focus') }}</button>
+                                    <button id="btn_fan_on" class="btn btn-block control-box" data-bind="enable: isOperational() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M8'}) }">{{ _('Fans on') }}</button>
+                                    <button id="btn_fan_off" class="btn btn-block control-box" data-bind="enable: isOperational() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M9'}) }">{{ _('Fans off') }}</button>
                                 </div>
                             </div>
 

From 96223a53fe00c19fd55c29b25745edce1bb625d5 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Mon, 22 Dec 2014 13:14:54 +0100
Subject: [PATCH 6/6] quick fix. avoids sending M110 N0 command as it is not
 supported by grbl. fixes #2

---
 src/octoprint/util/comm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
index 7118ab34..e383c30f 100644
--- a/src/octoprint/util/comm.py
+++ b/src/octoprint/util/comm.py
@@ -1425,7 +1425,8 @@ class PrintingGcodeFileInformation(PrintingFileInformation):
 
 		if self._lineCount is None:
 			self._lineCount = 0
-			return "M110 N0"
+			#return "M110 N0"
+			return ""
 
 		try:
 			processedLine = None