Skip to content

Commit 0a199e2

Browse files
authored
Support for fetching the VendorIdentifier and SerialNumber information from BACnet device
Added support for extracting deviceIdentifier and serialNumber from actual device.
1 parent 23ae720 commit 0a199e2

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

api/src/main/java/org/code_house/bacnet4j/wrapper/api/Device.java

+18
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class Device {
3939

4040
private String modelName = "";
4141
private String vendorName = "";
42+
private int vendorIdentifier ;
43+
private String serialNumber = "";
4244
private String name = "";
4345
private boolean readMultiple;
4446

@@ -85,6 +87,22 @@ public String getVendorName() {
8587
return vendorName;
8688
}
8789

90+
public int getVendorIdentifier() {
91+
return vendorIdentifier;
92+
}
93+
94+
public void setVendorIdentifier(int vendorIdentifier) {
95+
this.vendorIdentifier = vendorIdentifier;
96+
}
97+
98+
public String getSerialNumber() {
99+
return serialNumber;
100+
}
101+
102+
public void setSerialNumber(String serialNumber) {
103+
this.serialNumber = serialNumber;
104+
}
105+
88106
public void setName(String name) {
89107
this.name = name;
90108
}

api/src/main/java/org/code_house/bacnet4j/wrapper/api/DiscoveryEventAdapter.java

+7
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ protected Device createDevice(RemoteDevice d) {
9595
if (d.getVendorName() != null && !d.getVendorName().isEmpty()) {
9696
device.setVendorName(d.getVendorName());
9797
}
98+
if (d.getVendorIdentifier() != -1) {
99+
device.setVendorName(d.getVendorName());
100+
}
101+
if (d.getCharacterStringProperty(PropertyIdentifier.serialNumber) != null
102+
&& !d.getCharacterStringProperty(PropertyIdentifier.serialNumber).isEmpty()) {
103+
device.setSerialNumber(d.getCharacterStringProperty(PropertyIdentifier.serialNumber));
104+
}
98105
if (d.getName() != null && !d.getName().isEmpty()) {
99106
device.setName(d.getName());
100107
}

0 commit comments

Comments
 (0)