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

Added Rhea lab_ui config.

Browse Source
This commit is contained in:
David Walsh
2019-04-16 19:30:41 -04:00
parent e0fe291366
commit 5a822a5927
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/js/ros_scripts.js
View File

@@ -119,6 +119,7 @@ bagNotifier.subscribe(function(message) {
// attept to connect to the ros master from the IP given orgrab it from the form // attept to connect to the ros master from the IP given orgrab it from the form
ros.attemptConnection = function(ipAddress) ros.attemptConnection = function(ipAddress)
{ {
ros.close();
if( typeof ipAddress !== "undefined") if( typeof ipAddress !== "undefined")
{ {
ros.connectionName = ipAddress; ros.connectionName = ipAddress;
@@ -129,6 +130,7 @@ ros.attemptConnection = function(ipAddress)
} }
console.log('Connection = ' + ros.connectionName); console.log('Connection = ' + ros.connectionName);
ros.connect(ros.connectionName); ros.connect(ros.connectionName);
getMasterName();
} }
function toggleRecording() function toggleRecording()

8
index.html
View File

@@ -162,7 +162,13 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</script> </script>
</button> --> </button> -->
<button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary"> <button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary">
titan.aescape.co 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
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script> </script>

9
launch/lab_ui_rhea.launch Executable file
View File

@@ -0,0 +1,9 @@
<launch>
<include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" >
<arg name="port" value="9091" />
</include>
<!-- <node name="lab_ui_video_server" pkg="web_video_server" type="web_video_server" respawn="true" >
<param name="address" value="titan.aescape.co" />
</node> -->
</launch>