Merge pull request #1 from Azelphur/master

Rewrite M18/M84 as they cause the printer to crash too.

octoprint_fixcbdfirmware/__init__.py

@@ -17,8 +17,8 @@ def rewrite_sending(self, comm_instance, phase, cmd, cmd_type, gcode, subcode=No
 			# firmware chokes on N parameters with M110, fix that
 			self._log_replacement(cmd, "M110")
 			return "M110"
-		elif gcode == "G28":
-			# firmware chokes on X, Y & probably Z parameter on G28, rewrite to X0, Y0, Z0
+		elif gcode in ["G28", "M18", "M84"]:
+			# firmware chokes on X, Y & probably Z parameter, rewrite to X0, Y0, Z0
 			rewritten = self.REGEX_XYZ0.sub("\g<axis>0 ", cmd).strip()
 			self._log_replacement(cmd, rewritten)
 			return rewritten