Skip to content
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

#3058 Improve content of list of points in BacNet source in data sources list view #3059

Merged
merged 2 commits into from
Dec 18, 2024
Merged

#3058 Improve content of list of points in BacNet source in data sources list view #3059

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
20b86ab
#3058 Improve content of list of points in BacNet source in data sour…
Patrykb0802 Dec 2, 2024
e986b13
#3058 Improve content of list of points in BacNet source in data sour…
Patrykb0802 Dec 12, 2024
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
2 changes: 1 addition & 1 deletion src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public ExportCodes getEventCodes() {

@Override
public LocalizableMessage getConnectionDescription() {
return new LocalizableMessage("dsEdit.bacnetIp.dsconn", deviceId);
return new LocalizableMessage("common.tp.description", Common.getPeriodDescription(updatePeriodType, updatePeriods), new LocalizableMessage("common.default", " / Device ID: " + getDeviceId() + " / " + getBroadcastAddress() + ":" + getPort()));
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ public PointLocatorRT createRuntime() {
}

public LocalizableMessage getConfigurationDescription() {
return new LocalizableMessage("common.default", remoteDeviceIp);
ObjectType objectType = new ObjectType(getObjectTypeId());
return new LocalizableMessage("common.default", remoteDeviceIp + " / " + objectType.toString() + " / Obj Instance number: " + getObjectInstanceNumber());
}

@JsonRemoteProperty
Expand Down
Loading