From b608859e1bb19b59a6d9d86ff2e533f1936771e8 Mon Sep 17 00:00:00 2001 From: Bob Fox Date: Thu, 7 Jul 2016 15:07:48 -0500 Subject: [PATCH 1/2] make Service Parameters optional for ConfirmedPrivateTransferRequest --- py25/bacpypes/apdu.py | 2 +- py27/bacpypes/apdu.py | 2 +- py34/bacpypes/apdu.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py25/bacpypes/apdu.py b/py25/bacpypes/apdu.py index c2510d5..1f1721f 100755 --- a/py25/bacpypes/apdu.py +++ b/py25/bacpypes/apdu.py @@ -1504,7 +1504,7 @@ class ConfirmedPrivateTransferRequest(ConfirmedRequestSequence): sequenceElements = \ [ Element('vendorID', Unsigned, 0) , Element('serviceNumber', Unsigned, 1) - , Element('serviceParameters', Any, 2) + , Element('serviceParameters', Any, 2, True) ] register_confirmed_request_type(ConfirmedPrivateTransferRequest) diff --git a/py27/bacpypes/apdu.py b/py27/bacpypes/apdu.py index eb81f5e..ff6de97 100755 --- a/py27/bacpypes/apdu.py +++ b/py27/bacpypes/apdu.py @@ -1497,7 +1497,7 @@ class ConfirmedPrivateTransferRequest(ConfirmedRequestSequence): sequenceElements = \ [ Element('vendorID', Unsigned, 0) , Element('serviceNumber', Unsigned, 1) - , Element('serviceParameters', Any, 2) + , Element('serviceParameters', Any, 2, True) ] register_confirmed_request_type(ConfirmedPrivateTransferRequest) diff --git a/py34/bacpypes/apdu.py b/py34/bacpypes/apdu.py index 09b0391..7396478 100755 --- a/py34/bacpypes/apdu.py +++ b/py34/bacpypes/apdu.py @@ -1496,7 +1496,7 @@ class ConfirmedPrivateTransferRequest(ConfirmedRequestSequence): sequenceElements = \ [ Element('vendorID', Unsigned, 0) , Element('serviceNumber', Unsigned, 1) - , Element('serviceParameters', Any, 2) + , Element('serviceParameters', Any, 2, True) ] register_confirmed_request_type(ConfirmedPrivateTransferRequest) From 73bf17f4539f1abc60b45d7cdc97d45f1713747d Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Fri, 8 Jul 2016 16:32:31 -0400 Subject: [PATCH 2/2] resultBlock parameter in ack is also optional #86 --- py25/bacpypes/apdu.py | 2 +- py27/bacpypes/apdu.py | 2 +- py34/bacpypes/apdu.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py25/bacpypes/apdu.py b/py25/bacpypes/apdu.py index 1f1721f..c9bded4 100755 --- a/py25/bacpypes/apdu.py +++ b/py25/bacpypes/apdu.py @@ -1514,7 +1514,7 @@ class ConfirmedPrivateTransferACK(ComplexAckSequence): sequenceElements = \ [ Element('vendorID', Unsigned, 0) , Element('serviceNumber', Unsigned, 1) - , Element('resultBlock', Any, 2) + , Element('resultBlock', Any, 2, True) ] register_complex_ack_type(ConfirmedPrivateTransferACK) diff --git a/py27/bacpypes/apdu.py b/py27/bacpypes/apdu.py index ff6de97..8647cc2 100755 --- a/py27/bacpypes/apdu.py +++ b/py27/bacpypes/apdu.py @@ -1507,7 +1507,7 @@ class ConfirmedPrivateTransferACK(ComplexAckSequence): sequenceElements = \ [ Element('vendorID', Unsigned, 0) , Element('serviceNumber', Unsigned, 1) - , Element('resultBlock', Any, 2) + , Element('resultBlock', Any, 2, True) ] register_complex_ack_type(ConfirmedPrivateTransferACK) diff --git a/py34/bacpypes/apdu.py b/py34/bacpypes/apdu.py index 7396478..473e233 100755 --- a/py34/bacpypes/apdu.py +++ b/py34/bacpypes/apdu.py @@ -1506,7 +1506,7 @@ class ConfirmedPrivateTransferACK(ComplexAckSequence): sequenceElements = \ [ Element('vendorID', Unsigned, 0) , Element('serviceNumber', Unsigned, 1) - , Element('resultBlock', Any, 2) + , Element('resultBlock', Any, 2, True) ] register_complex_ack_type(ConfirmedPrivateTransferACK)