mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

removing flakes

Browse Source
This commit is contained in:
Joel Bender 2015-07-16 16:40:47 -04:00
parent 065b2959e2
commit 946ea12701
4 changed files with 139 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
py25/bacpypes/apdu.py
View File

@ -7,10 +7,16 @@ Application Layer Protocol Data Units
from .errors import DecodingError from .errors import DecodingError
from .debugging import ModuleLogger, DebugContents, bacpypes_debugging from .debugging import ModuleLogger, DebugContents, bacpypes_debugging
from .pdu import Address, GlobalBroadcast, LocalBroadcast, LocalStation, ModuleLogger, PCI, PDU, PDUData, RemoteBroadcast, RemoteStation from .pdu import PCI, PDUData, NPDU
from .primitivedata import Address, ApplicationTag, Atomic, BitString, Boolean, CharacterString, ClosingTag, ContextTag, Date, DecodingError, Double, Enumerated, GlobalBroadcast, Integer, LocalBroadcast, LocalStation, ModuleLogger, Null, ObjectIdentifier, ObjectType, OctetString, OpeningTag, PCI, PDU, PDUData, Real, RemoteBroadcast, RemoteStation, Tag, TagList, Time, Unsigned, expand_enumerations from .primitivedata import Boolean, CharacterString, Enumerated, Integer, \
from .constructeddata import Address, Any, AnyAtomic, ApplicationTag, Array, ArrayOf, Atomic, BitString, Boolean, CharacterString, Choice, ClosingTag, ContextTag, Date, DecodingError, Double, Element, Enumerated, GlobalBroadcast, Integer, LocalBroadcast, LocalStation, ModuleLogger, Null, ObjectIdentifier, ObjectType, OctetString, OpeningTag, PCI, PDU, PDUData, Real, RemoteBroadcast, RemoteStation, Sequence, SequenceOf, Tag, TagList, Time, Unsigned ObjectIdentifier, ObjectType, OctetString, Real, TagList, Unsigned, \
from .basetypes import AccessAuthenticationFactorDisable, AccessCredentialDisable, AccessCredentialDisableReason, AccessEvent, AccessPassbackMode, AccessRule, AccessRuleLocationSpecifier, AccessRuleTimeRangeSpecifier, AccessThreatLevel, AccessUserType, AccessZoneOccupancyState, AccumulatorRecord, AccumulatorRecordAccumulatorStatus, Action, ActionCommand, ActionList, Address, AddressBinding, Any, AnyAtomic, ApplicationTag, Array, ArrayOf, AssignedAccessRights, Atomic, AuthenticationFactor, AuthenticationFactorFormat, AuthenticationFactorType, AuthenticationPolicy, AuthenticationPolicyPolicy, AuthenticationStatus, AuthorizationException, AuthorizationMode, BackupState, BinaryPV, BitString, Boolean, COVSubscription, CalendarEntry, ChannelValue, CharacterString, Choice, ClientCOV, ClosingTag, ContextTag, CredentialAuthenticationFactor, DailySchedule, Date, DateRange, DateTime, DaysOfWeek, DecodingError, Destination, DeviceAddress, DeviceObjectPropertyReference, DeviceObjectPropertyValue, DeviceObjectReference, DeviceStatus, DoorAlarmState, DoorSecuredStatus, DoorStatus, DoorValue, Double, Element, EngineeringUnits, Enumerated, ErrorClass, ErrorCode, ErrorType, EventNotificationSubscription, EventParameter, EventParameterAccessEvent, EventParameterAccessEventAccessEvent, EventParameterBufferReady, EventParameterChangeOfBitstring, EventParameterChangeOfCharacterString, EventParameterChangeOfLifeSafety, EventParameterChangeOfState, EventParameterChangeOfStatusFlags, EventParameterChangeOfValue, EventParameterChangeOfValueCOVCriteria, EventParameterCommandFailure, EventParameterDoubleOutOfRange, EventParameterExtended, EventParameterExtendedParameters, EventParameterFloatingLimit, EventParameterOutOfRange, EventParameterSignedOutOfRange, EventParameterUnsignedOutOfRange, EventParameterUnsignedRange, EventState, EventTransitionBits, EventType, FaultParameter, FaultParameterCharacterString, FaultParameterExtended, FaultParameterExtendedParameters, FaultParameterLifeSafety, FaultParameterState, FaultParameterStatusFlags, FaultType, FileAccessMethod, GlobalBroadcast, Integer, KeyIdentifier, LifeSafetyMode, LifeSafetyOperation, LifeSafetyState, LightingCommand, LightingInProgress, LightingOperation, LightingTransition, LimitEnable, LocalBroadcast, LocalStation, LockStatus, LogData, LogDataLogData, LogMultipleRecord, LogRecord, LogRecordLogDatum, LogStatus, LoggingType, Maintenance, ModuleLogger, NetworkSecurityPolicy, NodeType, NotificationParameters, NotificationParametersAccessEventType, NotificationParametersBufferReady, NotificationParametersChangeOfBitstring, NotificationParametersChangeOfCharacterStringType, NotificationParametersChangeOfLifeSafety, NotificationParametersChangeOfState, NotificationParametersChangeOfStatusFlagsType, NotificationParametersChangeOfValue, NotificationParametersChangeOfValueNewValue, NotificationParametersCommandFailure, NotificationParametersComplexEventType, NotificationParametersDoubleOutOfRangeType, NotificationParametersExtended, NotificationParametersExtendedParametersType, NotificationParametersFloatingLimit, NotificationParametersOutOfRange, NotificationParametersSignedOutOfRangeType, NotificationParametersUnsignedOutOfRangeType, NotificationParametersUnsignedRange, NotifyType, Null, ObjectIdentifier, ObjectPropertyReference, ObjectPropertyValue, ObjectType, ObjectTypesSupported, OctetString, OpeningTag, OptionalCharacterString, PCI, PDU, PDUData, Polarity, PortPermission, Prescale, PriorityArray, PriorityValue, ProcessIdSelection, ProgramError, ProgramRequest, ProgramState, PropertyAccessResult, PropertyAccessResultAccessResult, PropertyIdentifier, PropertyReference, PropertyStates, PropertyValue, Real, Recipient, RecipientProcess, Reliability, RemoteBroadcast, RemoteStation, RestartReason, ResultFlags, Scale, SecurityKeySet, SecurityLevel, SecurityPolicy, Segmentation, Sequence, SequenceOf, ServicesSupported, SetpointReference, ShedLevel, ShedState, SilencedState, SpecialEvent, SpecialEventPeriod, StatusFlags, Tag, TagList, Time, TimeStamp, TimeValue, Unsigned, VTClass, VTSession, WeekNDay, WriteStatus expand_enumerations
from .constructeddata import Any, Choice, Element, Sequence, SequenceOf
from .basetypes import ChannelValue, DateTime, DeviceAddress, ErrorType, \
EventState, EventTransitionBits, EventType, LifeSafetyOperation, \
NotificationParameters, NotifyType, ObjectPropertyReference, \
PropertyIdentifier, PropertyReference, PropertyValue, RecipientProcess, \
ResultFlags, Segmentation, TimeStamp, VTClass
# some debugging # some debugging
_debug = 0 _debug = 0
@ -346,7 +352,7 @@ class APDU(APCI, PDUData):
def dict_contents(self, use_dict=None, as_class=dict): def dict_contents(self, use_dict=None, as_class=dict):
"""Return the contents of an object as a dict.""" """Return the contents of an object as a dict."""
if _debug: NPDU._debug("dict_contents use_dict=%r as_class=%r key_values=%r", use_dict, as_class, key_values) if _debug: NPDU._debug("dict_contents use_dict=%r as_class=%r", use_dict, as_class)
# make/extend the dictionary of content # make/extend the dictionary of content
if use_dict is None: if use_dict is None:

