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

Updated README with instructions for ROSBridge. Changed Colouring

Browse Source
This commit is contained in:
GLEN TURNER (8GT6)
2015-05-20 18:12:51 -04:00
parent e2afdcd38e
commit 1900caf9de
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@@ -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:

14
index.html
View File

@@ -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
<body>
<div class="container">
<div class="jumbotron">
<h1>Asctec Pelican CHANGED</h1>
<h1>Asctec Pelican</h1>
</div>
<!-- <button onclick="testAlert('<strong>Danger!</strong> ')">test</button> -->
@@ -119,9 +121,9 @@ ws://192.168.1.102:9090
<div class="panel panel-default">
<div class="panel-body">
<form>
<div id="ConnectionIPForm" class="form-group has-warning has-feedback">
<label id="ConnectionIPLabel" class="col-sm-2 control-label" for="inputWarning">Connection warning</label>
<div class="col-sm-8">
<div id="ConnectionIPForm" class="form-group has-warning has-feedback" align="center">
<label id="ConnectionIPLabel" class="col-sm-3 control-label" for="inputWarning">Connection warning</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="ConnectionIPInput" value="No IP Address yet">
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
@@ -140,7 +142,7 @@ ws://192.168.1.102:9090
<div class="panel panel-default">
<div class="panel-heading">Pelican Status </div>
<div class="panel-body">
Battery Voltage:
<label class="col-sm-2"> Battery Voltage: </label>
<div class="progress">
<div id="VoltageDisplay" class="progress-bar progress-bar-striped active" role="progressbar"
aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:100%" >