@bitpoolos/edge-bacnet 1.4.2 → 1.4.4

package/bacnet_read.js

@@ -5,7 +5,6 @@
 
 
 module.exports = function (RED) {
-  const http = require("http");
   const { ReadCommandConfig } = require('./common');
   const baEnum = require('./resources/node-bacstack-ts/dist/index.js').enum;
 
@@ -26,7 +25,7 @@ module.exports = function (RED) {
     this.object_property_simpleWithStatus = config.object_property_simpleWithStatus;
     this.object_property_fullObject = config.object_property_fullObject;
 
-
+    this.useDeviceName = config.useDeviceName;
 
     this.object_props = getObjectProps(this);
 
@@ -54,64 +53,82 @@ module.exports = function (RED) {
     };
 
     node.on('input', function (msg) {
-      node.status({ fill: "blue", shape: "dot", text: "Reading values" });
-
-      let object_property_simplePayload = false;
-      let object_property_simpleWithStatus = false;
-      let object_property_fullObject = false;
-
-      let jsonType = false;
-      let mqttType = false;
-      let pointJsonType = false;
-
-      if (msg.simplePayload) {
-        object_property_simplePayload = msg.simplePayload;
-      } else if (msg.simpleWithStatus) {
-        object_property_simpleWithStatus = msg.simpleWithStatus;
-      } else if (msg.fullObject) {
-        object_property_fullObject = msg.fullObject;
-      } else {
-        object_property_simplePayload = node.object_property_simplePayload;
-        object_property_simpleWithStatus = node.object_property_simpleWithStatus;
-        object_property_fullObject = node.object_property_fullObject;
-      }
 
-      if (msg.json) {
-        jsonType = msg.json;
-      } else if (msg.mqtt) {
-        mqttType = msg.mqtt;
-      } else if (msg.pointJson) {
-        pointJsonType = msg.pointJson;
+      if (msg.applyDisplayNames) {
+
+        msg.pointsToRead = node.pointsToRead;
+        node.send(msg);
+
       } else {
-        jsonType = node.json;
-        mqttType = node.mqtt;
-        pointJsonType = node.pointJson
-      }
 
-      let readConfig = new ReadCommandConfig(node.pointsToRead, node.object_props, node.roundDecimal);
-
-      let output = {
-        type: "Read",
-        id: node.id,
-        readNodeName: node.nodeName,
-        options: readConfig,
-        objectPropertyType: {
-          simplePayload: object_property_simplePayload,
-          simpleWithStatus: object_property_simpleWithStatus,
-          fullObject: object_property_fullObject
-        },
-        outputType: {
-          json: jsonType,
-          mqtt: mqttType,
-          pointJson: pointJsonType
+        node.status({ fill: "blue", shape: "dot", text: "Reading values" });
+
+        let object_property_simplePayload = false;
+        let object_property_simpleWithStatus = false;
+        let object_property_fullObject = false;
+
+        let jsonType = false;
+        let mqttType = false;
+        let pointJsonType = false;
+        let useDeviceName = false;
+
+        if (msg.simplePayload) {
+          object_property_simplePayload = msg.simplePayload;
+        } else if (msg.simpleWithStatus) {
+          object_property_simpleWithStatus = msg.simpleWithStatus;
+        } else if (msg.fullObject) {
+          object_property_fullObject = msg.fullObject;
+        } else {
+          object_property_simplePayload = node.object_property_simplePayload;
+          object_property_simpleWithStatus = node.object_property_simpleWithStatus;
+          object_property_fullObject = node.object_property_fullObject;
         }
-      };
 
-      node.send(output);
+        if (msg.json) {
+          jsonType = msg.json;
+        } else if (msg.mqtt) {
+          mqttType = msg.mqtt;
+        } else if (msg.pointJson) {
+          pointJsonType = msg.pointJson;
+        } else {
+          jsonType = node.json;
+          mqttType = node.mqtt;
+          pointJsonType = node.pointJson
+        }
+
+        if (msg.useDeviceName) {
+          useDeviceName = msg.useDeviceName;
+        } else {
+          useDeviceName = node.useDeviceName;
+        }
 
-      setTimeout(() => {
-        node.status({});
-      }, 3000);
+        let readConfig = new ReadCommandConfig(node.pointsToRead, node.object_props, node.roundDecimal);
+
+        let output = {
+          type: "Read",
+          id: node.id,
+          readNodeName: node.nodeName,
+          options: readConfig,
+          objectPropertyType: {
+            simplePayload: object_property_simplePayload,
+            simpleWithStatus: object_property_simpleWithStatus,
+            fullObject: object_property_fullObject
+          },
+          outputType: {
+            json: jsonType,
+            mqtt: mqttType,
+            pointJson: pointJsonType,
+            useDeviceName: useDeviceName
+          }
+        };
+
+        node.send(output);
+
+        setTimeout(() => {
+          node.status({});
+        }, 3000);
+
+      }
 
     });
 

package/bacnet_server.js

@@ -6,12 +6,12 @@ const { EventEmitter } = require("events");
 
 /**
  * Class representing a BACnet Server.
- * 
+ *
  * This class initializes a BACnet server with specified client, device ID, and Node-Red version.
  * It provides methods to set device name, add objects, retrieve objects, clear server points, clear server point, and get server points.
- * 
+ *
  * Simulates a BACnet IP device on a regular IP network
- * 
+ *
  * @constructor
  * @param {Object} client - The BACnet client object.
  * @param {number} deviceId - The ID of the device.
@@ -248,7 +248,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Set the name of the device.
-     * 
+     *
      * @param {string} nodeName - The new name for the device.
      */
     setDeviceName(nodeName) {
@@ -259,116 +259,85 @@ class BacnetServer extends EventEmitter {
     }
 
     /**
-     * Adds a new object to the BacnetServer's object store based on the provided name and value.
-     * 
+     * Adds a new object to the BacnetServer's object store based on the provided name and payload.
+     *
      * @param {string} name - The name of the object to be added.
-     * @param {number|boolean|string} value - The value of the object to be added.
+     * @param {number|boolean|string|object} payload - The payload of the object to be added.
      * @returns {void}
      */
-    addObject(name, value) {
+    addObject(name, payload) {
         let that = this;
-        let objectType = that.getBacnetObjectType(value);
+        let objectType = that.getBacnetObjectType(payload.value ?? payload);
         if (name && objectType) {
             let instanceNumber;
             if (name.includes('|')) {
                 // split name, assign last part to instanceNumber and the rest to name
                 let nameParts = name.split('|');
-                instanceNumber = nameParts[nameParts.length - 1];
-                nameParts.pop();
+                instanceNumber = nameParts.pop();
                 name = nameParts.join('|');
             }
-            let formattedName = name.replaceAll('.', '_');
-            formattedName = formattedName.replaceAll('/', '_');
-            if (objectType == "number") {
-                let foundIndex = that.objectStore[baEnum.ObjectType.ANALOG_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
-                if (foundIndex == -1) {
-                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.ANALOG_VALUE, instanceNumber);
-                    that.objectStore[baEnum.ObjectType.ANALOG_VALUE].push({
-                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: baEnum.ObjectType.ANALOG_VALUE, type: 9 }],
-                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: '', type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId }, type: 12 }],
-                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: value, type: 4 }],
-                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: 0, type: 8 }],
-                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.UNITS]: [{ value: 95, type: 9 }],
-                        [baEnum.PropertyIdentifier.PRIORITY_ARRAY]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.MAX_PRES_VALUE]: [{ value: value, type: 4 }],
-                        [baEnum.PropertyIdentifier.MIN_PRES_VALUE]: [{ value: value, type: 4 }],
-                        [baEnum.PropertyIdentifier.RESOLUTION]: [{ value: 0, type: 4 }],
-                        [baEnum.PropertyIdentifier.PROPERTY_LIST]:
-                            [
-                                { value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 },
-                                { value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
-                                { value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 },
-                                { value: baEnum.PropertyIdentifier.PRESENT_VALUE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.STATUS_FLAGS, type: 9 },
-                                { value: baEnum.PropertyIdentifier.EVENT_STATE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.OUT_OF_SERVICE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.UNITS, type: 9 },
-                                { value: baEnum.PropertyIdentifier.PRIORITY_ARRAY, type: 9 },
-                                { value: baEnum.PropertyIdentifier.MAX_PRES_VALUE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.MIN_PRES_VALUE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.RESOLUTION, type: 9 },
-                            ],
-                    });
-
-                    that.objectList.push({ value: { type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId }, type: 12 })
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                } else if (foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.ANALOG_VALUE][foundIndex];
-                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                }
-            } else if (objectType == "boolean") {
-                let foundIndex = that.objectStore[baEnum.ObjectType.BINARY_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
-                if (foundIndex == -1) {
-                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.BINARY_VALUE);
-                    that.objectStore[baEnum.ObjectType.BINARY_VALUE].push({
-                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: baEnum.ObjectType.BINARY_VALUE, type: 9 }],
-                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: '', type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: baEnum.ObjectType.BINARY_VALUE, instance: objectId }, type: 12 }],
-                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: value, type: 1 }],
-                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: 0, type: 8 }],
-                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.ACTIVE_TEXT]: [{ value: 'ACTIVE', type: 7 }],
-                        [baEnum.PropertyIdentifier.INACTIVE_TEXT]: [{ value: 'INACTIVE', type: 7 }],
-                    });
+            let formattedName = name.replaceAll('.', '_').replaceAll('/', '_');
+
+            const getCommonProperties = (type, valueType) => ({
+                [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
+                [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: type, type: 9 }],
+                [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: payload.description ?? '', type: 7 }],
+                [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: type, instance: that.getObjectIdentifier(type, instanceNumber) }, type: 12 }],
+                [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: payload.value ?? payload, type: valueType }],
+                [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: payload.statusFlags ?? 0, type: 8 }],
+                [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: payload.eventState ?? 0, type: 9 }],
+                [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: payload.outOfService ?? 0, type: 9 }],
+            });
 
