From 27322a971f69dd2f5c75ed8f59c392fcbb7c2595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 3 Mar 2014 23:04:36 +0100
Subject: [PATCH] Also support repetier target temperature output

 Should fix #360
---
 src/octoprint/server/api/settings.py          |  4 +-
 src/octoprint/settings.py                     |  3 +-
 .../static/js/app/viewmodels/settings.js      |  5 +-
 src/octoprint/templates/settings.jinja2       |  7 ++
 src/octoprint/util/comm.py                    | 71 +++++++++++++++----
 5 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
index 53b65ae4..0cb14375 100644
--- a/src/octoprint/server/api/settings.py
+++ b/src/octoprint/server/api/settings.py
@@ -59,7 +59,8 @@ def getSettings():
 			"waitForStart": s.getBoolean(["feature", "waitForStartOnConnect"]),
 			"alwaysSendChecksum": s.getBoolean(["feature", "alwaysSendChecksum"]),
 			"sdSupport": s.getBoolean(["feature", "sdSupport"]),
-			"swallowOkAfterResend": s.getBoolean(["feature", "swallowOkAfterResend"])
+			"swallowOkAfterResend": s.getBoolean(["feature", "swallowOkAfterResend"]),
+			"repetierTargetTemp": s.getBoolean(["feature", "repetierTargetTemp"])
 		},
 		"serial": {
 			"port": connectionOptions["portPreference"],
@@ -136,6 +137,7 @@ def setSettings():
 			if "alwaysSendChecksum" in data["feature"].keys(): s.setBoolean(["feature", "alwaysSendChecksum"], data["feature"]["alwaysSendChecksum"])
 			if "sdSupport" in data["feature"].keys(): s.setBoolean(["feature", "sdSupport"], data["feature"]["sdSupport"])
 			if "swallowOkAfterResend" in data["feature"].keys(): s.setBoolean(["feature", "swallowOkAfterResend"], data["feature"]["swallowOkAfterResend"])
+			if "repetierTargetTemp" in data["feature"].keys(): s.setBoolean(["feature", "repetierTargetTemp"], data["feature"]["repetierTargetTemp"])
 
 		if "serial" in data.keys():
 			if "autoconnect" in data["serial"].keys(): s.setBoolean(["serial", "autoconnect"], data["serial"]["autoconnect"])
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index d253ac89..26c9bda1 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -65,7 +65,8 @@ default_settings = {
 		"waitForStartOnConnect": False,
 		"alwaysSendChecksum": False,
 		"sdSupport": True,
-		"swallowOkAfterResend": True
+		"swallowOkAfterResend": True,
+		"repetierTargetTemp": False
 	},
 	"folder": {
 		"uploads": None,
diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index 3f77be59..eef8d584 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -96,6 +96,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
     self.feature_alwaysSendChecksum = ko.observable(undefined);
     self.feature_sdSupport = ko.observable(undefined);
     self.feature_swallowOkAfterResend = ko.observable(undefined);
+    self.feature_repetierTargetTemp = ko.observable(undefined);
 
     self.serial_port = ko.observable();
     self.serial_baudrate = ko.observable();
@@ -205,6 +206,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
         self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
         self.feature_sdSupport(response.feature.sdSupport);
         self.feature_swallowOkAfterResend(response.feature.swallowOkAfterResend);
+        self.feature_repetierTargetTemp(response.feature.repetierTargetTemp);
 
         self.serial_port(response.serial.port);
         self.serial_baudrate(response.serial.baudrate);
@@ -267,7 +269,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
                 "waitForStart": self.feature_waitForStart(),
                 "alwaysSendChecksum": self.feature_alwaysSendChecksum(),
                 "sdSupport": self.feature_sdSupport(),
-                "swallowOkAfterResend": self.feature_swallowOkAfterResend()
+                "swallowOkAfterResend": self.feature_swallowOkAfterResend(),
+                "repetierTargetTemp": self.feature_repetierTargetTemp()
             },
             "serial": {
                 "port": self.serial_port(),
diff --git a/src/octoprint/templates/settings.jinja2 b/src/octoprint/templates/settings.jinja2
index ff13820b..4c29e6b1 100644
--- a/src/octoprint/templates/settings.jinja2
+++ b/src/octoprint/templates/settings.jinja2
@@ -247,6 +247,13 @@
                                 </label>
                             </div>
                         </div>
+                        <div class="control-group">
+                            <div class="controls">
+                                <label class="checkbox">
+                                    <input type="checkbox" data-bind="checked: feature_repetierTargetTemp" id="settings-featureRepetierTargetTemp"> Support <code>TargetExtr%n</code>/<code>TargetBed</code> target temperature format <span class="label">Repetier</span>
+                                </label>
+                            </div>
+                        </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
index 4a8857a2..c4f02a88 100644
--- a/src/octoprint/util/comm.py
+++ b/src/octoprint/util/comm.py
@@ -150,15 +150,6 @@ class MachineCom(object):
 		self._resendDelta = None
 		self._lastLines = deque([], 50)
 
-		# multithreading locks
-		self._sendNextLock = threading.Lock()
-		self._sendingLock = threading.Lock()
-
-		# monitoring thread
-		self.thread = threading.Thread(target=self._monitor)
-		self.thread.daemon = True
-		self.thread.start()
-
 		# SD status data
 		self._sdAvailable = False
 		self._sdFileList = False
@@ -188,6 +179,17 @@ class MachineCom(object):
 		# - 4: whole target substring, if given (e.g. " / 22.0")
 		# - 5: target temperature
 		self._regex_temp = re.compile("(B|T(\d*)):\s*(%s)(\s*\/?\s*(%s))?" % (positiveFloatPattern, positiveFloatPattern))
+		self._regex_repetierTempExtr = re.compile("TargetExtr([0-9]+):(%s)" % positiveFloatPattern)
+		self._regex_repetierTempBed = re.compile("TargetBed:(%s)" % positiveFloatPattern)
+
+		# multithreading locks
+		self._sendNextLock = threading.Lock()
+		self._sendingLock = threading.Lock()
+
+		# monitoring thread
+		self.thread = threading.Thread(target=self._monitor)
+		self.thread.daemon = True
+		self.thread.start()
 
 	def __del__(self):
 		self.close()
@@ -575,12 +577,24 @@ class MachineCom(object):
 					continue
 
 				toolNum, actual, target = parsedTemps[tool]
-				self._temp[toolNum] = (actual, target)
+				if target is not None:
+					self._temp[toolNum] = (actual, target)
+				elif toolNum in self._temp.keys() and self._temp[toolNum] is not None and isinstance(self._temp[toolNum], tuple):
+					(oldActual, oldTarget) = self._temp[toolNum]
+					self._temp[toolNum] = (actual, oldTarget)
+				else:
+					self._temp[toolNum] = (actual, None)
 
 		# bed temperature
 		if "B" in parsedTemps.keys():
 			toolNum, actual, target = parsedTemps["B"]
-			self._bedTemp = (actual, target)
+			if target is not None:
+				self._bedTemp = (actual, target)
+			elif self._bedTemp is not None and isinstance(self._bedTemp, tuple):
+				(oldActual, oldTarget) = self._bedTemp
+				self._bedTemp = (actual, oldTarget)
+			else:
+				self._bedTemp = (actual, None)
 
 	def _monitor(self):
 		feedbackControls = settings().getFeedbackControls()
@@ -605,6 +619,8 @@ class MachineCom(object):
 		startSeen = not settings().getBoolean(["feature", "waitForStartOnConnect"])
 		heatingUp = False
 		swallowOk = False
+		supportRepetierTargetTemp = settings().getBoolean(["feature", "repetierTargetTemp"])
+
 		while True:
 			try:
 				line = self._readline()
@@ -636,6 +652,33 @@ class MachineCom(object):
 							t = time.time()
 							self._heatupWaitTimeLost = t - self._heatupWaitStartTime
 							self._heatupWaitStartTime = t
+				elif supportRepetierTargetTemp:
+					matchExtr = self._regex_repetierTempExtr.match(line)
+					matchBed = self._regex_repetierTempBed.match(line)
+
+					if matchExtr is not None:
+						toolNum = int(matchExtr.group(1))
+						try:
+							target = float(matchExtr.group(2))
+							if toolNum in self._temp.keys() and self._temp[toolNum] is not None and isinstance(self._temp[toolNum], tuple):
+								(actual, oldTarget) = self._temp[toolNum]
+								self._temp[toolNum] = (actual, target)
+							else:
+								self._temp[toolNum] = (None, target)
+							self._callback.mcTempUpdate(self._temp, self._bedTemp)
+						except ValueError:
+							pass
+					elif matchBed is not None:
+						try:
+							target = float(matchBed.group(1))
+							if self._bedTemp is not None and isinstance(self._bedTemp, tuple):
+								(actual, oldTarget) = self._bedTemp
+								self._bedTemp = (actual, target)
+							else:
+								self._bedTemp = (None, target)
+							self._callback.mcTempUpdate(self._temp, self._bedTemp)
+						except ValueError:
+							pass
 
 				##~~ SD Card handling
 				elif 'SD init fail' in line or 'volume.init failed' in line or 'openRoot failed' in line:
@@ -1097,9 +1140,11 @@ class MachineCom(object):
 		if match:
 			try:
 				target = float(match.group(1))
-				if self._temp[toolNum] is not None and isinstance(self._temp[toolNum], tuple):
+				if toolNum in self._temp.keys() and self._temp[toolNum] is not None and isinstance(self._temp[toolNum], tuple):
 					(actual, oldTarget) = self._temp[toolNum]
 					self._temp[toolNum] = (actual, target)
+				else:
+					self._temp[toolNum] = (None, target)
 			except ValueError:
 				pass
 		return cmd
@@ -1112,6 +1157,8 @@ class MachineCom(object):
 				if self._bedTemp is not None and isinstance(self._bedTemp, tuple):
 					(actual, oldTarget) = self._bedTemp
 					self._bedTemp = (actual, target)
+				else:
+					self._bedTemp = (None, target)
 			except ValueError:
 				pass
 		return cmd