Moved new resend setting into feature section

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).
(cherry picked from commit d0f61e5)
This commit is contained in:
Gina Häußge 2015-08-24 14:28:42 +02:00
parent e689a2c733
commit f9a0cb94f7
2 changed files with 6 additions and 6 deletions

View file

@ -83,9 +83,7 @@ default_settings = {
"sdStatus": 1
},
"additionalPorts": [],
"longRunningCommands": ["G4", "G28", "G29", "G30", "G32"],
"ignoreIdenticalResends": False,
"identicalResendsCountdown": 7
"longRunningCommands": ["G4", "G28", "G29", "G30", "G32"]
},
"server": {
"host": "0.0.0.0",
@ -145,7 +143,9 @@ default_settings = {
"externalHeatupDetection": True,
"supportWait": True,
"keyboardControl": True,
"pollWatched": False
"pollWatched": False,
"ignoreIdenticalResends": False,
"identicalResendsCountdown": 7
},
"folder": {
"uploads": None,

View file

@ -238,7 +238,7 @@ class MachineCom(object):
self._lastResendNumber = None
self._currentResendCount = 0
self._resendSwallowNextOk = False
self._resendSwallowRepetitions = settings().getBoolean(["serial", "ignoreIdenticalResends"])
self._resendSwallowRepetitions = settings().getBoolean(["feature", "ignoreIdenticalResends"])
self._resendSwallowRepetitionsCounter = 0
self._clear_to_send = CountedEvent(max=10, name="comm.clear_to_send")
@ -1435,7 +1435,7 @@ class MachineCom(object):
self._resendDelta = resendDelta
self._lastResendNumber = lineToResend
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:
self._errorValue = "Printer requested line %d but no sufficient history is available, can't resend" % lineToResend