From 56b04ef0bc59e64c094999ae91fbb491704166ad Mon Sep 17 00:00:00 2001 From: David Walsh Date: Wed, 27 Mar 2019 17:43:00 -0400 Subject: [PATCH] Update roslibjs to v1.0.1 --- backend/js/ros_scripts.js | 4 +- backend/js/update_guis.js | 1 - coordinator/coordinator.html | 2 +- include/js/roslib.js | 2844 +++++++++++++++++++++++++++++++--- include/js/roslib.min.js | 3 +- index.html | 70 +- 6 files changed, 2684 insertions(+), 240 deletions(-) diff --git a/backend/js/ros_scripts.js b/backend/js/ros_scripts.js index 86750f8..59078dc 100644 --- a/backend/js/ros_scripts.js +++ b/backend/js/ros_scripts.js @@ -30,7 +30,7 @@ ros.on('connection', function() { document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPLabel").innerHTML = 'Connection made at:'; document.getElementById("rosbridgeconnection_badge").innerHTML = 'Connected'; - document.getElementById("ConnectionButton").className = "btn btn-success" + document.getElementById("ConnectionButton").className = "btn btn-success"; ros.nodes = Array(); ros.topics = Array(); @@ -48,7 +48,7 @@ ros.on('close', function() { ros.topics = Array(); }); // Create a connection to the rosbridge WebSocket server. -ros.connect(ros.connectionName); +//ros.connect(ros.connectionName); /////////////////////////////////////////////////////////////////////////////////// diff --git a/backend/js/update_guis.js b/backend/js/update_guis.js index ae3549d..747b502 100644 --- a/backend/js/update_guis.js +++ b/backend/js/update_guis.js @@ -66,7 +66,6 @@ function updateTopicsGUI() }); var topics = ros.topics; - topics.sort() if(topics != null){ var innerHTML = ""; diff --git a/coordinator/coordinator.html b/coordinator/coordinator.html index cffdcda..75e0190 100644 --- a/coordinator/coordinator.html +++ b/coordinator/coordinator.html @@ -8,7 +8,7 @@ Teaching Mode - - +
@@ -149,15 +119,49 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp - -
+
+
+ Predefined ROSBridge Connections +
+
+ + +
+
+ +
ROS Topics.