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

missing imports and ordering

Browse Source
This commit is contained in:
Joel Bender 2019-03-25 21:36:12 -04:00
parent 0eb4af119a
commit b5a9c5defc
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
py34/bacpypes/basetypes.py
View File

@ -8,7 +8,7 @@ from .debugging import ModuleLogger
from .primitivedata import BitString, Boolean, CharacterString, Date, Double, \
Enumerated, Integer, Null, ObjectIdentifier, OctetString, Real, Time, \
Unsigned
Unsigned, Unsigned16
from .constructeddata import Any, AnyAtomic, ArrayOf, Choice, Element, \
Sequence, SequenceOf
@ -1615,6 +1615,7 @@ class WriteStatus(Enumerated):
, 'successful':2
, 'failed':3
}
class NetworkType(Enumerated):
enumerations = \
{ 'ethernet':0
@ -1678,6 +1679,13 @@ class RouterEntryStatus(Enumerated):
# Forward Sequences
#
class HostAddress(Choice):
choiceElements = \
[ Element('none', Null)
, Element('ipAddress', OctetString) # 4 octets for B/IP or 16 octets for B/IPv6
, Element('name', CharacterString) # Internet host name (see RFC 1123)
]
class HostNPort(Sequence):
sequenceElements = \
[ Element('host', HostAddress)
@ -1713,7 +1721,7 @@ class RouterEntry(Sequence):
class NameValue(Sequence):
sequenceElements = \
[ Element('name', CharacterString)
, Element('value', Atomic) # IS ATOMIC CORRECT HERE? value is limited to primitive datatypes and BACnetDateTime
, Element('value', AnyAtomic) # IS ATOMIC CORRECT HERE? value is limited to primitive datatypes and BACnetDateTime
]
class DeviceAddress(Sequence):
@ -1771,13 +1779,6 @@ class ObjectPropertyReference(Sequence):
, Element('propertyArrayIndex', Unsigned, 2, True)
]
class HostAddress(Choice):
choiceElements = \
[ Element('none', Null)
, Element('ipAddress', OctetString) # 4 octets for B/IP or 16 octets for B/IPv6
, Element('name', CharacterString) # Internet host name (see RFC 1123)
]
class ProcessIdSelection(Choice):
choiceElements = \
[ Element('processIdentifier', Unsigned)

16
py34/bacpypes/object.py
View File

@ -22,24 +22,26 @@ from .basetypes import AccessCredentialDisable, AccessCredentialDisableReason, \
AccessUserType, AccessZoneOccupancyState, AccumulatorRecord, Action, \
ActionList, AddressBinding, AssignedAccessRights, AuthenticationFactor, \
AuthenticationFactorFormat, AuthenticationPolicy, AuthenticationStatus, \
AuthorizationException, AuthorizationMode, BackupState, BinaryPV, \
AuthorizationException, AuthorizationMode, BackupState, BDTEntry, BinaryPV, \
COVSubscription, CalendarEntry, ChannelValue, ClientCOV, \
CredentialAuthenticationFactor, DailySchedule, DateRange, DateTime, \
Destination, DeviceObjectPropertyReference, DeviceObjectReference, \
DeviceStatus, DoorAlarmState, DoorSecuredStatus, DoorStatus, DoorValue, \
EngineeringUnits, EventNotificationSubscription, EventParameter, \
EventState, EventTransitionBits, EventType, FaultParameter, FaultType, \
FileAccessMethod, LifeSafetyMode, LifeSafetyOperation, LifeSafetyState, \
FileAccessMethod, FDTEntry, IPMode, HostNPort, LifeSafetyMode, LifeSafetyOperation, LifeSafetyState, \
LightingCommand, LightingInProgress, LightingTransition, LimitEnable, \
LockStatus, LogMultipleRecord, LogRecord, LogStatus, LoggingType, \
Maintenance, NetworkSecurityPolicy, NodeType, NotifyType, \
Maintenance, NameValue, NetworkNumberQuality, NetworkPortCommand, \
NetworkSecurityPolicy, NetworkType, NodeType, NotifyType, \
ObjectPropertyReference, ObjectTypesSupported, OptionalCharacterString, \
Polarity, PortPermission, Prescale, PriorityArray, ProcessIdSelection, \
ProgramError, ProgramRequest, ProgramState, PropertyAccessResult, \
PropertyIdentifier, Recipient, Reliability, RestartReason, Scale, \
SecurityKeySet, SecurityLevel, Segmentation, ServicesSupported, \
SetpointReference, ShedLevel, ShedState, SilencedState, SpecialEvent, \
StatusFlags, TimeStamp, VTClass, VTSession, WriteStatus
PropertyIdentifier, ProtocolLevel, Recipient, Reliability, RestartReason, \
RouterEntry, Scale, SecurityKeySet, SecurityLevel, Segmentation, \
ServicesSupported, SetpointReference, ShedLevel, ShedState, SilencedState, \
SpecialEvent, StatusFlags, TimeStamp, VTClass, VTSession, VMACEntry, \
WriteStatus
from .apdu import EventNotificationParameters, ReadAccessSpecification, \
ReadAccessResult