-                    that.objectList.push({ value: { type: baEnum.ObjectType.BINARY_VALUE, instance: objectId }, type: 12 })
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                } else if (foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.BINARY_VALUE][foundIndex];
-                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                }
-            } else if (objectType == "string") {
-                let foundIndex = that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
+            const addObjectToStore = (type, valueType, extraProperties = {}) => {
+                let foundIndex = that.objectStore[type].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
                 if (foundIndex == -1) {
-                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.CHARACTERSTRING_VALUE);
-                    that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].push({
-                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: baEnum.ObjectType.CHARACTERSTRING_VALUE, type: 9 }],
-                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: '', type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: baEnum.ObjectType.CHARACTERSTRING_VALUE, instance: objectId }, type: 12 }],
-                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: value, type: 7 }],
-                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: 0, type: 8 }],
-                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.UNITS]: [{ value: 95, type: 9 }]
-                    });
-
-                    that.objectList.push({ value: { type: baEnum.ObjectType.CHARACTERSTRING_VALUE, instance: objectId }, type: 12 })
+                    let newObject = {
+                        ...getCommonProperties(type, valueType),
+                        ...extraProperties
+                    };
+                    that.objectStore[type].push(newObject);
+                    that.objectList.push({ value: { type: type, instance: newObject[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance }, type: 12 });
                     that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                } else if (foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE][foundIndex];
