Skip to content

bug/bacnet protocol version #1215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 2 commits into from
Apr 4, 2025
Merged

bug/bacnet protocol version #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd815f0
Resolve and use device address for reads
jhughesoti Mar 19, 2025
faf825c
Merge branch 'dev' into bug/bacnet_protocol_version
jboddey Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/test/protocol/python/src/protocol_bacnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ def validate_device(self):
return result, description


def validate_protocol_version(self, device_ip, device_id):
def validate_protocol_version(self, device_addr, device_id):
LOGGER.info(f'Resolving protocol version for BACnet device: {device_id}')
try:
version = self.bacnet.read(
f'{device_ip} device {device_id} protocolVersion')
f'{device_addr} device {device_id} protocolVersion')
revision = self.bacnet.read(
f'{device_ip} device {device_id} protocolRevision')
f'{device_addr} device {device_id} protocolRevision')
protocol_version = f'{version}.{revision}'
result = True
result_description = f'Device uses BACnet version {protocol_version}'
Expand Down
5 changes: 3 additions & 2 deletions modules/test/protocol/python/src/protocol_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ def _protocol_bacnet_version(self):
if len(self._bacnet.devices) > 0:
for device in self._bacnet.devices:
LOGGER.debug(f'Checking BACnet version for device: {device}')
device_addr = device[2]
device_id = device[3]
result_status, result_description = \
self._bacnet.validate_protocol_version(self._device_ipv4_addr,
device[3])
self._bacnet.validate_protocol_version(device_addr,device_id)
break

LOGGER.info(result_description)
Expand Down