162
py25/bacpypes/object.py
View File

@ -482,7 +482,6 @@ class Object(Logging):
# Standard Object Types # Standard Object Types
# #
@register_object_type
class AccessCredentialObject(Object): class AccessCredentialObject(Object):
objectType = 'accessCredential' objectType = 'accessCredential'
properties = \ properties = \
@ -513,7 +512,8 @@ class AccessCredentialObject(Object):
# , OptionalProperty('occupancyExemption', Boolean) # , OptionalProperty('occupancyExemption', Boolean)
] ]
@register_object_type register_object_type(AccessCredentialObject)
class AccessDoorObject(Object): class AccessDoorObject(Object):
objectType = 'accessDoor' objectType = 'accessDoor'
properties = \ properties = \
@ -550,7 +550,8 @@ class AccessDoorObject(Object):
, OptionalProperty('eventAlgorithmInhibit', Boolean) , OptionalProperty('eventAlgorithmInhibit', Boolean)
] ]
@register_object_type register_object_type(AccessDoorObject)
class AccessPointObject(Object): class AccessPointObject(Object):
objectType = 'accessPoint' objectType = 'accessPoint'
properties = \ properties = \
@ -602,7 +603,8 @@ class AccessPointObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AccessPointObject)
class AccessRightsObject(Object): class AccessRightsObject(Object):
objectType = 'accessRights' objectType = 'accessRights'
properties = \ properties = \
@ -616,7 +618,8 @@ class AccessRightsObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AccessRightsObject)
class AccessUserObject(Object): class AccessUserObject(Object):
objectType = 'accessUser' objectType = 'accessUser'
properties = \ properties = \
@ -632,7 +635,8 @@ class AccessUserObject(Object):
, ReadableProperty('credentials', SequenceOf(DeviceObjectReference)) , ReadableProperty('credentials', SequenceOf(DeviceObjectReference))
] ]
@register_object_type register_object_type(AccessUserObject)
class AccessZoneObject(Object): class AccessZoneObject(Object):
objectType = 'accessZone' objectType = 'accessZone'
properties = \ properties = \
@ -672,7 +676,8 @@ class AccessZoneObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AccessZoneObject)
class AccumulatorObject(Object): class AccumulatorObject(Object):
objectType = 'accumulator' objectType = 'accumulator'
properties = \ properties = \
@ -711,7 +716,8 @@ class AccumulatorObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AccumulatorObject)
class AlertEnrollmentObject(Object): class AlertEnrollmentObject(Object):
objectType = 'alertEnrollment' objectType = 'alertEnrollment'
properties = \ properties = \
@ -729,7 +735,8 @@ class AlertEnrollmentObject(Object):
, OptionalProperty('eventAlgorithmInhibit', Boolean) , OptionalProperty('eventAlgorithmInhibit', Boolean)
] ]
@register_object_type register_object_type(AlertEnrollmentObject)
class AnalogInputObject(Object): class AnalogInputObject(Object):
objectType = 'analogInput' objectType = 'analogInput'
properties = \ properties = \
@ -764,7 +771,8 @@ class AnalogInputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AnalogInputObject)
class AnalogOutputObject(Object): class AnalogOutputObject(Object):
objectType = 'analogOutput' objectType = 'analogOutput'
properties = \ properties = \
@ -800,7 +808,8 @@ class AnalogOutputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AnalogOutputObject)
class AnalogValueObject(Object): class AnalogValueObject(Object):
objectType = 'analogValue' objectType = 'analogValue'
properties = \ properties = \
@ -835,7 +844,8 @@ class AnalogValueObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(AnalogValueObject)
class AveragingObject(Object): class AveragingObject(Object):
objectType = 'averaging' objectType = 'averaging'
properties = \ properties = \
@ -852,7 +862,8 @@ class AveragingObject(Object):
, WritableProperty('windowSamples', Unsigned) , WritableProperty('windowSamples', Unsigned)
] ]
@register_object_type register_object_type(AveragingObject)
class BinaryInputObject(Object): class BinaryInputObject(Object):
objectType = 'binaryInput' objectType = 'binaryInput'
properties = \ properties = \
@ -886,7 +897,8 @@ class BinaryInputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(BinaryInputObject)
class BinaryOutputObject(Object): class BinaryOutputObject(Object):
objectType = 'binaryOutput' objectType = 'binaryOutput'
properties = \ properties = \
@ -924,7 +936,8 @@ class BinaryOutputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(BinaryOutputObject)
class BinaryValueObject(Object): class BinaryValueObject(Object):
objectType = 'binaryValue' objectType = 'binaryValue'
properties = \ properties = \
@ -960,7 +973,8 @@ class BinaryValueObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(BinaryValueObject)
class BitStringValueObject(Object): class BitStringValueObject(Object):
objectType = 'bitstringValue' objectType = 'bitstringValue'
properties = \ properties = \
@ -989,7 +1003,8 @@ class BitStringValueObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(BitStringValueObject)
class CalendarObject(Object): class CalendarObject(Object):
objectType = 'calendar' objectType = 'calendar'
properties = \ properties = \
@ -997,7 +1012,8 @@ class CalendarObject(Object):
, ReadableProperty('dateList', SequenceOf(CalendarEntry)) , ReadableProperty('dateList', SequenceOf(CalendarEntry))
] ]
@register_object_type register_object_type(CalendarObject)
class ChannelObject(Object): class ChannelObject(Object):
objectType = 'channel' objectType = 'channel'
properties = \ properties = \
@ -1024,7 +1040,8 @@ class ChannelObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(ChannelObject)
class CharacterStringValueObject(Object): class CharacterStringValueObject(Object):
objectType = 'characterstringValue' objectType = 'characterstringValue'
properties = \ properties = \
@ -1052,7 +1069,8 @@ class CharacterStringValueObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(CharacterStringValueObject)
class CommandObject(Object): class CommandObject(Object):
objectType = 'command' objectType = 'command'
properties = \ properties = \
@ -1063,7 +1081,8 @@ class CommandObject(Object):
, OptionalProperty('actionText', ArrayOf(CharacterString)) , OptionalProperty('actionText', ArrayOf(CharacterString))
] ]
@register_object_type register_object_type(CommandObject)
class CredentialDataInputObject(Object): class CredentialDataInputObject(Object):
objectType = 'credentialDataInput' objectType = 'credentialDataInput'
properties = \ properties = \
@ -1085,7 +1104,8 @@ class CredentialDataInputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(CredentialDataInputObject)
class DatePatternValueObject(Object): class DatePatternValueObject(Object):
objectType = 'datePatternValue' objectType = 'datePatternValue'
properties = \ properties = \
@ -1098,7 +1118,8 @@ class DatePatternValueObject(Object):
, OptionalProperty('relinquishDefault', Date) , OptionalProperty('relinquishDefault', Date)
] ]
@register_object_type register_object_type(DatePatternValueObject)
class DateValueObject(Object): class DateValueObject(Object):
objectType = 'dateValue' objectType = 'dateValue'
properties = \ properties = \
@ -1111,7 +1132,8 @@ class DateValueObject(Object):
, OptionalProperty('relinquishDefault', Date) , OptionalProperty('relinquishDefault', Date)
] ]
@register_object_type register_object_type(DateValueObject)
class DateTimePatternValueObject(Object): class DateTimePatternValueObject(Object):
objectType = 'datetimePatternValue' objectType = 'datetimePatternValue'
properties = \ properties = \
@ -1125,7 +1147,8 @@ class DateTimePatternValueObject(Object):
, OptionalProperty('isUtc', Boolean) , OptionalProperty('isUtc', Boolean)
] ]
@register_object_type register_object_type(DateTimePatternValueObject)
class DateTimeValueObject(Object): class DateTimeValueObject(Object):
objectType = 'datetimeValue' objectType = 'datetimeValue'
properties = \ properties = \
@ -1139,7 +1162,8 @@ class DateTimeValueObject(Object):
, OptionalProperty('isUtc', Boolean) , OptionalProperty('isUtc', Boolean)
] ]
@register_object_type register_object_type(DateTimeValueObject)
class DeviceObject(Object): class DeviceObject(Object):
objectType = 'device' objectType = 'device'
properties = \ properties = \
@ -1194,7 +1218,8 @@ class DeviceObject(Object):
, OptionalProperty('intervalOffset', Unsigned) , OptionalProperty('intervalOffset', Unsigned)
] ]
@register_object_type register_object_type(DeviceObject)
class EventEnrollmentObject(Object): class EventEnrollmentObject(Object):
objectType = 'eventEnrollment' objectType = 'eventEnrollment'
properties = \ properties = \
@ -1220,6 +1245,8 @@ class EventEnrollmentObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
register_object_type(EventEnrollmentObject)
#----- #-----
class EventLogRecordLogDatum(Choice): class EventLogRecordLogDatum(Choice):
@ -1235,7 +1262,6 @@ class EventLogRecord(Sequence):
, Element('logDatum', EventLogRecordLogDatum, 1) , Element('logDatum', EventLogRecordLogDatum, 1)
] ]
@register_object_type
class EventLogObject(Object): class EventLogObject(Object):
objectType = 'eventLog' objectType = 'eventLog'
properties = \ properties = \
@ -1265,9 +1291,10 @@ class EventLogObject(Object):
, OptionalProperty('eventAlgorithmInhibit', Boolean) , OptionalProperty('eventAlgorithmInhibit', Boolean)
] ]
register_object_type(EventLogObject)
#----- #-----
@register_object_type
class FileObject(Object): class FileObject(Object):
objectType = 'file' objectType = 'file'
properties = \ properties = \
@ -1280,9 +1307,10 @@ class FileObject(Object):
, OptionalProperty('recordCount', Unsigned) , OptionalProperty('recordCount', Unsigned)
] ]
register_object_type(FileObject)
#----- #-----
@register_object_type
class GlobalGroupObject(Object): class GlobalGroupObject(Object):
objectType = 'globalGroup' objectType = 'globalGroup'
properties = \ properties = \
@ -1315,7 +1343,8 @@ class GlobalGroupObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(GlobalGroupObject)
class GroupObject(Object): class GroupObject(Object):
objectType = 'group' objectType = 'group'
properties = \ properties = \
@ -1323,7 +1352,8 @@ class GroupObject(Object):
, ReadableProperty('presentValue', SequenceOf(ReadAccessResult)) , ReadableProperty('presentValue', SequenceOf(ReadAccessResult))
] ]
@register_object_type register_object_type(GroupObject)
class IntegerValueObject(Object): class IntegerValueObject(Object):
objectType = 'integerValue' objectType = 'integerValue'
properties = \ properties = \
@ -1358,7 +1388,8 @@ class IntegerValueObject(Object):
, OptionalProperty('resolution', Integer) , OptionalProperty('resolution', Integer)
] ]
@register_object_type register_object_type(IntegerValueObject)
class LargeAnalogValueObject(Object): class LargeAnalogValueObject(Object):
objectType = 'largeAnalogValue' objectType = 'largeAnalogValue'
properties = \ properties = \
@ -1393,7 +1424,8 @@ class LargeAnalogValueObject(Object):
, OptionalProperty('resolution', Double) , OptionalProperty('resolution', Double)
] ]
@register_object_type register_object_type(LargeAnalogValueObject)
class LifeSafetyPointObject(Object): class LifeSafetyPointObject(Object):
objectType = 'lifeSafetyPoint' objectType = 'lifeSafetyPoint'
properties = \ properties = \
@ -1431,7 +1463,8 @@ class LifeSafetyPointObject(Object):
, OptionalProperty('memberOf', SequenceOf(DeviceObjectReference)) , OptionalProperty('memberOf', SequenceOf(DeviceObjectReference))
] ]
@register_object_type register_object_type(LifeSafetyPointObject)
class LifeSafetyZoneObject(Object): class LifeSafetyZoneObject(Object):
objectType = 'lifeSafetyZone' objectType = 'lifeSafetyZone'
properties = \ properties = \
@ -1467,7 +1500,8 @@ class LifeSafetyZoneObject(Object):
, OptionalProperty('memberOf', SequenceOf(DeviceObjectReference)) , OptionalProperty('memberOf', SequenceOf(DeviceObjectReference))
] ]
@register_object_type register_object_type(LifeSafetyZoneObject)
class LightingOutputObject(Object): class LightingOutputObject(Object):
objectType = 'lightingOutput' objectType = 'lightingOutput'
properties = \ properties = \
@ -1497,7 +1531,8 @@ class LightingOutputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(LightingOutputObject)
class LoadControlObject(Object): class LoadControlObject(Object):
objectType = 'loadControl' objectType = 'loadControl'
properties = \ properties = \
@ -1531,7 +1566,8 @@ class LoadControlObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(LoadControlObject)
class LoopObject(Object): class LoopObject(Object):
objectType = 'loop' objectType = 'loop'
properties = \ properties = \
@ -1577,7 +1613,8 @@ class LoopObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(LoopObject)
class MultiStateInputObject(Object): class MultiStateInputObject(Object):
objectType = 'multiStateInput' objectType = 'multiStateInput'
properties = \ properties = \
@ -1606,7 +1643,8 @@ class MultiStateInputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(MultiStateInputObject)
class MultiStateOutputObject(Object): class MultiStateOutputObject(Object):
objectType = 'multiStateOutput' objectType = 'multiStateOutput'
properties = \ properties = \
@ -1636,7 +1674,8 @@ class MultiStateOutputObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(MultiStateOutputObject)
class MultiStateValueObject(Object): class MultiStateValueObject(Object):
objectType = 'multiStateValue' objectType = 'multiStateValue'
properties = \ properties = \
@ -1666,7 +1705,8 @@ class MultiStateValueObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(MultiStateValueObject)
class NetworkSecurityObject(Object): class NetworkSecurityObject(Object):
objectType = 'networkSecurity' objectType = 'networkSecurity'
properties = \ properties = \
@ -1683,7 +1723,8 @@ class NetworkSecurityObject(Object):
, WritableProperty('doNotHide', Boolean) , WritableProperty('doNotHide', Boolean)
] ]
@register_object_type register_object_type(NetworkSecurityObject)
class NotificationClassObject(Object): class NotificationClassObject(Object):
objectType = 'notificationClass' objectType = 'notificationClass'
properties = \ properties = \
@ -1693,7 +1734,8 @@ class NotificationClassObject(Object):
, ReadableProperty('recipientList', SequenceOf(Destination)) , ReadableProperty('recipientList', SequenceOf(Destination))
] ]
@register_object_type register_object_type(NotificationClassObject)
class NotificationForwarderObject(Object): class NotificationForwarderObject(Object):
objectType = 'notificationForwarder' objectType = 'notificationForwarder'
properties = \ properties = \
@ -1708,7 +1750,8 @@ class NotificationForwarderObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(NotificationForwarderObject)
class OctetStringValueObject(Object): class OctetStringValueObject(Object):
objectType = 'octetstringValue' objectType = 'octetstringValue'
properties = \ properties = \
@ -1721,7 +1764,8 @@ class OctetStringValueObject(Object):
, OptionalProperty('relinquishDefault', OctetString) , OptionalProperty('relinquishDefault', OctetString)
] ]
@register_object_type register_object_type(OctetStringValueObject)
class PositiveIntegerValueObject(Object): class PositiveIntegerValueObject(Object):
objectType = 'positiveIntegerValue' objectType = 'positiveIntegerValue'
properties = \ properties = \
@ -1756,7 +1800,8 @@ class PositiveIntegerValueObject(Object):
, OptionalProperty('resolution', Unsigned) , OptionalProperty('resolution', Unsigned)
] ]
@register_object_type register_object_type(PositiveIntegerValueObject)
class ProgramObject(Object): class ProgramObject(Object):
objectType = 'program' objectType = 'program'
properties = \ properties = \
@ -1780,7 +1825,8 @@ class ProgramObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(ProgramObject)
class PulseConverterObject(Object): class PulseConverterObject(Object):
objectType = 'pulseConverter' objectType = 'pulseConverter'
properties = \ properties = \
@ -1818,7 +1864,8 @@ class PulseConverterObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(PulseConverterObject)
class ScheduleObject(Object): class ScheduleObject(Object):
objectType = 'schedule' objectType = 'schedule'
properties = \ properties = \
@ -1844,7 +1891,8 @@ class ScheduleObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(ScheduleObject)
class StructuredViewObject(Object): class StructuredViewObject(Object):
objectType = 'structuredView' objectType = 'structuredView'
properties = \ properties = \
@ -1854,7 +1902,8 @@ class StructuredViewObject(Object):
, OptionalProperty('subordinateAnnotations', ArrayOf(CharacterString)) , OptionalProperty('subordinateAnnotations', ArrayOf(CharacterString))
] ]
@register_object_type register_object_type(StructuredViewObject)
class TimePatternValueObject(Object): class TimePatternValueObject(Object):
objectType = 'timePatternValue' objectType = 'timePatternValue'
properties = \ properties = \
@ -1867,7 +1916,8 @@ class TimePatternValueObject(Object):
, OptionalProperty('relinquishDefault', Time) , OptionalProperty('relinquishDefault', Time)
] ]
@register_object_type register_object_type(TimePatternValueObject)
class TimeValueObject(Object): class TimeValueObject(Object):
objectType = 'timeValue' objectType = 'timeValue'
properties = \ properties = \
@ -1880,7 +1930,8 @@ class TimeValueObject(Object):
, OptionalProperty('relinquishDefault', Time) , OptionalProperty('relinquishDefault', Time)
] ]
@register_object_type register_object_type(TimeValueObject)
class TrendLogObject(Object): class TrendLogObject(Object):
objectType = 'trendLog' objectType = 'trendLog'
properties = \ properties = \
@ -1922,7 +1973,8 @@ class TrendLogObject(Object):
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
@register_object_type register_object_type(TrendLogObject)
class TrendLogMultipleObject(Object): class TrendLogMultipleObject(Object):
objectType = 'trendLogMultiple' objectType = 'trendLogMultiple'
properties = \ properties = \
@ -1958,3 +2010,5 @@ class TrendLogMultipleObject(Object):
, OptionalProperty('eventAlgorithmInhibit', Boolean) , OptionalProperty('eventAlgorithmInhibit', Boolean)
, OptionalProperty('reliabilityEvaluationInhibit', Boolean) , OptionalProperty('reliabilityEvaluationInhibit', Boolean)
] ]
register_object_type(TrendLogMultipleObject)