-                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
+                } else {
+                    let foundObject = that.objectStore[type][foundIndex];
+                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = payload.value ?? payload;
                     that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
                 }
+            };
+
+            if (objectType === "number") {
+                addObjectToStore(baEnum.ObjectType.ANALOG_VALUE, 4, {
+                    [baEnum.PropertyIdentifier.UNITS]: [{ value: payload.units ?? 95, type: 9 }],
+                    [baEnum.PropertyIdentifier.MAX_PRES_VALUE]: [{ value: payload.value ?? payload, type: 4 }],
+                    [baEnum.PropertyIdentifier.MIN_PRES_VALUE]: [{ value: payload.value ?? payload, type: 4 }],
+                    [baEnum.PropertyIdentifier.RESOLUTION]: [{ value: payload.resolution ?? 0, type: 4 }],
+                    [baEnum.PropertyIdentifier.PRIORITY_ARRAY]: [{ value: payload.priorityArray ?? 0, type: 9 }],
+                    [baEnum.PropertyIdentifier.PROPERTY_LIST]: [
+                        { value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 },
+                        { value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
+                        { value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 },
+                        { value: baEnum.PropertyIdentifier.PRESENT_VALUE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.STATUS_FLAGS, type: 9 },
+                        { value: baEnum.PropertyIdentifier.EVENT_STATE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.OUT_OF_SERVICE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.UNITS, type: 9 },
+                        { value: baEnum.PropertyIdentifier.PRIORITY_ARRAY, type: 9 },
+                        { value: baEnum.PropertyIdentifier.MAX_PRES_VALUE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.MIN_PRES_VALUE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.RESOLUTION, type: 9 },
+                    ]
+                });
+            } else if (objectType === "boolean") {
+                addObjectToStore(baEnum.ObjectType.BINARY_VALUE, 1, {
+                    [baEnum.PropertyIdentifier.ACTIVE_TEXT]: [{ value: 'ACTIVE', type: 7 }],
+                    [baEnum.PropertyIdentifier.INACTIVE_TEXT]: [{ value: 'INACTIVE', type: 7 }]
+                });
+            } else if (objectType === "string") {
+                addObjectToStore(baEnum.ObjectType.CHARACTERSTRING_VALUE, 7, {
+                    [baEnum.PropertyIdentifier.UNITS]: [{ value: payload.units ?? 95, type: 9 }]
+                });
             }
         }
         Store_Config_Server(JSON.stringify({ objectList: that.objectList, objectStore: that.objectStore }));
