pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'perftest' into mrbeam

Browse source
This commit is contained in:
make-ing 2015-10-23 10:33:07 +02:00
commit edecf336bd
4 changed files with 1118 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/events.py
View file

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

2
src/octoprint/printer/__init__.py
View file

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

2
src/octoprint/printer/standard.py
View file

@ -22,7 +22,7 @@ from octoprint.plugin import plugin_manager, ProgressPlugin
from octoprint.printer import PrinterInterface, PrinterCallback, UnknownScript from octoprint.printer import PrinterInterface, PrinterCallback, UnknownScript
from octoprint.printer.estimation import TimeEstimationHelper from octoprint.printer.estimation import TimeEstimationHelper
from octoprint.settings import settings 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 from octoprint.util import InvariantContainer

1114
src/octoprint/util/comm_acc2.py Normal file
View file

File diff suppressed because it is too large Load diff