Add tracking of cancel position & make public

src/octoprint/plugins/actual/data/actualResumeFilePrefix.gcode

@@ -0,0 +1,31 @@
+; resume file for {{ file }}
+; generated on {{ timestamp }}
+; reason: {{ reason }}
+
+; home print head in X and Y
+G28 X0 Y0 F1200
+
+; set all temperatures back to original targets
+{% for temp in temperatures %}
+M104 T{{ temp.t }} S{{ temp.target }}
+{% endfor %}
+M116 ; wait for all temperatures to reach target
+
+; reposition nozzle X, Y, Z, E and feedrate
+G1 X{{ position.x }} Y{{ position.y }} Z{{ position.z }} F4500
+G92 E{{ position.e }}
+G1 F{{ movement.f }}
+
+; feed- and flowrate modifiers
+M220 {{ movement.fm }}
+M221 {{ movement.em }}
+
+; fan speeds
+{% for fan in fans %}
+M106 P{{ fan.p }} S{{ fan.speed }}
+{% endfor %}
+
+; ---
+; {{ file }}, starting at byte {{ pos }}
+; ---
+

src/octoprint/printer/standard.py

@@ -965,8 +965,10 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 	def on_comm_temperature_update(self, temp, bedTemp):
 		self._addTemperatureData(copy.deepcopy(temp), copy.deepcopy(bedTemp))
 
-	def on_comm_position_update(self, position):
-		eventManager().fire(Events.POSITION_UPDATE, position)
+	def on_comm_position_update(self, position, reason=None):
+		payload = dict(reason=reason)
+		payload.update(position)
+		eventManager().fire(Events.POSITION_UPDATE, payload)
 
 	def on_comm_state_change(self, state):
 		"""

src/octoprint/util/comm.py

@@ -370,9 +370,11 @@ class MachineCom(object):
 		self._ignore_select = False
 		self._manualStreaming = False
 
-		self._last_position = PositionRecord()
-		self._pause_position = PositionRecord()
+		self.last_position = PositionRecord()
+		self.pause_position = PositionRecord()
 		self._record_pause_position = False
+		self.cancel_position = PositionRecord()
+		self._record_cancel_position = False
 
 		# print job
 		self._currentFile = None
@@ -669,8 +671,8 @@ class MachineCom(object):
 			context.update(replacements)
 		context.update(dict(
 			printer_profile=self._printerProfileManager.get_current_or_default(),
-			last_position=self._last_position,
-			pause_position=self._pause_position
+			last_position=self.last_position,
+			pause_position=self.pause_position
 		))
 
 		template = settings().loadScript("gcode", scriptName, context=context)
@@ -806,6 +808,10 @@ class MachineCom(object):
 		self._currentFile = None
 		self._callback.on_comm_file_selected(None, None, False)
 
+	def _cancel_preparation_done(self):
+		self._recordFilePosition()
+		self._callback.on_comm_print_job_cancelled()
+
 	def cancelPrint(self, firmware_error=None):
 		if not self.isOperational() or self.isStreaming():
 			return
@@ -825,8 +831,14 @@ class MachineCom(object):
 				except:
 					pass
 
-		self._recordFilePosition()
-		self._callback.on_comm_print_job_cancelled()
+		def _on_M400_sent():
+			# we don't call on_print_job_cancelled on our callback here
+			# because we do this only after our M114 has been answered
+			# by the firmware
+			self._record_cancel_position = True
+			self.sendCommand("M114")
+
+		self.sendCommand("M400", on_sent=_on_M400_sent)
 
 	def _pause_preparation_done(self):
 		self._callback.on_comm_print_job_paused()
@@ -1134,19 +1146,28 @@ class MachineCom(object):
 						# there's no way to query it from the firmware and
 						# no way to track it ourselves when not streaming
 						# the file - this all sucks sooo much
-						self._last_position.x = float(match.group("x"))
-						self._last_position.y = float(match.group("y"))
-						self._last_position.z = float(match.group("z"))
-						self._last_position.e = float(match.group("e"))
-						self._last_position.t = self._currentTool if not self.isSdFileSelected() else None
-						self._last_position.f = self._currentF if not self.isSdFileSelected() else None
+						self.last_position.x = float(match.group("x"))
+						self.last_position.y = float(match.group("y"))
+						self.last_position.z = float(match.group("z"))
+						self.last_position.e = float(match.group("e"))
+						self.last_position.t = self._currentTool if not self.isSdFileSelected() else None
+						self.last_position.f = self._currentF if not self.isSdFileSelected() else None
+
+						reason = None
 
 						if self._record_pause_position:
+							reason = "pause"
 							self._record_pause_position = False
-							self._pause_position.copy_from(self._last_position)
+							self.pause_position.copy_from(self.last_position)
 							self._pause_preparation_done()
 
-						self._callback.on_comm_position_update(self._last_position.as_dict())
+						if self._record_cancel_position:
+							reason = "cancel"
+							self._record_cancel_position = False
+							self.cancel_position.copy_from(self.last_position)
+							self._cancel_preparation_done()
+
+						self._callback.on_comm_position_update(self.last_position.as_dict(), reason=reason)
 
 				# temperature processing
 				elif ' T:' in line or line.startswith('T:') or ' T0:' in line or line.startswith('T0:') or ((' B:' in line or line.startswith('B:')) and not 'A:' in line):
@@ -2359,7 +2380,7 @@ class MachineComPrintCallback(object):
 	def on_comm_temperature_update(self, temp, bedTemp):
 		pass
 
-	def on_comm_position_update(self, position):
+	def on_comm_position_update(self, position, reason=None):
 		pass
 
 	def on_comm_state_change(self, state):