senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add use of url variables.

Browse Source
This commit is contained in:
David Walsh
2019-04-29 00:41:49 -04:00
parent 88a10010f4
commit 5f1aaa0bbe
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
backend/js/ros_scripts.js
View File

@@ -7,8 +7,32 @@ ros.recording = false;
ros.connected = false; ros.connected = false;
// ros.connectionName = 'ws://192.168.1.105:9090'; // ros.connectionName = 'ws://192.168.1.105:9090';
ros.connectionName = 'ws://localhost:9090';
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){
return pair[1];
}
}
}
var master = "localhost"
master = getQueryVariable("master")
if(master == null)
{
master = window.location.hostname
//"localhost"
}
console.log('Master = ' + master);
ros.connectionName = 'ws://' + master + ':9090';
// ros.connectionName = 'ws://localhost:9090';
// ros.connectionName = 'ws://titan.aescape.co:9090'; // ros.connectionName = 'ws://titan.aescape.co:9090';
console.log('ros.connectionName = ' + ros.connectionName);
// If there is an error on the backend, an 'error' emit will be emitted. // If there is an error on the backend, an 'error' emit will be emitted.
ros.on('error', function(error) { ros.on('error', function(error) {
@@ -20,7 +44,7 @@ ros.on('error', function(error) {
document.getElementById("ROSNodes").innerHTML = "No Nodes Detected"; document.getElementById("ROSNodes").innerHTML = "No Nodes Detected";
rosbridgeconnection_badge rosbridgeconnection_badge
console.log(error);192 console.log(error);
}); });
// Find out exactly when we made a connection. // Find out exactly when we made a connection.
ros.on('connection', function() { ros.on('connection', function() {