release 0.18.5

py25/bacpypes/__init__.py

@@ -18,7 +18,7 @@
 #   Project Metadata
 #
 
-__version__ = '0.18.4'
+__version__ = '0.18.5'
 __author__ = 'Joel Bender'
 __email__ = '[email protected]'
 

py25/bacpypes/object.py

@@ -2095,7 +2095,7 @@ class OctetStringValueObject(Object):
     _object_supports_cov = True
 
     properties = \
-        [ ReadableProperty('presentValue', CharacterString)
+        [ ReadableProperty('presentValue', OctetString)
         , ReadableProperty('statusFlags', StatusFlags)
         , OptionalProperty('eventState', EventState)
         , OptionalProperty('reliability', Reliability)

py25/bacpypes/service/cov.py

@@ -458,7 +458,7 @@ def cov_period_filter(self, old_value, new_value):
 
         # check for a new period
         if new_value != 0:
-            self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.cov_period_x)
+            self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.send_cov_notifications)
             self.cov_period_task.install_task()
             if _debug: PulseConverterCriteria._debug("    - new task created and installed")
 

py27/bacpypes/__init__.py

@@ -18,7 +18,7 @@
 #   Project Metadata
 #
 
-__version__ = '0.18.4'
+__version__ = '0.18.5'
 __author__ = 'Joel Bender'
 __email__ = '[email protected]'
 

py27/bacpypes/apdu.py

@@ -1241,7 +1241,7 @@ class GetEnrollmentSummaryRequestEventStateFilterType(Enumerated):
         , 'active':4
         }
 