@@ -376,7 +345,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Retrieves a specific property of an object based on the object ID, property ID, and instance number.
-     * 
+     *
      * @param {number} objectId - The ID of the object type.
      * @param {number} propId - The ID of the property to retrieve.
      * @param {number} instance - The instance number of the object.
@@ -405,7 +374,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Retrieves a specific property of an object based on the object ID, property ID, and instance number and modify his value.
-     * 
+     *
      * @param {number} objectId - The ID of the object type.
      * @param {number} propId - The ID of the property to retrieve.
      * @param {number} instance - The instance number of the object.
@@ -436,7 +405,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Retrieves the properties of a specific object instance from the objectStore based on the provided parameters.
-     * 
+     *
      * @param {number} objectId - The type of the object to retrieve.
      * @param {number} propId - The property identifier to retrieve.
      * @param {number} instance - The instance number of the object to retrieve.
@@ -534,7 +503,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Removes a server point from the objectStore and objectList based on the provided JSON data.
-     * 
+     *
      * @param {Object} json - The JSON data containing information about the server point to be removed.
      * @param {string} json.body.type - The type of the server point ('SV' for CharacterString, 'BV' for BinaryValue, default is AnalogValue).
      * @param {number} json.body.instance - The instance number of the server point to be removed.
@@ -597,7 +566,7 @@ class BacnetServer extends EventEmitter {
      * - name: The name of the object.
      * - type: The type of the object (AV for Analog Value, SV for Character String Value, BV for Binary Value).
      * - instance: The instance number of the object.
-     * 
+     *
      * @returns {Promise<Array>} A promise that resolves with an array of points sorted by instance number.
      * @throws {Error} If an error occurs during the retrieval process.
      */
@@ -688,7 +657,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Determines the BACnet object type based on the provided value.
-     * 
+     *
      * @param {any} value - The value to determine the BACnet object type for.
      * @returns {string|null} The BACnet object type as a string ('string', 'number', 'boolean') or null if the type is not recognized.
      */
@@ -702,6 +671,8 @@ class BacnetServer extends EventEmitter {
                 return "number"
             case "boolean":
                 return "boolean"
+            case "object":
+                return "object"
             default:
                 return null
         }
@@ -709,7 +680,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Returns the object identifier for the given type and instance number.
-     * 
+     *
      * @param {string} type - The type of the object.
      * @param {number} instanceNumber - The instance number of the object.
      * @returns {number} The object identifier.
@@ -728,4 +699,4 @@ class BacnetServer extends EventEmitter {
     }
 }
 
