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

Fix default rosbridge connection

Browse Source
This commit is contained in:
David Walsh
2019-04-26 15:33:46 -04:00
parent 397f14a441
commit 404fcf686e
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/js/ros_scripts.js
View File

@@ -7,8 +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'; // 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) {

22
index.html
View File

@@ -133,31 +133,25 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
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;
</script> </script>
</button> </button>
<button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.local:9090')" class="btn btn-primary">
Titan
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</button>
<button id="PhoebeButton" type="button" onclick="ros.attemptConnection('ws://phoebe.local:9090')" class="btn btn-primary"> <button id="PhoebeButton" type="button" onclick="ros.attemptConnection('ws://phoebe.local:9090')" class="btn btn-primary">
Phoebe Phoebe
<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="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.local:9090')" class="btn btn-primary"> <button id="RheaButton" type="button" onclick="ros.attemptConnection('ws://rhea.local:9090')" class="btn btn-primary">
Titan
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</button> -->
<button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary">
Phoebe
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</button>
<button id="RheaButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9091')" class="btn btn-primary">
Rhea Rhea
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPInput").value = ros.connectionName;