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

remove the registration of AuthenticateRequest, AuthenticateACK, and RequestKeyRequest (but leave the definitions, just in case), add the 'writeGroup' services supported enumeration, expand the service choice enumerations rather than leaving them to be expanded on demand

Browse Source
This commit is contained in:
Joel Bender
2015-09-14 23:38:17 -04:00
parent 61a6262ac4
commit 305bf298b7
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
py25/bacpypes/apdu.py
View File

@@ -1620,8 +1620,6 @@ class AuthenticateRequest(ConfirmedRequestSequence):
, Element('startEncipheredSession', Boolean, 4)
]
register_confirmed_request_type(AuthenticateRequest)
# removed in version 1, revision 11
class AuthenticateACK(ComplexAckSequence):
serviceChoice = 24
@@ -1629,10 +1627,6 @@ class AuthenticateACK(ComplexAckSequence):
[ Element('modifiedRandomNumber', Unsigned)
]
register_complex_ack_type(AuthenticateACK)
#-----
# removed in version 1, revision 11
class RequestKeyRequest(ConfirmedRequestSequence):
serviceChoice = 25
@@ -1643,8 +1637,6 @@ class RequestKeyRequest(ConfirmedRequestSequence):
, Element('remoteDeviceAddress', DeviceAddress)
]
register_confirmed_request_type(RequestKeyRequest)
#-----------------------------------
class ConfirmedServiceChoice(Enumerated):
@@ -1687,6 +1679,8 @@ class ConfirmedServiceChoice(Enumerated):
'vtData':23,
}
expand_enumerations(ConfirmedServiceChoice)
class UnconfirmedServiceChoice(Enumerated):
enumerations = {
'iAm':0,
@@ -1702,3 +1696,4 @@ class UnconfirmedServiceChoice(Enumerated):
'writeGroup':10,
}
expand_enumerations(UnconfirmedServiceChoice)