mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-10-27 00:57:47 +08:00
Code Issues Releases Wiki Activity

be more proactive canceling the _dcc_enable_task when DCC is enabled or disabled

Browse Source
This commit is contained in:
Joel Bender
2017-09-15 01:02:00 -04:00
parent 6bf3bba359
commit d83c0ef401
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
py25/bacpypes/service/device.py
View File

@@ -381,6 +381,7 @@ class DeviceCommunicationControlServices(Capability):
if _debug: DeviceCommunicationControlServices._debug("__init__")
Capability.__init__(self)
# task to run if there is a time duration
self._dcc_enable_task = None
def do_DeviceCommunicationControlRequest(self, apdu):
@@ -391,11 +392,8 @@ class DeviceCommunicationControlServices(Capability):
raise ExecutionError(errorClass="security", errorCode="passwordFailure")
if apdu.enableDisable == "enable":
if self._dcc_enable_task:
self._dcc_enable_task.suspend_task()
self._dcc_enable_task = None
self.enable_communications()
else:
# disable or disableInitiation
self.disable_communications(apdu.enableDisable)
@@ -404,6 +402,7 @@ class DeviceCommunicationControlServices(Capability):
if apdu.timeDuration:
self._dcc_enable_task = FunctionTask(self.enable_communications)
self._dcc_enable_task.install_task(delta=apdu.timeDuration * 60)
if _debug: DeviceCommunicationControlServices._debug(" - enable scheduled")
# respond with a simple ack
self.response(SimpleAckPDU(context=apdu))
@@ -414,11 +413,21 @@ class DeviceCommunicationControlServices(Capability):
# tell the State Machine Access Point
self.smap.dccEnableDisable = 'enable'
# if an enable task was scheduled, cancel it
if self._dcc_enable_task:
self._dcc_enable_task.suspend_task()
self._dcc_enable_task = None
def disable_communications(self, enable_disable):
if _debug: DeviceCommunicationControlServices._debug("disable_communications %r", enable_disable)
# tell the State Machine Access Point
self.smap.dccEnableDisable = enable_disable
# if an enable task was scheduled, cancel it
if self._dcc_enable_task:
self._dcc_enable_task.suspend_task()
self._dcc_enable_task = None
bacpypes_debugging(DeviceCommunicationControlServices)