Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade web remocon for supporting pairing mode and applying stop app #23

Merged
merged 12 commits into from
Jun 26, 2015
Merged

Upgrade web remocon for supporting pairing mode and applying stop app #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a3dcdb
update getting permission and delete part of checking interaction name
dwlee May 7, 2015
b0b501e
update stopapp functionality and support pairing mode
dwlee May 7, 2015
9be933c
add stop app function
dwlee May 7, 2015
389e5ce
apply enabled status by checking interaction running
dwlee May 8, 2015
f495a2f
fix that stop all apps does not work and show always stop all apps bu…
dwlee May 8, 2015
d2592ad
patch listner
hughie May 8, 2015
5b191e4
update running interactions termination when web remocon is shutdown
dwlee Jun 11, 2015
ea5f5cc
Merge branch 'req_interaction_patch' of https://github.com/robotics-i…
dwlee Jun 11, 2015
9633fbd
Merge branch 'indigo' into req_interaction_patch
dwlee Jun 25, 2015
b97b1f2
name change into interaction from app and teminate launched interacti…
dwlee Jun 25, 2015
1b14090
update data handling condition when it is finding topic and service
dwlee Jun 25, 2015
76d083a
merge to indigo
dwlee Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions rocon_web_common/www/example/listener.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
<!--
<script type="text/javascript" src="http://chimek.yujinrobot.com/rosjs/interactions.js"></script>
-->
<script type="text/javascript" src="/rocon_web_common/js/interactions.js"></script>
<script type="text/javascript" src="/rocon_web_common/js/rocon/interactions.js"></script>
<script type="text/javascript" type="text/javascript">

$.ready() {
function init() {

var log_div = $("#log_div");
var info_div = $("#info_div");
var log_div = document.getElementById("log_div");
var info_div = document.getElementById("info_div");

info_div.append("Display Name : " + rocon_interactions.display_name + "<br/>");
info_div.append("Rosbridge URI: " + rocon_interactions.rosbridge_uri + "<br/>");
info_div.append("Parameters : " + JSON.stringify(rocon_interactions.parameters) + "<br/>");
info_div.append("Remappings : " + JSON.stringify(rocon_interactions.remappings) + "<br/>");
info_div.innerHTML = "Display Name : " + rocon_interactions.display_name + "<br/>";
info_div.innerHTML += "Rosbridge URI: " + rocon_interactions.rosbridge_uri + "<br/>";
info_div.innerHTML += "Parameters : " + JSON.stringify(rocon_interactions.parameters) + "<br/>";
info_div.innerHTML += "Remappings : " + JSON.stringify(rocon_interactions.remappings) + "<br/>";

// Connecting to ROS
// -----------------
Expand All @@ -42,13 +42,13 @@
listener.subscribe(function(message) {
//console.log('Received message on ' + listener.name + ': ' + message.data);
//listener.unsubscribe();
log_div.append(message + "</br>");
log_div.innerHTML += message.data + "</br>";
});
}
</script>
</head>

<body>
<body onload="init()">
<h1>Rocon Interactions Listener Demo</h1>
<p>Check your Web Console for Information(hit F12 in google chrome).</p>
<h1>Info</h1>
Expand Down
10 changes: 8 additions & 2 deletions rocon_web_remocon/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,14 @@ <h3 class="text-center"><span class="label label-primary">Description</span></h3
<div class="panel-body" id="descriptionpanel">
</div>
</div>

<button type="button" class="btn btn-info center-block" style="width:150px; height:40px; font-size:20px" id="startappBtn">Start App</button>
<div class="row">
<button type="button" class="btn btn-info col-md-4 col-md-offset-1" style="font-size:18px" id="startInteractionBtn">Start Interaction</button>
<button type="button" class="btn btn-info col-md-4 col-md-offset-2" style="font-size:18px" id="stopInteractionBtn">Stop Interaction</button>
</div>
<p/>
<div class="row">
<button type="button" class="btn btn-info col-md-10 col-md-offset-1" style="font-size:18px" id="stopAllInteractionsBtn">Stop All Interactions</button>
</div>
</div>
</div>
</div>
Expand Down
Loading