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

Update roslibjs to v1.0.1

Browse Source
This commit is contained in:
David Walsh
2019-03-27 17:43:00 -04:00
parent 39ebd35247
commit 56b04ef0bc
6 changed files with 2684 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/js/ros_scripts.js
View File

@@ -30,7 +30,7 @@ ros.on('connection', function() {
document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPInput").value = ros.connectionName;
document.getElementById("ConnectionIPLabel").innerHTML = 'Connection made at:'; document.getElementById("ConnectionIPLabel").innerHTML = 'Connection made at:';
document.getElementById("rosbridgeconnection_badge").innerHTML = 'Connected'; document.getElementById("rosbridgeconnection_badge").innerHTML = 'Connected';
document.getElementById("ConnectionButton").className = "btn btn-success" document.getElementById("ConnectionButton").className = "btn btn-success";
ros.nodes = Array(); ros.nodes = Array();
ros.topics = Array(); ros.topics = Array();
@@ -48,7 +48,7 @@ ros.on('close', function() {
ros.topics = Array(); ros.topics = Array();
}); });
// Create a connection to the rosbridge WebSocket server. // Create a connection to the rosbridge WebSocket server.
ros.connect(ros.connectionName); //ros.connect(ros.connectionName);
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////

1
backend/js/update_guis.js
View File

@@ -66,7 +66,6 @@ function updateTopicsGUI()
}); });
var topics = ros.topics; var topics = ros.topics;
topics.sort()
if(topics != null){ if(topics != null){
var innerHTML = ""; var innerHTML = "";

2
coordinator/coordinator.html
View File

@@ -8,7 +8,7 @@
Teaching Mode Teaching Mode
</button> </button>
<button id="executionModeButton" type="button" onclick="triggerService('/aescape/mode/activateExecutionController')" class="btn btn-primary"> <button id="executionModeButton" type="button" onclick="triggerService('/aescape/mode/activateExecutionController')" class="btn btn-primary">
Execution Mode Massage Mode
</button> </button>
<button id="standbyModeButton" type="button" onclick="triggerService('/aescape/mode/activateStandbyController')" class="btn btn-primary"> <button id="standbyModeButton" type="button" onclick="triggerService('/aescape/mode/activateStandbyController')" class="btn btn-primary">
Standby Mode Standby Mode

2840
include/js/roslib.js
View File

File diff suppressed because it is too large Load Diff

3
include/js/roslib.min.js vendored
View File

File diff suppressed because one or more lines are too long

70
index.html
View File

@@ -95,37 +95,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<div class="tab-pane" id="rosbridgeconnection"> <div class="tab-pane" id="rosbridgeconnection">
<div class="panel panel-default">
<div class="panel-heading">
Predefined ROSBridge Connections
</div>
<div class="panel-body">
<!-- <button id="localhostButton" type="button" onclick="ros.attemptConnection('ws://localhost:9090')" class="btn btn-primary">
localhost
<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">
Phoebe
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</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="TitanButton1" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary">
titan.aescape.co
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</button>
</div>
</div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@@ -149,15 +119,49 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</script> </script>
</button> </button>
</span> </span>
</div> </div>
</span> </span>
</div> </div>
</form> </form>
</div> </div>
<div class="panel panel-default">
<div class="panel-heading">
Predefined ROSBridge Connections
</div>
<div class="panel-body">
<!-- <button id="localhostButton" type="button" onclick="ros.attemptConnection('ws://localhost:9090')" class="btn btn-primary">
localhost
<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">
Phoebe
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</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="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary">
titan.aescape.co
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</button>
</div>
</div>
</div> </div>
<script type="text/javascript">
// Create a connection to the rosbridge WebSocket server.
ros.connect(ros.connectionName);
</script>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
ROS Topics. ROS Topics.