Merge branch 'perftest' into mrbeam

src/octoprint/events.py

@@ -86,9 +86,10 @@ class Events(object):
 
 	# Settings
 	SETTINGS_UPDATED = "SettingsUpdated"
-	
+
 	# GRBL
 	LIMITS_HIT = "LimitsHit"
+	SOFT_RESET = "Soft-Reset"
 	RT_STATE = "RealTimeState"
 
 

src/octoprint/printer/__init__.py

@@ -23,7 +23,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms
 
 import re
 
-import octoprint.util.comm_acc as comm
+import octoprint.util.comm_acc2 as comm
 import octoprint.util as util
 
 from octoprint.settings import settings

src/octoprint/printer/standard.py

@@ -22,7 +22,7 @@ from octoprint.plugin import plugin_manager, ProgressPlugin
 from octoprint.printer import PrinterInterface, PrinterCallback, UnknownScript
 from octoprint.printer.estimation import TimeEstimationHelper
 from octoprint.settings import settings
-from octoprint.util import comm_acc as comm
+from octoprint.util import comm_acc2 as comm
 from octoprint.util import InvariantContainer