14
py27/bacpypes/apdu.py
View File

@ -7,10 +7,16 @@ Application Layer Protocol Data Units
from .errors import DecodingError from .errors import DecodingError
from .debugging import ModuleLogger, DebugContents, bacpypes_debugging from .debugging import ModuleLogger, DebugContents, bacpypes_debugging
from .pdu import * from .pdu import PCI, PDUData, NPDU
from .primitivedata import * from .primitivedata import Boolean, CharacterString, Enumerated, Integer, \
from .constructeddata import * ObjectIdentifier, ObjectType, OctetString, Real, TagList, Unsigned, \
from .basetypes import * expand_enumerations
from .constructeddata import Any, Choice, Element, Sequence, SequenceOf
from .basetypes import ChannelValue, DateTime, DeviceAddress, ErrorType, \
EventState, EventTransitionBits, EventType, LifeSafetyOperation, \
NotificationParameters, NotifyType, ObjectPropertyReference, \
PropertyIdentifier, PropertyReference, PropertyValue, RecipientProcess, \
ResultFlags, Segmentation, TimeStamp, VTClass
# some debugging # some debugging
_debug = 0 _debug = 0

14
py34/bacpypes/apdu.py
View File

@ -7,10 +7,16 @@ Application Layer Protocol Data Units
from .errors import DecodingError from .errors import DecodingError
from .debugging import ModuleLogger, DebugContents, bacpypes_debugging from .debugging import ModuleLogger, DebugContents, bacpypes_debugging
from .pdu import * from .pdu import PCI, PDUData, NPDU
from .primitivedata import * from .primitivedata import Boolean, CharacterString, Enumerated, Integer, \
from .constructeddata import * ObjectIdentifier, ObjectType, OctetString, Real, TagList, Unsigned, \
from .basetypes import * expand_enumerations
from .constructeddata import Any, Choice, Element, Sequence, SequenceOf
from .basetypes import ChannelValue, DateTime, DeviceAddress, ErrorType, \
EventState, EventTransitionBits, EventType, LifeSafetyOperation, \
NotificationParameters, NotifyType, ObjectPropertyReference, \
PropertyIdentifier, PropertyReference, PropertyValue, RecipientProcess, \
ResultFlags, Segmentation, TimeStamp, VTClass
# some debugging # some debugging
_debug = 0 _debug = 0