From 4b2715d17334194150696e1fae9a046737441ad5 Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Thu, 16 Jul 2015 12:35:01 -0400 Subject: [PATCH] bring the object definitions up to date --- py25/bacpypes/object.py | 1 - py27/bacpypes/object.py | 7 +- py34/bacpypes/object.py | 312 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 303 insertions(+), 17 deletions(-) diff --git a/py25/bacpypes/object.py b/py25/bacpypes/object.py index 29a3317..3f33173 100755 --- a/py25/bacpypes/object.py +++ b/py25/bacpypes/object.py @@ -1958,4 +1958,3 @@ class TrendLogMultipleObject(Object): , OptionalProperty('eventAlgorithmInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] - diff --git a/py27/bacpypes/object.py b/py27/bacpypes/object.py index 29a3317..d87279e 100755 --- a/py27/bacpypes/object.py +++ b/py27/bacpypes/object.py @@ -508,9 +508,9 @@ class AccessCredentialObject(Object): , OptionalProperty('extendedTimeEnable', Boolean) , OptionalProperty('authorizationExemptions', SequenceOf(AuthorizationException)) , OptionalProperty('reliabilityEvaluationInhibit', Boolean) -# , OptionalProperty('masterExemption', Boolean) -# , OptionalProperty('passbackExemption', Boolean) -# , OptionalProperty('occupancyExemption', Boolean) + , OptionalProperty('masterExemption', Boolean) + , OptionalProperty('passbackExemption', Boolean) + , OptionalProperty('occupancyExemption', Boolean) ] @register_object_type @@ -1958,4 +1958,3 @@ class TrendLogMultipleObject(Object): , OptionalProperty('eventAlgorithmInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] - diff --git a/py34/bacpypes/object.py b/py34/bacpypes/object.py index 3a9e4e5..1b3d534 100755 --- a/py34/bacpypes/object.py +++ b/py34/bacpypes/object.py @@ -506,6 +506,8 @@ class AccessCredentialObject(Object): , OptionalProperty('traceFlag', Boolean) , OptionalProperty('threatAuthority', AccessThreatLevel) , OptionalProperty('extendedTimeEnable', Boolean) + , OptionalProperty('authorizationExemptions', SequenceOf(AuthorizationException)) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('masterExemption', Boolean) , OptionalProperty('passbackExemption', Boolean) , OptionalProperty('occupancyExemption', Boolean) @@ -542,6 +544,10 @@ class AccessDoorObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) ] @register_object_type @@ -589,6 +595,11 @@ class AccessPointObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -602,6 +613,7 @@ class AccessRightsObject(Object): , ReadableProperty('negativeAccessRules', ArrayOf(AccessRule)) , ReadableProperty('positiveAccessRules', ArrayOf(AccessRule)) , OptionalProperty('accompaniment', DeviceObjectReference) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -652,6 +664,12 @@ class AccessZoneObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -685,6 +703,30 @@ class AccumulatorObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + ] + +@register_object_type +class AlertEnrollmentObject(Object): + objectType = 'alertEnrollment' + properties = \ + [ ReadableProperty('presentValue', ObjectIdentifier) + , ReadableProperty('eventState', EventState) + , OptionalProperty('eventDetectionEnable', Boolean) + , ReadableProperty('notificationClass', Unsigned) + , OptionalProperty('eventEnable', EventTransitionBits) + , OptionalProperty('ackedTransitions', EventTransitionBits) + , OptionalProperty('notifyType', NotifyType) + , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) + , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) ] @register_object_type @@ -714,6 +756,12 @@ class AnalogInputObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -744,6 +792,12 @@ class AnalogOutputObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -773,6 +827,12 @@ class AnalogValueObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -818,6 +878,12 @@ class BinaryInputObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -850,6 +916,12 @@ class BinaryOutputObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -880,6 +952,12 @@ class BinaryValueObject(Object): , OptionalProperty('notifyType',NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -913,6 +991,33 @@ class CalendarObject(Object): , ReadableProperty('dateList', SequenceOf(CalendarEntry)) ] +@register_object_type +class ChannelObject(Object): + objectType = 'channel' + properties = \ + [ WritableProperty('presentValue', ChannelValue) + , ReadableProperty('lastPriority', Unsigned) + , ReadableProperty('writeStatus', WriteStatus) + , ReadableProperty('statusFlags', StatusFlags) + , OptionalProperty('reliability', Reliability) + , ReadableProperty('outOfService', Boolean) + , WritableProperty('listOfObjectPropertyReferences', ArrayOf(DeviceObjectPropertyReference)) + , OptionalProperty('executionDelay', ArrayOf(Unsigned)) + , OptionalProperty('allowGroupDelayInhibit', Boolean) + , WritableProperty('channelNumber', Unsigned) + , WritableProperty('controlGroups', ArrayOf(Unsigned)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('notificationClass', Unsigned) + , OptionalProperty('eventEnable', EventTransitionBits) + , OptionalProperty('eventState', EventState) + , OptionalProperty('ackedTransitions', EventTransitionBits) + , OptionalProperty('notifyType', NotifyType) + , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) + , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + ] + @register_object_type class CharacterStringValueObject(Object): objectType = 'characterstringValue' @@ -933,6 +1038,12 @@ class CharacterStringValueObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -956,6 +1067,16 @@ class CredentialDataInputObject(Object): , ReadableProperty('outOfService', Boolean) , ReadableProperty('supportedFormats', ArrayOf(AuthenticationFactorFormat)) , ReadableProperty('supportedFormatClasses', ArrayOf(Unsigned)) + , ReadableProperty('updateTime', TimeStamp) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('notificationClass', Unsigned) + , OptionalProperty('eventEnable', EventTransitionBits) + , OptionalProperty('ackedTransitions', EventTransitionBits) + , OptionalProperty('notifyType', NotifyType) + , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) + , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1081,6 +1202,16 @@ class EventEnrollmentObject(Object): , ReadableProperty('notificationClass', Unsigned) , ReadableProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , ReadableProperty('statusFlags', StatusFlags) + , ReadableProperty('reliability', Reliability) + , OptionalProperty('faultType', FaultType) + , OptionalProperty('faultParameters', FaultParameter) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] #----- @@ -1122,6 +1253,10 @@ class EventLogObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) ] #----- @@ -1164,8 +1299,14 @@ class GlobalGroupObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) , OptionalProperty('covuPeriod', Unsigned) , OptionalProperty('covuRecipients', SequenceOf(Recipient)) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1200,6 +1341,15 @@ class IntegerValueObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + , OptionalProperty('minPresValue', Integer) + , OptionalProperty('maxPresValue', Integer) + , OptionalProperty('resolution', Integer) ] @register_object_type @@ -1226,6 +1376,15 @@ class LargeAnalogValueObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + , OptionalProperty('minPresValue', Double) + , OptionalProperty('maxPresValue', Double) + , OptionalProperty('resolution', Double) ] @register_object_type @@ -1251,6 +1410,12 @@ class LifeSafetyPointObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) , ReadableProperty('silenced', SilencedState) , ReadableProperty('operationExpected', LifeSafetyOperation) , OptionalProperty('maintenanceRequired', Maintenance) @@ -1283,6 +1448,12 @@ class LifeSafetyZoneObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) , ReadableProperty('silenced', SilencedState) , ReadableProperty('operationExpected', LifeSafetyOperation) , OptionalProperty('maintenanceRequired', Boolean) @@ -1290,6 +1461,36 @@ class LifeSafetyZoneObject(Object): , OptionalProperty('memberOf', SequenceOf(DeviceObjectReference)) ] +@register_object_type +class LightingOutputObject(Object): + objectType = 'lightingOutput' + properties = \ + [ WritableProperty('presentValue', Real) + , ReadableProperty('trackingValue', Real) + , WritableProperty('lightingCommand', LightingCommand) + , ReadableProperty('inProgress', LightingInProgress) + , ReadableProperty('statusFlags', StatusFlags) + , OptionalProperty('reliability', Reliability) + , ReadableProperty('outOfService', Boolean) + , ReadableProperty('blinkWarnEnable', Boolean) + , ReadableProperty('egressTime', Unsigned) + , ReadableProperty('egressActive', Boolean) + , ReadableProperty('defaultFadeTime', Unsigned) + , ReadableProperty('defaultRampRate', Real) + , ReadableProperty('defaultStepIncrement', Real) + , OptionalProperty('transition', LightingTransition) + , OptionalProperty('feedbackValue', Real) + , ReadableProperty('priorityArray', PriorityArray) + , ReadableProperty('relinquishDefault', Real) + , OptionalProperty('power', Real) + , OptionalProperty('instantaneousPower', Real) + , OptionalProperty('minActualValue', Real) + , OptionalProperty('maxActualValue', Real) + , ReadableProperty('lightingCommandDefaultPriority', Unsigned) + , OptionalProperty('covIncrement', Real) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + ] + @register_object_type class LoadControlObject(Object): objectType = 'loadControl' @@ -1316,6 +1517,12 @@ class LoadControlObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1356,6 +1563,12 @@ class LoopObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1379,6 +1592,12 @@ class MultiStateInputObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1403,6 +1622,12 @@ class MultiStateOutputObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1427,6 +1652,12 @@ class MultiStateValueObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1434,7 +1665,16 @@ class NetworkSecurityObject(Object): objectType = 'networkSecurity' properties = \ [ WritableProperty('baseDeviceSecurityPolicy', SecurityLevel) -### more + , WritableProperty('networkAccessSecurityPolicies', ArrayOf(NetworkSecurityPolicy)) + , WritableProperty('securityTimeWindow', Unsigned) + , WritableProperty('packetReorderTime', Unsigned) + , ReadableProperty('distributionKeyRevision', Unsigned) + , ReadableProperty('keySets', ArrayOf(SecurityKeySet)) + , WritableProperty('lastKeyServer', AddressBinding) + , WritableProperty('securityPDUTimeout', Unsigned) + , ReadableProperty('updateKeySetTimeout', Unsigned) + , ReadableProperty('supportedSecurityAlgorithms', SequenceOf(Unsigned)) + , WritableProperty('doNotHide', Boolean) ] @register_object_type @@ -1447,6 +1687,21 @@ class NotificationClassObject(Object): , ReadableProperty('recipientList', SequenceOf(Destination)) ] +@register_object_type +class NotificationForwarderObject(Object): + objectType = 'notificationForwarder' + properties = \ + [ ReadableProperty('statusFlags', StatusFlags) + , ReadableProperty('reliability', Reliability) + , ReadableProperty('outOfService', Boolean) + , ReadableProperty('recipientList', SequenceOf(Destination)) + , WritableProperty('subscribedRecipients', SequenceOf(EventNotificationSubscription)) + , ReadableProperty('processIdentifierFilter', ProcessIdSelection) + , OptionalProperty('portFilter', ArrayOf(PortPermission)) + , ReadableProperty('localForwardingOnly', Boolean) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + ] + @register_object_type class OctetStringValueObject(Object): objectType = 'octetstringValue' @@ -1484,6 +1739,15 @@ class PositiveIntegerValueObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + , OptionalProperty('minPresValue', Unsigned) + , OptionalProperty('maxPresValue', Unsigned) + , OptionalProperty('resolution', Unsigned) ] @register_object_type @@ -1499,6 +1763,15 @@ class ProgramObject(Object): , ReadableProperty('statusFlags', StatusFlags) , OptionalProperty('reliability', Reliability) , ReadableProperty('outOfService', Boolean) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('notificationClass', Unsigned) + , OptionalProperty('eventEnable', EventTransitionBits) + , OptionalProperty('ackedTransitions', EventTransitionBits) + , OptionalProperty('notifyType', NotifyType) + , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) + , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1531,6 +1804,12 @@ class PulseConverterObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('timeDelayNormal', Unsigned) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1547,6 +1826,16 @@ class ScheduleObject(Object): , ReadableProperty('statusFlags', StatusFlags) , ReadableProperty('reliability', Reliability) , ReadableProperty('outOfService', Boolean) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('notificationClass', Unsigned) + , OptionalProperty('eventEnable', EventTransitionBits) + , ReadableProperty('eventState', EventState) + , OptionalProperty('ackedTransitions', EventTransitionBits) + , OptionalProperty('notifyType', NotifyType) + , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) + , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1620,11 +1909,11 @@ class TrendLogObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) -# , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) -# , OptionalProperty('eventDetectionEnable', Boolean) -# , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) -# , OptionalProperty('eventAlgorithmInhibit', Boolean) -# , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] @register_object_type @@ -1657,10 +1946,9 @@ class TrendLogMultipleObject(Object): , OptionalProperty('notifyType', NotifyType) , OptionalProperty('eventTimeStamps', ArrayOf(TimeStamp)) , OptionalProperty('eventMessageTexts', ArrayOf(CharacterString)) -# , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) -# , OptionalProperty('eventDetectionEnable', Boolean) -# , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) -# , OptionalProperty('eventAlgorithmInhibit', Boolean) -# , OptionalProperty('reliabilityEvaluationInhibit', Boolean) + , OptionalProperty('eventMessageTextsConfig', ArrayOf(CharacterString)) + , OptionalProperty('eventDetectionEnable', Boolean) + , OptionalProperty('eventAlgorithmInhibitRef', ObjectPropertyReference) + , OptionalProperty('eventAlgorithmInhibit', Boolean) + , OptionalProperty('reliabilityEvaluationInhibit', Boolean) ] -