@bitpoolos/edge-bacnet 1.1.1 → 1.1.4

package/bacnet_client.js

@@ -96,6 +96,7 @@ class BacnetClient extends EventEmitter {
 
                 setTimeout(() => {
                     that.queryDevices();
+                    that.sanitizeDeviceList();
                   }, "5000")
 
             } catch(e) {
@@ -132,7 +133,6 @@ class BacnetClient extends EventEmitter {
                             newBacnetDevice.setLastSeen(Date.now());
                             that.updateDeviceName(newBacnetDevice);
                             that.deviceList.push(newBacnetDevice);
-
                         } else if(foundIndex !== -1) {
                             that.deviceList[foundIndex].updateDeviceConfig(device);
                             that.deviceList[foundIndex].setLastSeen(Date.now());
@@ -189,7 +189,6 @@ class BacnetClient extends EventEmitter {
             .acquire()
             .then(function(release) {
                 try {
-
                     that.getDevicePointList(device).then(function() {
                         that.buildJsonObject(device).then(function() {
                             release();
@@ -208,7 +207,6 @@ class BacnetClient extends EventEmitter {
                         });
                         release();
                     });
-
                 } catch(e) {
                     that.logOut("Error while querying devices: ", e);
                     release();
@@ -220,30 +218,38 @@ class BacnetClient extends EventEmitter {
 
     sanitizeDeviceList() {
         let that = this;
+        
+        //1 hour in seconds
+        let timeoutThreshold = 3600;
+
+        that.renderList.forEach(function(item, index) {
+            if(((Date.now() - item.lastSeen) / 1000) >  timeoutThreshold) {
+                //render item hasnt responded to whoIs for over an hour
 
-        that.deviceList.forEach(function(device, index) {
-            if(((Date.now() - device.getLastSeen()) / 1000) >  3600) {
-                //device hasnt responded to whoIs for over an hour
+                let deviceIndex = that.deviceList.findIndex(ele => ele.deviceId == item.deviceId);
+                let device = that.deviceList[deviceIndex];
+
+                let ipAddr = typeof device.getAddress() == "object" ? device.getAddress().address : device.getAddress();
+                let deviceKey = ipAddr + "-" + device.getDeviceId();            
 
-                let deviceKey = (typeof device.getAddress() == "object") ? device.getAddress().address + "-" + device.getDeviceId() : device.getAddress() + "-" + device.getDeviceId();            
                 delete that.networkTree[deviceKey];
 
-                if(that.renderList){
-                    let foundIndex = that.renderList.findIndex(ele => ele.ipAddr == device.getAddress() && ele.deviceId == device.getDeviceId());
-                    if(foundIndex !== -1) {
-                        that.renderList.splice(foundIndex, 1);
-                    }
+                if(((Date.now() - device.getLastSeen()) / 1000) >  timeoutThreshold) {
+                    that.deviceList.splice(deviceIndex, 1);
                 }
 
-                that.deviceList.splice(index, 1);
+                that.renderList.splice(index, 1);
             }
         });
+        
     }
 
     updateDeviceName(device) {
         let that = this;
         that._getDeviceName(device.getAddress(), device.getDeviceId()).then(function(deviceName) {
-            device.setDeviceName(deviceName);
+            if(typeof deviceName == "string") {
+                device.setDeviceName(deviceName);
+            }
         });
     }
 
@@ -322,20 +328,22 @@ class BacnetClient extends EventEmitter {
             let bacnetResults = {};
             devicesToRead.forEach(function(key, index) {
                 let device = that.deviceList.find(ele => `${that.getDeviceAddress(ele)}-${ele.getDeviceId()}` == key);
-                let deviceName = device.getDeviceName();
-                let deviceKey = (typeof device.getAddress() == "object") ? device.getAddress().address + "-" + device.getDeviceId() : device.getAddress() + "-" + device.getDeviceId();            
-                let deviceObject = that.networkTree[deviceKey];
-                if(!bacnetResults[deviceName]) bacnetResults[deviceName] = {};
-                if(deviceObject) {
-                    for(const pointName in readConfig.pointsToRead[key]) {
-                        let bac_obj = that.getObjectType(readConfig.pointsToRead[key][pointName].objectID.type);
-                        let objectId = pointName + "_" + bac_obj + '_' + readConfig.pointsToRead[key][pointName].objectID.instance;
-                        let point = deviceObject[objectId];
-                        bacnetResults[deviceName][pointName] = point;
+                if(device) {
+                    let deviceName = device.getDeviceName();
+                    let deviceKey = (typeof device.getAddress() == "object") ? device.getAddress().address + "-" + device.getDeviceId() : device.getAddress() + "-" + device.getDeviceId();            
+                    let deviceObject = that.networkTree[deviceKey];
+                    if(!bacnetResults[deviceName]) bacnetResults[deviceName] = {};
+                    if(deviceObject) {
+                        for(const pointName in readConfig.pointsToRead[key]) {
+                            let bac_obj = that.getObjectType(readConfig.pointsToRead[key][pointName].meta.objectId.type);
+                            let objectId = pointName + "_" + bac_obj + '_' + readConfig.pointsToRead[key][pointName].meta.objectId.instance;
+                            let point = deviceObject[objectId];
+                            bacnetResults[deviceName][pointName] = point;
+                        }
                     }
                 }
 
-                if(index == devicesToRead.length - 1) that.emit('values', bacnetResults, outputType, objectPropertyType);
+                if(index == devicesToRead.length - 1 && Object.keys(readConfig.pointsToRead).length > 0) that.emit('values', bacnetResults, outputType, objectPropertyType);
             });
         } catch(e) {
             that.logOut("Issue doing read, see error: ", e);
@@ -353,111 +361,6 @@ class BacnetClient extends EventEmitter {
         }
     }
 
-    readDeviceAndEmitJSON(readPromiseArray, device, outputType, propertiesToRead, objectPropertyType, msgId) {
-        let that = this;
-        let deviceName = device.getDeviceName();
-
-        let bacnetResults = {
-            [deviceName]: []
-        };
-
-        try{
-            Promise.all(readPromiseArray).then((result) => {
-                let values = {};
-
-                // remove errors and map to result element
-                let successfulResults = result.filter(element => !element.error).map(element => element.value);
-                successfulResults.forEach(element => {
-                    try {
-                        element.values.forEach(function(point){
-                            point.values.forEach(function(object) {                             
-                                let toReadProperty = propertiesToRead.findIndex(ele => ele.id == object.id);
-                                let objectName = that._findValueById(point.values, baEnum.PropertyIdentifier.OBJECT_NAME);
-                                //checks for error code json structure, returned for invalid bacnet requests
-                                if(!object.value.value && toReadProperty !== -1 && objectName !== "") {      
-                                    var currobjectId = point.objectId.type
-                                    let bac_obj = that.getObjectType(currobjectId);                                
-                                    let objectId;
-                                    objectId = objectName;
-
-                                    //init json object
-                                    if(!values[objectId]) values[objectId] = {};
-
-                                    switch(object.id) {
-                                        case baEnum.PropertyIdentifier.PRESENT_VALUE:
-                                            if(object.value[0] && 
-                                               object.value[0].value !== "undefined" && 
-                                               object.value[0].value !== null && 
-                                               typeof object.value[0].value == "number") {
-                                                    values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, that.roundDecimal);
-                                               } else if(object.value[0] && 
-                                                object.value[0].value !== "undefined" && 
-                                                object.value[0].value !== null && 
-                                                typeof object.value[0].value == "string") {
-                                                    values[objectId].presentValue = object.value[0].value;
-                                               }
-                                            break;
-                                        case baEnum.PropertyIdentifier.DESCRIPTION:
-                                            if(object.value[0]) values[objectId].description = object.value[0].value;
-                                            break;
-                                        case baEnum.PropertyIdentifier.STATUS_FLAGS:
-                                            if(object.value[0] && object.value[0].value) values[objectId].statusFlags = that.getStatusFlags(object);
-                                            break;
-                                        case baEnum.PropertyIdentifier.RELIABILITY:
-                                            if(object.value[0]) values[objectId].reliability = that.getPROP_RELIABILITY(object.value[0].value);
-                                            break; 
-                                        case baEnum.PropertyIdentifier.OUT_OF_SERVICE:
-                                            if(object.value[0]) values[objectId].outOfService = object.value[0].value;
-                                            break;
-                                        case baEnum.PropertyIdentifier.UNITS:
-                                            if(object.value[0] && object.value[0].value) values[objectId].units = getUnit(object.value[0].value);
-                                            break;
-                                        case baEnum.PropertyIdentifier.OBJECT_NAME:
-                                            if(object.value[0] && object.value[0].value) values[objectId].objectName = object.value[0].value;
-                                            break;
-                                        case baEnum.PropertyIdentifier.SYSTEM_STATUS:
-                                            if(object.value[0]){
-                                                values[objectId].systemStatus = that.getPROP_SYSTEM_STATUS(object.value[0].value);
-                                            }
-                                            break;    
-                                        case baEnum.PropertyIdentifier.MODIFICATION_DATE:
-                                            if(object.value[0]) {
-                                                values[objectId].modificationDate = object.value[0].value;
-                                            }
-                                            break;      
-                                        case baEnum.PropertyIdentifier.PROGRAM_STATE:
-                                            if(object.value[0]){
-                                                values[objectId].programState = that.getPROP_PROGRAM_STATE(object.value[0].value);
-                                            }
-                                            break;
-                                        case baEnum.PropertyIdentifier.RECORD_COUNT:
-                                            if(object.value[0] ) {
-                                                values[objectId].recordCount = object.value[0].value;
-                                            }
-                                            break;
-                                    }
-                                }
-                            });
-                        }); 
-                        bacnetResults[deviceName] = values;
-
-                    } catch(e) {
-                        that.logOut("issue resolving bacnet payload, see error:  ", e);
-                    }
-                });
-                if(Object.keys(bacnetResults[deviceName]).length !== 0) {
-                    that.emit('values', bacnetResults, outputType, objectPropertyType);
-                }
-                
-            }).catch(function (error) {
-                logger.log('error', `Error while fetching values: ${error}`);
-            });
-
-        } catch(e){
-            that.logOut("Issue reading from device, see error: ", e);
-        }
-    }
-
     _getDeviceName(address, deviceId) {
         let that = this;
         return new Promise((resolve, reject) => {
@@ -929,7 +832,7 @@ class BacnetClient extends EventEmitter {
                         let isMstpDevice = deviceInfo.getIsMstpDevice();
                         let manualDiscoveryMode = deviceInfo.getManualDiscoveryMode();
 
-                        if(deviceObject) {
+                        if(deviceObject && typeof deviceName !== "object") {
                             let children = [];
                             let pointIndex = 0;
 
@@ -982,7 +885,7 @@ class BacnetClient extends EventEmitter {
                                 children.push({"key": `${index}-${pointIndex}`, "label": displayName, "data": displayName, "pointName": pointName, "icon": that.getPointIcon(values.meta.objectId.type), "children": pointProperties, "type": "point", "parentDevice": deviceName, "showAdded": false, "bacnetType": values.meta.objectId.type})
                                 pointIndex++;
                             }
-                            let foundIndex = that.renderList.findIndex(ele => ele.key == index && ele.deviceId == deviceId);
+                            let foundIndex = that.renderList.findIndex(ele => ele.deviceId == deviceId && ele.ipAddr == ipAddr);
                             if(foundIndex !== -1) {
                                 that.renderList[foundIndex] = {"key": index, "label": deviceName, "data": deviceName, "icon": that.getDeviceIcon(isMstpDevice, manualDiscoveryMode), "children": children.sort(that.sortPoints), "type": "device", "lastSeen": deviceInfo.getLastSeen(), "showAdded": false, "ipAddr": ipAddr, "deviceId": deviceId, "isMstpDevice": isMstpDevice};
                             } else if(foundIndex == -1) {
@@ -996,7 +899,7 @@ class BacnetClient extends EventEmitter {
                                 resolve({renderList: that.renderList, deviceList: that.deviceList, pointList: that.networkTree, pollFrequency: that.discover_polling_schedule});
                             }
                         }
-                        
+
                         release();
                     });
                 });
@@ -1074,94 +977,91 @@ class BacnetClient extends EventEmitter {
                         let objectName = that._findValueById(pointProperty.values, baEnum.PropertyIdentifier.OBJECT_NAME);
                         let objectType = that._findValueById(pointProperty.values, baEnum.PropertyIdentifier.OBJECT_TYPE);
                         let objectId;
-                        if(objectName !== null) {
+                        if(objectName !== null && typeof objectName == "string") {
                             objectId = objectName + "_" + bac_obj + '_' + pointProperty.objectId.instance;
-                        } else {
-                            objectId = bac_obj + '_' + pointProperty.objectId.instance;
-                        }
-                        try {
-                            pointProperty.values.forEach(function(object, objectIndex) {
-                                //checks for error code json structure, returned for invalid bacnet requests
-                                //if(!object.value.value && !object.value[0].value.errorClass && !object.value.errorClass) {
-                                if(object && object.value && !object.value.errorClass) {
-
-
-                                    if(!values[objectId]) values[objectId] = {};
-                                    values[objectId].meta = {
-                                        objectId: pointProperty.objectId
-                                    };
-
-                                    switch(object.id) {
-                                        case baEnum.PropertyIdentifier.PRESENT_VALUE:
-                                            if(object.value[0] && object.value[0].value !== "undefined" && object.value[0].value !== null) {
-                                                //check for binary object type
-                                                if(objectType == 3 || objectType == 4 || objectType == 5) {
-                                                    if(object.value[0].value == 0) {
-                                                        values[objectId].presentValue = false;
-                                                    } else if(object.value[0].value == 1) {
-                                                        values[objectId].presentValue = true;
+                        
+                            try {
+                                pointProperty.values.forEach(function(object, objectIndex) {
+                                    //checks for error code json structure, returned for invalid bacnet requests
+                                    if(object && object.value && !object.value.errorClass) {
+
+                                        if(!values[objectId]) values[objectId] = {};
+                                        values[objectId].meta = {
+                                            objectId: pointProperty.objectId
+                                        };
+
+                                        switch(object.id) {
+                                            case baEnum.PropertyIdentifier.PRESENT_VALUE:
+                                                if(object.value[0] && object.value[0].value !== "undefined" && object.value[0].value !== null) {
+                                                    //check for binary object type
+                                                    if(objectType == 3 || objectType == 4 || objectType == 5) {
+                                                        if(object.value[0].value == 0) {
+                                                            values[objectId].presentValue = false;
+                                                        } else if(object.value[0].value == 1) {
+                                                            values[objectId].presentValue = true;
+                                                        }
+                                                    } else if(objectType == 40) {
+                                                            //character string
+                                                            values[objectId].presentValue = object.value[0].value;
+                                                    } else {
+                                                        values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, 2);
                                                     }
-                                                } else if(objectType == 40) {
-                                                        //character string
-                                                        values[objectId].presentValue = object.value[0].value;
-                                                } else {
-                                                    values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, 2);
+                                                } 
+                                                values[objectId].meta.arrayIndex = object.index;
+                                                break;
+                                            case baEnum.PropertyIdentifier.DESCRIPTION:
+                                                if(object.value[0]) values[objectId].description = object.value[0].value;
+                                                break;
+                                            case baEnum.PropertyIdentifier.UNITS:
+                                                if(object.value[0] && object.value[0].value) values[objectId].units = getUnit(object.value[0].value);
+                                                break;
+                                            case baEnum.PropertyIdentifier.OBJECT_NAME:
+                                                if(object.value[0] && object.value[0].value) values[objectId].objectName = object.value[0].value;
+                                                break;
+                                            case baEnum.PropertyIdentifier.OBJECT_TYPE:
+                                                if(object.value[0] && object.value[0].value) values[objectId].objectType = object.value[0].value;
+                                                break;
+                                            case baEnum.PropertyIdentifier.OBJECT_IDENTIFIER:
+                                                if(object.value[0] && object.value[0].value) values[objectId].objectID = object.value[0].value;
+                                                break;    
+                                            case baEnum.PropertyIdentifier.PROPERTY_LIST:
+                                                if(object.value) values[objectId].propertyList = that.mapPropsToArray(object.value);
+                                                break;         
+                                                
+                                            case baEnum.PropertyIdentifier.SYSTEM_STATUS:
+                                                if(object.value[0]){
+                                                    values[objectId].systemStatus = that.getPROP_SYSTEM_STATUS(object.value[0].value);
+                                                } 
+                                                break;    
+
+                                            case baEnum.PropertyIdentifier.MODIFICATION_DATE:
+                                                if(object.value[0]) {
+                                                    values[objectId].modificationDate = object.value[0].value;
                                                 }
-                                            } 
-                                            values[objectId].meta.arrayIndex = object.index;
-                                            break;
-                                        case baEnum.PropertyIdentifier.DESCRIPTION:
-                                            if(object.value[0]) values[objectId].description = object.value[0].value;
-                                            break;
-                                        case baEnum.PropertyIdentifier.UNITS:
-                                            if(object.value[0] && object.value[0].value) values[objectId].units = getUnit(object.value[0].value);
-                                            break;
-                                        case baEnum.PropertyIdentifier.OBJECT_NAME:
-                                            if(object.value[0] && object.value[0].value) values[objectId].objectName = object.value[0].value;
-                                            break;
-                                        case baEnum.PropertyIdentifier.OBJECT_TYPE:
-                                            if(object.value[0] && object.value[0].value) values[objectId].objectType = object.value[0].value;
-                                            break;
-                                        case baEnum.PropertyIdentifier.OBJECT_IDENTIFIER:
-                                            if(object.value[0] && object.value[0].value) values[objectId].objectID = object.value[0].value;
-                                            break;    
-                                        case baEnum.PropertyIdentifier.PROPERTY_LIST:
-                                            if(object.value) values[objectId].propertyList = that.mapPropsToArray(object.value);
-                                            break;         
+                                                break;      
                                             
-                                        case baEnum.PropertyIdentifier.SYSTEM_STATUS:
-                                            if(object.value[0]){
-                                                values[objectId].systemStatus = that.getPROP_SYSTEM_STATUS(object.value[0].value);
-                                            } 
-                                            break;    
-
-                                        case baEnum.PropertyIdentifier.MODIFICATION_DATE:
-                                            if(object.value[0]) {
-                                                values[objectId].modificationDate = object.value[0].value;
-                                            }
-                                            break;      
-                                        
-                                        case baEnum.PropertyIdentifier.PROGRAM_STATE:
-                                            if(object.value[0]){
-                                                values[objectId].programState = that.getPROP_PROGRAM_STATE(object.value[0].value);
-                                            }
-                                            break;
-
-                                        case baEnum.PropertyIdentifier.RECORD_COUNT:
-                                            if(object.value[0] ) {
-                                                values[objectId].recordCount = object.value[0].value;
-                                            }
-                                            break;                                            
+                                            case baEnum.PropertyIdentifier.PROGRAM_STATE:
+                                                if(object.value[0]){
+                                                    values[objectId].programState = that.getPROP_PROGRAM_STATE(object.value[0].value);
+                                                }
+                                                break;
+
+                                            case baEnum.PropertyIdentifier.RECORD_COUNT:
+                                                if(object.value[0] ) {
+                                                    values[objectId].recordCount = object.value[0].value;
+                                                }
+                                                break;                                            
+                                        }
                                     }
-                                }
-                                if(pointPropertyIndex == successfulResult.values.length - 1 && objectIndex == pointProperty.values.length - 1 && i == fullObjects.length - 1) {
-                                    that.networkTree[deviceKey] = values;
-                                    resolve(that.networkTree);
-                                } 
-                            });
-                        } catch(e) {
-                            that.logOut("issue resolving bacnet payload, see error:  ", e);
-                            reject(e);
+                                    if(pointPropertyIndex == successfulResult.values.length - 1 && objectIndex == pointProperty.values.length - 1 && i == fullObjects.length - 1) {
+                                        that.networkTree[deviceKey] = values;
+                                        resolve(that.networkTree);
+                                    } 
+                                });
+                            } catch(e) {
+                                that.logOut("issue resolving bacnet payload, see error:  ", e);
+                                reject(e);
+                            }
                         }
                     });
                 } else {

package/bacnet_gateway.html

@@ -474,10 +474,13 @@
 
             <h3><strong>Examples</strong></h3>
             <p>For example flows, please use the examples section for this node. These examples can be found at: Node-red hamburger menu on top right -> Import -> Examples -> @bitpoolos/edge-bacnet</p>
-            <p>To find screen shot examples of settings and flows, please go to our wiki <a href="https://wiki.bitpool.com/en/edge/apps/bitpool-edge/nr-bacnet">here</a></p>
+            <p>To find captured examples of settings and flows, please go to our wiki <a href="https://wiki.bitpool.com/en/edge/apps/bitpool-edge/nr-bacnet">here</a></p>
 
     
             <h3>Resources:</h3>
+            
+            <p><a href="https://youtu.be/4K7mVxfvfbc">Video Walk-through </a></p>
+
             <h4><strong>Online Docs:</strong></h4>
             <ul type="1">
               <li><a href="https://www.bitpool.com/">bitpool.com</a> - check us out here.</li>

package/bacnet_gateway.js

@@ -304,23 +304,26 @@ module.exports = function (RED) {
           if(device !== "_msgid") {
             let points = values[device];
             for(var point in points) {
-              let pointProps = Object.keys(points[point]);
-              pointProps.forEach(function(prop) {
-                let msg = {};
-                if(prop == "presentValue") {
-                  if(node.nodeName !== "gateway" && 
-                      node.nodeName !== "" && 
-                      node.nodeName !== "null" && 
-                      node.nodeName !== "undefined" && 
-                      typeof node.nodeName == "string") {
-                    msg.topic = `${node.nodeName}/${device}/${point}`;
-                  } else {
-                    msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}`;
+              if(points[point]){
+                let pointProps = Object.keys(points[point]);
+                pointProps.forEach(function(prop) {
+                  let msg = {};
+                  if(prop == "presentValue") {
+                    if(node.nodeName !== "gateway" && 
+                        node.nodeName !== "" && 
+                        node.nodeName !== "null" && 
+                        node.nodeName !== "undefined" && 
+                        typeof node.nodeName == "string") {
+                      msg.topic = `${node.nodeName}/${device}/${point}`;
+                    } else {
+                      msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}`;
+                    }
+                    msg.payload = points[point][prop];
+                    node.send(msg);
                   }
-                  msg.payload = points[point][prop];
-                  node.send(msg);
-                }
-              });
+                });
+
+              }
             }
           }
         });
@@ -333,23 +336,25 @@ module.exports = function (RED) {
           if(device !== "_msgid") {
             let points = values[device];
             for(var point in points) {
-              let pointProps = Object.keys(points[point]);
-              pointProps.forEach(function(prop) {
-                let msg = {};
-                if(prop !== "objectName") {
-                  if(node.nodeName !== "gateway" && 
-                      node.nodeName !== "" && 
-                      node.nodeName !== "null" && 
-                      node.nodeName !== "undefined" && 
-                      typeof node.nodeName == "string") {
-                    msg.topic = `${node.nodeName}/${device}/${point}/${prop}`;
-                  } else {
-                    msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}/${prop}`;
+              if(points[point]){
+                let pointProps = Object.keys(points[point]);
+                pointProps.forEach(function(prop) {
+                  let msg = {};
+                  if(prop !== "objectName") {
+                    if(node.nodeName !== "gateway" && 
+                        node.nodeName !== "" && 
+                        node.nodeName !== "null" && 
+                        node.nodeName !== "undefined" && 
+                        typeof node.nodeName == "string") {
+                      msg.topic = `${node.nodeName}/${device}/${point}/${prop}`;
+                    } else {
+                      msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}/${prop}`;
+                    }
+                    msg.payload = points[point][prop];
+                    node.send(msg);
                   }
-                  msg.payload = points[point][prop];
-                  node.send(msg);
-                }
-              });
+                });
+              }
             }
           }
         });
@@ -358,22 +363,37 @@ module.exports = function (RED) {
       sendSimpleJson = function(values) {
         let devices = Object.keys(values);
         devices.forEach(function(device) {
+          let msgg = {};
           if(device !== "_msgid") {
             let value = {
               [device]: {}
             };
             let points = values[device];
+          
             for(var point in points) {
-              let pointProps = Object.keys(points[point]);
-              pointProps.forEach(function(prop) {
-                if(prop == "presentValue") {
-                  value[device][point] = {
-                    "presentValue": points[point][prop]
-                  };
-                }
-              });
+              if(points[point]){
+                let pointProps = Object.keys(points[point]);
+                pointProps.forEach(function(prop) {
+                  if(prop == "presentValue") {
+                    value[device][point] = {
+                      "presentValue": points[point][prop]
+                    };
+                  }
+                });
+              }
+
+            }
+            if(node.nodeName !== "gateway" && 
+            node.nodeName !== "" && 
+            node.nodeName !== "null" && 
+            node.nodeName !== "undefined" && 
+            typeof node.nodeName == "string") {
+              msgg.topic = `${node.nodeName}/${device}`;
+            } else {
+              msgg.topic = `BITPOOL_BACNET_GATEWAY/${device}`;
             }
-            node.send(value);
+            msgg.payload = value[device];
+            node.send(msgg);
           }
         });
       };

package/bacnet_read.html

@@ -210,7 +210,7 @@
                             //force a deploy state
                             node.hiddenDeployToggle = !node.prevHiddenToggleState;
 
-                        } catch(e){
+                        } catch(e) {
                             console.log("removeAllClicked error: ", e);
                         }
 
@@ -849,7 +849,17 @@
          
         </ol>
 
+        <h3><strong>Examples</strong></h3>
+            <p>For example flows, please use the examples section for this node. These examples can be found at: Node-red hamburger menu on top right -> Import -> Examples -> @bitpoolos/edge-bacnet</p>
+            <p>To find captured examples of settings and flows, please go to our wiki <a href="https://wiki.bitpool.com/en/edge/apps/bitpool-edge/nr-bacnet">here</a></p>
+
+
+        
+
         <h3>Resources:</h3>
+
+        <p><a href="https://youtu.be/4K7mVxfvfbc">Video Walk-through </a></p>
+
         <h4><strong>Online Docs:</strong></h4>
         <ul type="1">
           <li><a href="https://www.bitpool.com/">bitpool.com</a> - check us out here.</li>

package/bacnet_write.html

@@ -634,7 +634,13 @@
          
         </ol>
 
+        <h3><strong>Examples</strong></h3>
+            <p>For example flows, please use the examples section for this node. These examples can be found at: Node-red hamburger menu on top right -> Import -> Examples -> @bitpoolos/edge-bacnet</p>
+            <p>To find captured examples of settings and flows, please go to our wiki <a href="https://wiki.bitpool.com/en/edge/apps/bitpool-edge/nr-bacnet">here</a></p>
+
+
         <h3>Resources:</h3>
+        <p><a href="https://youtu.be/4K7mVxfvfbc">Video Walk-through </a></p>
         <h4><strong>Online Docs:</strong></h4>
         <ul type="1">
           <li><a href="https://www.bitpool.com/">bitpool.com</a> - check us out here.</li>

package/bitpool_inject.html

@@ -792,7 +792,13 @@
      
     </ol>
 
+    <h3><strong>Examples</strong></h3>
+            <p>For example flows, please use the examples section for this node. These examples can be found at: Node-red hamburger menu on top right -> Import -> Examples -> @bitpoolos/edge-bacnet</p>
+            <p>To find captured examples of settings and flows, please go to our wiki <a href="https://wiki.bitpool.com/en/edge/apps/bitpool-edge/nr-bacnet">here</a></p>
+
+
     <h3>Resources:</h3>
+    <p><a href="https://youtu.be/4K7mVxfvfbc">Video Walk-through </a></p>
     <h4><strong>Online Docs:</strong></h4>
     <ul type="1">
         <li><a href="https://www.bitpool.com/">bitpool.com</a> - check us out here.</li>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "async-mutex": "^0.4.0",
@@ -18,8 +18,6 @@
       "Bacnet-Gateway": "bacnet_gateway.js",
       "Bacnet-Discovery": "bacnet_read.js",
       "Bacnet-Write": "bacnet_write.js",
-      "Bitpool-Bacnet-Device": "bacnet_device.js",
-      "Bitpool-Bacnet-Object": "bacnet_object.js",
       "Bitpool-Inject": "bitpool_inject.js"
     }
   },

package/bacnet_object.html

@@ -1,131 +0,0 @@
-<!-- 
-  MIT License Copyright 2021, 2022 - Bitpool Pty Ltd
--->
-
-<script type="text/javascript">
-    RED.nodes.registerType('Bitpool-Bacnet-Object',{
-        category: 'config',
-        color: '#00aeef',
-        defaults: {
-            name: {value:""},
-            object_type_ai: {value: true},
-            object_type_ao: {value: false},
-            object_type_av: {value: false},
-            object_type_bi: {value: false},
-            object_type_bo: {value: false},
-            object_type_bv: {value: false},
-            object_type_mi: {value: false},
-            object_type_mo: {value: false},
-            object_type_mv: {value: false},
-            object_property_presentVal: {value: true},
-            object_property_objDescription: {value: false},
-            object_property_statusFlag: {value: false},
-            object_property_reliability: {value: false},
-            object_property_outOfService: {value: false},
-            object_property_units: {value: false},
-            instance_start: {value: "", required: true},
-            instance_end: {value: "", required: true}
-        },
-        inputs:1,
-        outputs:1,
-        icon: "icon.png",
-        label: function() {
-            return this.name||"Bitpool-Bacnet-Object";
-        },
-        oneditprepare: function() {
-        }
-    });
-
-</script>
-
-<script type="text/html" data-template-name="Bitpool-Bacnet-Object">
-    <div class="form-row">
-      <label for="node-config-input-name"><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.name"></span> Name</label>
-      <input type="text" id="node-config-input-name" placeholder="Config Name" style="margin-left: 45px; width: 350px;">
-    </div>
-
-    <div class="form-row" style="display: inline-flex; width: fit-content; align-items: center;">
-        <label for="node-config-input-instance" ><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.instance"></span>Instance Range</label>
-        <div id="node-config-input-instance">
-            <label for="node-config-input-instance_start" style="flex-basis: content; width: 75px; padding-left: 45px;"> Start</label>
-                <input type="text" id="node-config-input-instance_start" placeholder="101" style="width: 55px;">
-            
-            <label for="node-config-input-instance_end" style="flex-basis: content; width: 30px;"> End</label>
-                <input type="text" id="node-config-input-instance_end" placeholder="102" style="width: 55px;">
-            
-        </div>
-
-    </div>
-
-    <br>
-
-    <div class="form-row" style="display: inline-flex; width: fit-content; flex-wrap: nowrap;">
-        <label for="node-config-input-object_type_group"><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.object_type_group"></span> Object Type</label>
-        <div id="node-config-input-object_type_group"  style="display: flex; padding-left: 45px;">
-            <label for="node-config-input-object_type_ai" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_ai"></span>AI
-                <input type="checkbox" id="node-config-input-object_type_ai">
-            </label>
-    
-            <label for="node-config-input-object_type_ao" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_ao"></span>AO
-                <input type="checkbox" id="node-config-input-object_type_ao">
-            </label>
-    
-            <label for="node-config-input-object_type_av"  style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_av"></span>AV
-                <input type="checkbox" id="node-config-input-object_type_av">
-            </label>
-    
-            <label for="node-config-input-object_type_bi" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_bi"></span>BI
-                <input type="checkbox" id="node-config-input-object_type_bi">
-            </label>
-    
-            <label for="node-config-input-object_type_bo" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_bo"></span>BO
-                <input type="checkbox" id="node-config-input-object_type_bo">
-            </label>
-    
-            <label for="node-config-input-object_type_bv" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_bv"></span>BV
-                <input type="checkbox" id="node-config-input-object_type_bv">
-            </label>
-
-            <label for="node-config-input-object_type_mi" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_mi"></span>MI
-                <input type="checkbox" id="node-config-input-object_type_mi">
-            </label>
-            <label for="node-config-input-object_type_mo" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_mo"></span>MO
-                <input type="checkbox" id="node-config-input-object_type_mo">
-            </label>
-            <label for="node-config-input-object_type_mv" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_type_mv"></span>MV
-                <input type="checkbox" id="node-config-input-object_type_mv">
-            </label>
-        </div>
-    </div>
-
-    <br>
-
-    <div class="form-row" style="display: inline-flex; width: fit-content; flex-wrap: nowrap;">
-        <label for="node-config-input-object_properties_group"><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.object_properties_group"></span> Object Properties</label>
-        <div id="node-config-input-object_properties_group"  style="display: flex; padding-left: 45px;">
-            <label for="node-config-input-object_property_presentVal" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_presentVal"></span>Present Value
-                <input type="checkbox" id="node-config-input-object_property_presentVal">
-            </label>
-    
-            <label for="node-config-input-object_property_objDescription" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_objDescription"></span>Description
-                <input type="checkbox" id="node-config-input-object_property_objDescription">
-            </label>
-    
-            <label for="node-config-input-object_property_statusFlag"  style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_statusFlag"></span>Status Flags
-                <input type="checkbox" id="node-config-input-object_property_statusFlag">
-            </label>
-    
-            <label for="node-config-input-object_property_reliability" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_reliability"></span>Reliability
-                <input type="checkbox" id="node-config-input-object_property_reliability">
-            </label>
-    
-            <label for="node-config-input-object_property_outOfService" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_outOfService"></span>Out of Service
-                <input type="checkbox" id="node-config-input-object_property_outOfService">
-            </label>
-    
-            <label for="node-config-input-object_property_units" style="flex-basis: content; padding-right: 20px;"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_units"></span>Units
-                <input type="checkbox" id="node-config-input-object_property_units">
-            </label>
-        </div>
-    </div>
-</script>

package/bacnet_object.js

@@ -1,121 +0,0 @@
-/*
-  MIT License Copyright 2021, 2022 - Bitpool Pty Ltd
-*/
-
-module.exports = function (RED) {
-    const baEnum = require('./resources/node-bacnet/index.js').enum;
-    function BitpoolBacnetObject (config) {
-      RED.nodes.createNode(this, config)
-
-      this.object_type_ai = config.object_type_ai;
-      this.object_type_ao = config.object_type_ao;
-      this.object_type_av = config.object_type_av;
-      this.object_type_bi = config.object_type_bi;
-      this.object_type_bo = config.object_type_bo;
-      this.object_type_bv = config.object_type_bv;
-
-      this.object_type_mi = config.object_type_mi;
-      this.object_type_mo = config.object_type_mo;
-      this.object_type_mv = config.object_type_mv;
-
-      this.object_type = getObjectTypes(this);
-
-      this.object_property_presentVal = config.object_property_presentVal;
-      this.object_property_objDescription = config.object_property_objDescription;
-      this.object_property_statusFlag = config.object_property_statusFlag;
-      this.object_property_reliability = config.object_property_reliability;
-      this.object_property_outOfService = config.object_property_outOfService;
-      this.object_property_units = config.object_property_units;
-      this.object_props = getObjectProps(this);
-      
-      this.instance_start = config.instance_start;
-      this.instance_end = config.instance_end;
-      
-      this.instance = getInstanceRange(this);
-
-      function getObjectTypes(node) {
-        var typeArr = [];
-        if(node.object_type_ai == true){
-          typeArr.push("0");
-        }
-        if(node.object_type_ao == true){
-          typeArr.push("1");
-        }
-        if(node.object_type_av == true){
-          typeArr.push("2");
-        }
-        if(node.object_type_bi == true){
-          typeArr.push("3");
-        }
-        if(node.object_type_bo == true){
-          typeArr.push("4");
-        }
-        if(node.object_type_bv == true){
-          typeArr.push("5");
-        }
-        if(node.object_type_mi == true){
-          typeArr.push("13");
-        }
-        if(node.object_type_mo == true){
-          typeArr.push("14");
-        }
-        if(node.object_type_mv == true){
-          typeArr.push("19");
-        }
-
-        return typeArr.join();
-      };
-
-      function getObjectProps(node){
-        var propArr = [];
-        if(node.object_property_presentVal == true){
-          propArr.push({ id: baEnum.PropertyIds.PROP_PRESENT_VALUE });
-        }
-        if(node.object_property_objDescription == true){
-          propArr.push({ id: baEnum.PropertyIds.PROP_DESCRIPTION });
-        }
-        if(node.object_property_statusFlag == true){
-          propArr.push({ id: baEnum.PropertyIds.PROP_STATUS_FLAGS });
-        }
-        if(node.object_property_reliability == true){
-          propArr.push({ id: baEnum.PropertyIds.PROP_RELIABILITY });
-        }
-        if(node.object_property_outOfService == true){
-          propArr.push({ id: baEnum.PropertyIds.PROP_OUT_OF_SERVICE });
-        }
-        if(node.object_property_units == true) {
-          propArr.push({ id: baEnum.PropertyIds.PROP_UNITS });
-        }
-
-        //add object name for every request as its used in formatting
-        propArr.push({ id: baEnum.PropertyIds.PROP_OBJECT_NAME});
-
-        return propArr;
-      };
-
-      function getInstanceRange(node){
-        let start = node.instance_start;
-        let end = node.instance_end;
-
-        if(start == end) {
-          return start;
-        }
-
-        if(start !== end && start < end) {
-          return start + " - " + end;
-        }
-
-        if(start && !end) {
-          return start;
-        }
-        
-        if(start > end){
-          return end + " - " + start;
-        }
-      };
-
-    };
-
-
-    RED.nodes.registerType('Bitpool-Bacnet-Object', BitpoolBacnetObject)
-}