diff --git a/py25/bacpypes/primitivedata.py b/py25/bacpypes/primitivedata.py index a32ba6b..a22e9a4 100755 --- a/py25/bacpypes/primitivedata.py +++ b/py25/bacpypes/primitivedata.py @@ -1612,7 +1612,8 @@ class Time(Atomic): class ObjectType(Enumerated): vendor_range = (128, 1023) enumerations = \ - { 'accessDoor':30 + { 'accessCredential':32 + , 'accessDoor':30 , 'accessPoint':33 , 'accessRights':34 , 'accessUser':35 @@ -1622,8 +1623,11 @@ class ObjectType(Enumerated): , 'analogInput':0 , 'analogOutput':1 , 'analogValue':2 + , 'auditLog':61 + , 'auditReporter':62 , 'averaging':18 , 'binaryInput':3 + , 'binaryLightingOutput':55 , 'binaryOutput':4 , 'binaryValue':5 , 'bitstringValue':39 @@ -1637,6 +1641,8 @@ class ObjectType(Enumerated): , 'datetimePatternValue':43 , 'datetimeValue':44 , 'device':8 + , 'elevatorGroup':57 + , 'escalator':58 , 'eventEnrollment':9 , 'eventLog':25 , 'file':10 @@ -1646,6 +1652,7 @@ class ObjectType(Enumerated): , 'largeAnalogValue':46 , 'lifeSafetyPoint':21 , 'lifeSafetyZone':22 + , 'lift':59 , 'lightingOutput':54 , 'loadControl':28 , 'loop':12 @@ -1653,6 +1660,7 @@ class ObjectType(Enumerated): , 'multiStateOutput':14 , 'multiStateValue':19 , 'networkSecurity':38 + , 'networkPort':56 , 'notificationClass':15 , 'notificationForwarder':51 , 'octetstringValue':47 @@ -1663,9 +1671,9 @@ class ObjectType(Enumerated): , 'structuredView':29 , 'timePatternValue':49 , 'timeValue':50 + , 'timer':31 , 'trendLog':20 , 'trendLogMultiple':27 - , 'networkPort':56 } expand_enumerations(ObjectType) diff --git a/py27/bacpypes/primitivedata.py b/py27/bacpypes/primitivedata.py index 41ce4e8..2fad74b 100755 --- a/py27/bacpypes/primitivedata.py +++ b/py27/bacpypes/primitivedata.py @@ -1629,7 +1629,8 @@ class Time(Atomic): class ObjectType(Enumerated): vendor_range = (128, 1023) enumerations = \ - { 'accessDoor':30 + { 'accessCredential':32 + , 'accessDoor':30 , 'accessPoint':33 , 'accessRights':34 , 'accessUser':35 @@ -1639,8 +1640,11 @@ class ObjectType(Enumerated): , 'analogInput':0 , 'analogOutput':1 , 'analogValue':2 + , 'auditLog':61 + , 'auditReporter':62 , 'averaging':18 , 'binaryInput':3 + , 'binaryLightingOutput':55 , 'binaryOutput':4 , 'binaryValue':5 , 'bitstringValue':39 @@ -1654,6 +1658,8 @@ class ObjectType(Enumerated): , 'datetimePatternValue':43 , 'datetimeValue':44 , 'device':8 + , 'elevatorGroup':57 + , 'escalator':58 , 'eventEnrollment':9 , 'eventLog':25 , 'file':10 @@ -1663,6 +1669,7 @@ class ObjectType(Enumerated): , 'largeAnalogValue':46 , 'lifeSafetyPoint':21 , 'lifeSafetyZone':22 + , 'lift':59 , 'lightingOutput':54 , 'loadControl':28 , 'loop':12 @@ -1670,6 +1677,7 @@ class ObjectType(Enumerated): , 'multiStateOutput':14 , 'multiStateValue':19 , 'networkSecurity':38 + , 'networkPort':56 , 'notificationClass':15 , 'notificationForwarder':51 , 'octetstringValue':47 @@ -1680,9 +1688,9 @@ class ObjectType(Enumerated): , 'structuredView':29 , 'timePatternValue':49 , 'timeValue':50 + , 'timer':31 , 'trendLog':20 , 'trendLogMultiple':27 - , 'networkPort':56 } expand_enumerations(ObjectType) diff --git a/py34/bacpypes/primitivedata.py b/py34/bacpypes/primitivedata.py index dfbc574..2fadf33 100755 --- a/py34/bacpypes/primitivedata.py +++ b/py34/bacpypes/primitivedata.py @@ -1611,7 +1611,8 @@ class Time(Atomic): class ObjectType(Enumerated): vendor_range = (128, 1023) enumerations = \ - { 'accessDoor':30 + { 'accessCredential':32 + , 'accessDoor':30 , 'accessPoint':33 , 'accessRights':34 , 'accessUser':35 @@ -1621,8 +1622,11 @@ class ObjectType(Enumerated): , 'analogInput':0 , 'analogOutput':1 , 'analogValue':2 + , 'auditLog':61 + , 'auditReporter':62 , 'averaging':18 , 'binaryInput':3 + , 'binaryLightingOutput':55 , 'binaryOutput':4 , 'binaryValue':5 , 'bitstringValue':39 @@ -1636,6 +1640,8 @@ class ObjectType(Enumerated): , 'datetimePatternValue':43 , 'datetimeValue':44 , 'device':8 + , 'elevatorGroup':57 + , 'escalator':58 , 'eventEnrollment':9 , 'eventLog':25 , 'file':10 @@ -1645,6 +1651,7 @@ class ObjectType(Enumerated): , 'largeAnalogValue':46 , 'lifeSafetyPoint':21 , 'lifeSafetyZone':22 + , 'lift':59 , 'lightingOutput':54 , 'loadControl':28 , 'loop':12 @@ -1652,6 +1659,7 @@ class ObjectType(Enumerated): , 'multiStateOutput':14 , 'multiStateValue':19 , 'networkSecurity':38 + , 'networkPort':56 , 'notificationClass':15 , 'notificationForwarder':51 , 'octetstringValue':47 @@ -1662,9 +1670,9 @@ class ObjectType(Enumerated): , 'structuredView':29 , 'timePatternValue':49 , 'timeValue':50 + , 'timer':31 , 'trendLog':20 , 'trendLogMultiple':27 - , 'networkPort':56 } expand_enumerations(ObjectType)