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

Update default url

Browse Source
This commit is contained in:
David Walsh
2019-02-28 12:29:30 -05:00
parent 198337bc22
commit 1aff7a1d5c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/js/ros_scripts.js
View File

@@ -7,7 +7,8 @@ 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'; // ros.connectionName = 'ws://localhost:9090';
ros.connectionName = 'ws://titan.aescape.co:9090';
// 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) {

13
index.html
View File

@@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Lab UI</title>
<!-- <!--
Link to included files. These are typically done by fetching from the web. Link to included files. These are typically done by fetching from the web.
Because this needs to run without an internet conection, the files were saved Because this needs to run without an internet conection, the files were saved
@@ -56,7 +57,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</div> </div>
<ul id="tabs" class="nav nav-pills" data-tabs="tabs" > <ul id="tabs" class="nav nav-pills" data-tabs="tabs" >
<li class="active"> <a href="#rosbridgeconnection" data-toggle="tab"> <li> <a href="#rosbridgeconnection" data-toggle="tab">
ROS Bridge Connection ROS Bridge Connection
<span id="rosbridgeconnection_badge" class="badge"> <span id="rosbridgeconnection_badge" class="badge">
Not Connected Not Connected
@@ -67,7 +68,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
Data Display Data Display
</a> </a>
</li> --> </li> -->
<li> <li class="active">
<a href="#Coordinator" data-toggle="tab"> <a href="#Coordinator" data-toggle="tab">
Coordinator Coordinator
</a> </a>
@@ -84,7 +85,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<!-- ##################################### END DISPLAY PANEL ######################################### --> <!-- ##################################### END DISPLAY PANEL ######################################### -->
</div> </div>
<div class="tab-pane" id="Coordinator"> <div class="tab-pane active" id="Coordinator">
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### --> <!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
@@ -95,13 +96,13 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<div class="tab-pane active" id="rosbridgeconnection"> <div class="tab-pane" id="rosbridgeconnection">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Predefined ROSBridge Connections Predefined ROSBridge Connections
</div> </div>
<div class="panel-body"> <div class="panel-body">
<button id="localhostButton" type="button" onclick="ros.attemptConnection('ws://localhost:9090')" class="btn btn-primary"> <!-- <button id="localhostButton" type="button" onclick="ros.attemptConnection('ws://localhost:9090')" class="btn btn-primary">
localhost localhost
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPInput").value = ros.connectionName;
@@ -118,7 +119,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script> </script>
</button> </button> -->
<button id="TitanButton1" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary"> <button id="TitanButton1" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary">
titan.aescape.co titan.aescape.co
<script type="text/javascript"> <script type="text/javascript">