-class GetEnrollmentSummaryRequestPriorityFilterType:
+class GetEnrollmentSummaryRequestPriorityFilterType(Sequence):
     sequenceElements = \
         [ Element('minPriority', Unsigned, 0)
         , Element('maxPriority', Unsigned, 1)

py27/bacpypes/basetypes.py

@@ -482,8 +482,8 @@ class BinaryLightingPV(Enumerated):
         { 'off':0
         , 'on':1
         , 'warn':2
-        , 'warn-off':3
-        , 'warn-relinquish':4
+        , 'warnOff':3
+        , 'warnRelinquish':4
         , 'stop':5
         }
 
@@ -1016,11 +1016,11 @@ class EventType(Enumerated):
 class FaultType(Enumerated):
     enumerations = \
         { 'none':0
-        , 'fault-characterstring':1
-        , 'fault-extended':2
-        , 'fault-life-safety':3
-        , 'fault-state':4
-        , 'fault-status-flags':5
+        , 'faultCharacterstring':1
+        , 'faultExtended':2
+        , 'faultLifeSafety':3
+        , 'faultState':4
+        , 'faultStatusFlags':5
         }
 
 class FileAccessMethod(Enumerated):
@@ -1831,7 +1831,7 @@ class Reliability(Enumerated):
         , 'lampFailure': 16
         , 'activationFailure': 17
         , 'renewDHCPFailure': 18
-        , 'renewFDRegistration-failure': 19
+        , 'renewFDRegistrationFailure': 19
         , 'restartAutoNegotiationFailure': 20
         , 'restartFailure': 21
         , 'proprietaryCommandFailure': 22
@@ -1918,12 +1918,12 @@ class VTClass(Enumerated):
     vendor_range = (64, 65535)
     enumerations = \
         { 'defaultTerminal':0
-        , 'ansiX3-64':1
+        , 'ansiX364':1
         , 'decVt52':2
         , 'decVt100':3
         , 'decVt220':4
-        , 'hp-700-94':5
-        , 'ibm-3130':6
+        , 'hp70094':5
+        , 'ibm3130':6
         }
 
 class WriteStatus(Enumerated):
@@ -3187,7 +3187,7 @@ class ValueSource(Choice):
     choiceElements = \
         [ Element('none', Null, 0)
         , Element('object', DeviceObjectReference, 1)
-        , Element('Address', Address)
+        , Element('address', Address, 2)
         ]
 
 

py27/bacpypes/object.py

@@ -1109,7 +1109,7 @@ class AnalogValueObject(Object):
 
 @register_object_type
 class AuditLogObject(Object):
-    objectType = 'analogLog'
+    objectType = 'auditLog'
 
     properties = \
         [ ReadableProperty('statusFlags', StatusFlags)
@@ -1217,7 +1217,7 @@ class BinaryInputObject(Object):
 
 @register_object_type
 class BinaryLightingOutputObject(Object):
-    objectType = 'binaryLightingOutputObject'
+    objectType = 'binaryLightingOutput'
 
     properties = \
         [ WritableProperty('presentValue', BinaryLightingPV)
@@ -2458,7 +2458,7 @@ class OctetStringValueObject(Object):
     _object_supports_cov = True
 
     properties = \
-        [ ReadableProperty('presentValue', CharacterString)
+        [ ReadableProperty('presentValue', OctetString)
         , ReadableProperty('statusFlags', StatusFlags)
         , OptionalProperty('eventState', EventState)
         , OptionalProperty('reliability', Reliability)

py27/bacpypes/primitivedata.py

@@ -1714,6 +1714,7 @@ class ObjectType(Enumerated):
         , 'program':16
         , 'pulseConverter':24
         , 'schedule':17
+        , 'staging':60
         , 'structuredView':29
         , 'timePatternValue':49
         , 'timeValue':50

py27/bacpypes/service/cov.py

@@ -456,7 +456,7 @@ def cov_period_filter(self, old_value, new_value):
 
         # check for a new period
         if new_value != 0:
-            self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.cov_period_x)
+            self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.send_cov_notifications)
             self.cov_period_task.install_task()
             if _debug: PulseConverterCriteria._debug("    - new task created and installed")
 

py34/bacpypes/__init__.py

@@ -18,7 +18,7 @@
 #   Project Metadata
 #
 
-__version__ = '0.18.4'
+__version__ = '0.18.5'
 __author__ = 'Joel Bender'
 __email__ = '[email protected]'
 

py34/bacpypes/apdu.py

@@ -1241,7 +1241,7 @@ class GetEnrollmentSummaryRequestEventStateFilterType(Enumerated):
         , 'active':4
         }
 
-class GetEnrollmentSummaryRequestPriorityFilterType:
+class GetEnrollmentSummaryRequestPriorityFilterType(Sequence):
     sequenceElements = \
         [ Element('minPriority', Unsigned, 0)
         , Element('maxPriority', Unsigned, 1)

py34/bacpypes/appservice.py

@@ -1530,7 +1530,7 @@ def confirmation(self, apdu):
                 xpdu.decode(apdu)
             except Exception as err:
                 ApplicationServiceAccessPoint._exception("complex ack decoding error: %r", err)
-                return
+                xpdu = Error(errorClass=7, errorCode=57)  # communication, invalidTag
 
         elif isinstance(apdu, ErrorPDU):
             atype = error_types.get(apdu.apduService)

py34/bacpypes/basetypes.py

@@ -482,8 +482,8 @@ class BinaryLightingPV(Enumerated):
         { 'off':0
         , 'on':1
         , 'warn':2
-        , 'warn-off':3
-        , 'warn-relinquish':4
+        , 'warnOff':3
+        , 'warnRelinquish':4
         , 'stop':5
         }
 
@@ -1016,11 +1016,11 @@ class EventType(Enumerated):
 class FaultType(Enumerated):
     enumerations = \
         { 'none':0
-        , 'fault-characterstring':1
-        , 'fault-extended':2
-        , 'fault-life-safety':3
-        , 'fault-state':4
-        , 'fault-status-flags':5
+        , 'faultCharacterstring':1
+        , 'faultExtended':2
+        , 'faultLifeSafety':3
+        , 'faultState':4
+        , 'faultStatusFlags':5
         }
 
 class FileAccessMethod(Enumerated):
@@ -1831,7 +1831,7 @@ class Reliability(Enumerated):
         , 'lampFailure': 16
         , 'activationFailure': 17
         , 'renewDHCPFailure': 18
-        , 'renewFDRegistration-failure': 19
+        , 'renewFDRegistrationFailure': 19
         , 'restartAutoNegotiationFailure': 20
         , 'restartFailure': 21
         , 'proprietaryCommandFailure': 22
@@ -1918,12 +1918,12 @@ class VTClass(Enumerated):
     vendor_range = (64, 65535)
     enumerations = \
         { 'defaultTerminal':0
-        , 'ansiX3-64':1
+        , 'ansiX364':1
         , 'decVt52':2
         , 'decVt100':3
         , 'decVt220':4
-        , 'hp-700-94':5
-        , 'ibm-3130':6
+        , 'hp70094':5
+        , 'ibm3130':6
         }
 
 class WriteStatus(Enumerated):
@@ -3187,7 +3187,7 @@ class ValueSource(Choice):
     choiceElements = \
         [ Element('none', Null, 0)
         , Element('object', DeviceObjectReference, 1)
-        , Element('Address', Address)
+        , Element('address', Address, 2)
         ]