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

Moved new resend setting into feature section

Browse source 
That's where all other protocol specific settings are currently located.
Will be migrated at a later date into the printer profile instead (that
makes way more sense).
This commit is contained in:
Gina Häußge 2015-08-24 14:28:42 +02:00
parent 168d32eb63
commit d0f61e5073
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/settings.py
View file

@ -87,8 +87,6 @@ default_settings = {
"longRunningCommands": ["G4", "G28", "G29", "G30", "G32", "M400", "M226"], "longRunningCommands": ["G4", "G28", "G29", "G30", "G32", "M400", "M226"],
"checksumRequiringCommands": ["M110"], "checksumRequiringCommands": ["M110"],
"helloCommand": "M110 N0", "helloCommand": "M110 N0",
"ignoreIdenticalResends": False,
"identicalResendsCountdown": 7
}, },
"server": { "server": {
"host": "0.0.0.0", "host": "0.0.0.0",
@ -154,7 +152,9 @@ default_settings = {
"externalHeatupDetection": True, "externalHeatupDetection": True,
"supportWait": True, "supportWait": True,
"keyboardControl": True, "keyboardControl": True,
"pollWatched": False "pollWatched": False,
"ignoreIdenticalResends": False,
"identicalResendsCountdown": 7
}, },
"folder": { "folder": {
"uploads": None, "uploads": None,

4
src/octoprint/util/comm.py
View file

@ -249,7 +249,7 @@ class MachineCom(object):
self._lastResendNumber = None self._lastResendNumber = None
self._currentResendCount = 0 self._currentResendCount = 0
self._resendSwallowNextOk = False self._resendSwallowNextOk = False
self._resendSwallowRepetitions = settings().getBoolean(["serial", "ignoreIdenticalResends"]) self._resendSwallowRepetitions = settings().getBoolean(["feature", "ignoreIdenticalResends"])
self._resendSwallowRepetitionsCounter = 0 self._resendSwallowRepetitionsCounter = 0
self._checksum_requiring_commands = settings().get(["serial", "checksumRequiringCommands"]) self._checksum_requiring_commands = settings().get(["serial", "checksumRequiringCommands"])
@ -1497,7 +1497,7 @@ class MachineCom(object):
self._resendDelta = resendDelta self._resendDelta = resendDelta
self._lastResendNumber = lineToResend self._lastResendNumber = lineToResend
self._currentResendCount = 0 self._currentResendCount = 0
self._resendSwallowRepetitionsCounter = settings().getInt(["serial", "identicalResendsCountdown"]) self._resendSwallowRepetitionsCounter = settings().getInt(["feature", "identicalResendsCountdown"])
if self._resendDelta > len(self._lastLines) or len(self._lastLines) == 0 or self._resendDelta < 0: if self._resendDelta > len(self._lastLines) or len(self._lastLines) == 0 or self._resendDelta < 0:
self._errorValue = "Printer requested line %d but no sufficient history is available, can't resend" % lineToResend self._errorValue = "Printer requested line %d but no sufficient history is available, can't resend" % lineToResend