-module.exports = { BacnetServer };
+module.exports = { BacnetServer };

package/bitpool_inject.html

@@ -142,6 +142,26 @@
             </div>
         </div>
 
+
+        <div class="injectHeading" style="margin-top: 20px;">
+            <a>Topic Properties</a>
+        </div>
+
+        <div class="objectPropertiesLabel" style="margin-top: 20px;">
+            <label
+            for="node-input-useDeviceName"
+            style="padding-left: 4px; width: auto; align-items: start;"
+            class="objectPropertiesLabel">
+            <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.useDeviceName"></span>
+            <input
+                style="margin-left: 5px;"
+                class=" objectProp"
+                type="checkbox"
+                id="node-input-useDeviceName" />
+            <a style="white-space: nowrap; padding-left: 20px;">Use device name in topic</a>
+            </label>
+        </div>
+
         <div class="injectHeading" style="margin-top: 20px;">
             <a>Msg Properties</a>
         </div>
@@ -476,6 +496,7 @@
                 object_property_simplePayload: { value: false },
                 object_property_simpleWithStatus: { value: false },
                 object_property_fullObject: { value: true },
+                useDeviceName: { value: true },
             },
             icon: "bitpool.svg",
             inputs: 0,
@@ -779,6 +800,8 @@
                 document.getElementById("node-input-object_property_fullObject").checked = node.object_property_fullObject;
                 document.getElementById("node-input-object_property_fullObject").onclick = handlePayloadCheckboxClick;
 
+                document.getElementById("node-input-useDeviceName").checked = node.useDeviceName;
+
 
                 document.getElementById("node-input-doDiscover").onclick = handleCheckboxClick;
                 document.getElementById("node-input-doPoll").onclick = handleCheckboxClick;

package/bitpool_inject.js

@@ -60,6 +60,9 @@ module.exports = function (RED) {
         this.object_property_simplePayload = n.object_property_simplePayload;
         this.object_property_simpleWithStatus = n.object_property_simpleWithStatus;
         this.object_property_fullObject = n.object_property_fullObject;
+
+        this.useDeviceName = n.useDeviceName;
+
         this.json = n.json;
         this.mqtt = n.mqtt;
         this.pointJson = n.pointJson;
@@ -121,6 +124,8 @@ module.exports = function (RED) {
             msg.mqtt = node.mqtt;
             msg.pointJson = node.pointJson;
 
+            msg.useDeviceName = node.useDeviceName;
+
 
             var errors = [];
             var props = this.props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",

package/resources/style.css

@@ -15,6 +15,16 @@
 
 /* Read node styles */
 
+.refreshReadListButton {
+    border: none;
+    border-radius: 40px;
+    height: 35px;
+    width: 35px;
+    & i {
+        color: #6c757d !important;
+    }
+}
+
 .p-treenode-label {
     color: black;
     width: 100%;
@@ -150,6 +160,8 @@
     float: right;
     display: flex;
     align-items: center;
+    padding: 5px;
+    font-weight: bold;
 }
 .removeAllDevicesButton:hover {
     background-color: #d5d5d5;
@@ -247,7 +259,6 @@
     z-index: 10;
 }
 
-
 .context-menu {
     --mouse-x: 0;
     --mouse-y: 0;

package/treeBuilder.js

@@ -63,7 +63,6 @@ class treeBuilder {
         // Check if the device object exists and the device name is valid
         if (deviceObject) {
             await this.processDevicePoints(device, deviceObject, deviceName, ipAddress, deviceId, index);
-
         } else {
             //console.log("Unable to find device object");
         }