Initial coordinator commit.

This commit is contained in:
David Walsh
2019-02-25 16:54:05 -05:00
parent afdb725937
commit 1f5ddc99fe
4 changed files with 131 additions and 33 deletions

View File

@@ -0,0 +1,72 @@
<div class="panel panel-default">
<div class="panel-heading">
Select Operation Mode
</div>
<div class="panel-body text-center">
<button id="teachingModeButton" type="button" onclick="triggerService('/teachingMode')" class="btn btn-lg">
Teaching Mode
</button>
<button id="executionModeButton" type="button" onclick="triggerService('/executionMode')" class="btn btn-lg">
Execution Mode
</button>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
Teaching Mode Operations
</div>
<div class="panel-body text-center">
<button id="recordingStartButton" type="button" onclick="triggerService('/startTeachRecording')" class="btn btn-lg">
Start Teach Recording
</button>
<button id="recordingStopButton" type="button" onclick="triggerService('/stopTeachRecording')" class="btn btn-lg">
Stop Teach Recording
</button>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
Execution Mode Operations
</div>
<div class="panel-body text-center">
<button id="executionStartButton" type="button" onclick="triggerService('/startPlayingLastRecording')" class="btn btn-lg">
Play Last Recording
</button>
<button id="executionStopButton" type="button" onclick="triggerService('/stopPlayingBag')" class="btn btn-lg">
Stop Playing Recording
</button>
<!-- <div class="row">
<div class="col-md-3">
Bagfile name must not start with "/"
<div class="input-group">
<input type="text" id="recordText" class="form-control" placeholder="bag_filename">
<span class="input-group-btn">
<button class="btn btn-lg" id="recordButton" type="button" onclick="toggleRecording()">
<span id="recordButtonText">
Start
</span>
</button>
</span>
</div>
</div>
</div> -->
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
Execution Recording Operations
</div>
<div class="panel-body text-center">
<button id="executionStartButton" type="button" onclick="triggerService('/startExecutionRecording')" class="btn btn-lg">
Start Recording Execution
</button>
<button id="executionRecordingStopButton" type="button" onclick="triggerService('/stopExecutionRecording')" class="btn btn-lg">
Stop Recording Execution
</button>
</div>
</div>

View File

@@ -0,0 +1,38 @@
///////////////////////////////////////////////////////////////////////////////////
// Publishers
///////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////
// Topics
////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////
// Subscribers
////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////
// Services
////////////////////////////////////////////////////////////////
function triggerService(serviceName)
{
var service = new ROSLIB.Service({
ros : ros,
name : serviceName,
serviceType : 'std_srvs/Trigger'
});
var request = new ROSLIB.ServiceRequest({});
service.callService(request, function(result) {
console.log('Result for service call on '
+ serviceName
+ ': '
+ result.sum);
});
}

View File

View File

@@ -32,7 +32,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<script>
$(function(){
$("#includedContent").load("data_display/data_display.html");
$("#dataDisplayContent").load("data_display/data_display.html");
});
</script>
@@ -40,6 +40,14 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<script type="text/javascript" src="data_display/js/update_guis.js"></script>
<script>
$(function(){
$("#coordinatorContent").load("coordinator/coordinator.html");
});
</script>
<script type="text/javascript" src="coordinator/js/ros_scripts.js"></script>
<script type="text/javascript" src="coordinator/js/update_guis.js"></script>
</head>
<body>
<div class="container">
@@ -58,7 +66,11 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
Data Display
</a>
</li>
<li>
<a href="#Coordinator" data-toggle="tab">
Coordinator
</a>
</li>
</ul>
<div id="my-tab-content" class="tab-content">
@@ -67,46 +79,22 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
<div id="includedContent"></div>
<div id="dataDisplayContent"></div>
<!-- ##################################### END DISPLAY PANEL ######################################### -->
<!-- ##################################### ROS BAG PANEL ######################################### -->
<!-- ROS Bag Panel -->
<div class="panel panel-default">
<div class="panel-heading">
ROS Bag
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-3">
Bagfile name must not start with "/"
<div class="input-group">
<input type="text" id="recordText" class="form-control" placeholder="bag_filename">
<span class="input-group-btn">
<button class="btn btn-primary" id="recordButton" type="button" onclick="toggleRecording()">
<span id="recordButtonText">
Start
</span>
</button>
</span>
</div>
</div>
</div>
</div>
</div>
<!-- ##################################### END ROS BAG PANEL ######################################### -->
</div>
<div class="tab-pane active" id="Coordinator">
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
<div id="coordinatorContent"></div>
<!-- ##################################### END DISPLAY PANEL ######################################### -->
</div>
<div class="tab-pane active" id="rosbridgeconnection">
<div class="tab-pane" id="rosbridgeconnection">
<div class="panel panel-default">
<div class="panel-heading">
Predefined Masters Connections