From 5adab4a366d07cce279617a0e73f9cf225fddc6b Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Thu, 20 Jan 2022 13:52:08 -0800 Subject: [PATCH] Fixed meshctrl.js, devicelist with group filter and --csv --- meshctrl.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meshctrl.js b/meshctrl.js index db3debc0..01c341b1 100644 --- a/meshctrl.js +++ b/meshctrl.js @@ -2048,7 +2048,11 @@ function serverConnect() { for (var j in devicesInMesh) { var n = devicesInMesh[j]; nodecount++; - console.log('\"' + settings.xmeshes[i]._id.split('/')[2] + '\",\"' + settings.xmeshes[i].name.split('\"').join('') + '\",\"' + n._id.split('/')[2] + '\",\"' + n.name.split('\"').join('') + '\",' + (n.icon ? n.icon : 0) + ',' + (n.conn ? n.conn : 0) + ',' + (n.pwr ? n.pwr : 0)); + if (settings.xmeshes) { + console.log('\"' + settings.xmeshes[i]._id.split('/')[2] + '\",\"' + settings.xmeshes[i].name.split('\"').join('') + '\",\"' + n._id.split('/')[2] + '\",\"' + n.name.split('\"').join('') + '\",' + (n.icon ? n.icon : 0) + ',' + (n.conn ? n.conn : 0) + ',' + (n.pwr ? n.pwr : 0)); + } else { + console.log('\"' + n._id.split('/')[2] + '\",\"' + n.name.split('\"').join('') + '\",' + (n.icon ? n.icon : 0) + ',' + (n.conn ? n.conn : 0) + ',' + (n.pwr ? n.pwr : 0)); + } } } if (nodecount == 0) { console.log('None'); } @@ -2069,7 +2073,6 @@ function serverConnect() { nodes.push(devicesInMesh[j]); } } - console.log(JSON.stringify(nodes, ' ', 2)); } else { // Display the list of nodes in text format