diff --git a/README.md b/README.md index 2ca089d..5ae9a73 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,16 @@ ## Asctec Pelican GUI ## +#Getting server up and running# + +Here the rosbridge\_suite that is used to linke the websocket and ROS: http://wiki.ros.org/rosbridge_suite + +Basic ROS functionality of rosbridge: http://wiki.ros.org/roslibjs/Tutorials/BasicRosFunctionality + +the launch command: roslaunch rosbridge_server rosbridge_websocket.launch + +#TODO + + By using ROSBridge, this GUI will attempt to display relevnt informaiton over the web for any device. TODO: diff --git a/index.html b/index.html index 0742cba..c483770 100644 --- a/index.html +++ b/index.html @@ -36,6 +36,7 @@ ws://192.168.1.102:9090 document.getElementById("ConnectionIPForm").className = "form-group has-warning has-feedback"; document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPLabel").innerHTML = 'No connection'; + document.getElementById("ConnectionButton").className = "btn btn-warning" console.log(error); }); @@ -45,7 +46,8 @@ ws://192.168.1.102:9090 console.log('Connection made!'); document.getElementById("ConnectionIPForm").className = "form-group has-success has-feedback"; document.getElementById("ConnectionIPInput").value = ros.connectionName; - document.getElementById("ConnectionIPLabel").innerHTML = 'Connection made'; + document.getElementById("ConnectionIPLabel").innerHTML = 'Connection made at:'; + document.getElementById("ConnectionButton").className = "btn btn-success" }); ros.on('close', function() { @@ -111,7 +113,7 @@ ws://192.168.1.102:9090
-

Asctec Pelican CHANGED

+

Asctec Pelican

@@ -119,9 +121,9 @@ ws://192.168.1.102:9090
-
- -
+
+ +