Skip to content

Commit

Permalink
Remove action helper types
Browse files Browse the repository at this point in the history
  • Loading branch information
sea-bass committed Dec 14, 2023
1 parent f6225a2 commit afa5e4a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 86 deletions.
4 changes: 1 addition & 3 deletions examples/ros2_action_client.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@
});

// Send an action goal
var goal = new ROSLIB.ActionGoal({
order: 5,
});
var goal = {order: 5};

var goal_id = fibonacciClient.sendGoal(goal,
function(result) {
Expand Down
17 changes: 6 additions & 11 deletions src/core/Action.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
* @author Sebastian Castro - [email protected]
*/

var ActionGoal = require('./ActionGoal');
var ActionFeedback = require('./ActionFeedback');
var ActionResult = require('./ActionResult');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var Ros = require('../core/Ros');

Expand Down Expand Up @@ -67,11 +64,9 @@ class Action extends EventEmitter2 {
failedCallback(message.values);
}
} else if (message.op === 'action_feedback' && typeof feedbackCallback === 'function') {
// @ts-expect-error -- can't figure out how to get ActionFeedback to play nice in typescript here
feedbackCallback(new ActionFeedback(message.values));
feedbackCallback(message.values);
} else if (message.op === 'action_result' && typeof resultCallback === 'function') {
// @ts-expect-error -- can't figure out how to get ActionResult to play nice in typescript here
resultCallback(new ActionResult(message.values));
resultCallback(message.values);
}
});
}
Expand Down Expand Up @@ -181,14 +176,14 @@ class Action extends EventEmitter2 {
* Helper function to send action feedback inside an action handler.
*
* @param {string} id - The action goal ID.
* @param {ActionFeedback<TFeedback>} feedback - The feedback to send.
* @param {TFeedback} feedback - The feedback to send.
*/
sendFeedback(id, feedback) {
var call = {
op: 'action_feedback',
id: id,
action: this.name,
values: new ActionFeedback(feedback),
values: feedback,
};
this.ros.callOnConnection(call);
}
Expand All @@ -197,14 +192,14 @@ class Action extends EventEmitter2 {
* Helper function to set an action as succeeded.
*
* @param {string} id - The action goal ID.
* @param {ActionResult} result - The result to set.
* @param {TResult} result - The result to set.
*/
setSucceeded(id, result) {
var call = {
op: 'action_result',
id: id,
action: this.name,
values: new ActionResult(result),
values: result,
result: true,
};
this.ros.callOnConnection(call);
Expand Down
23 changes: 0 additions & 23 deletions src/core/ActionFeedback.js

This file was deleted.

23 changes: 0 additions & 23 deletions src/core/ActionGoal.js

This file was deleted.

23 changes: 0 additions & 23 deletions src/core/ActionResult.js

This file was deleted.

3 changes: 0 additions & 3 deletions src/core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,4 @@ module.exports = {
ServiceRequest: require('./ServiceRequest'),
ServiceResponse: require('./ServiceResponse'),
Action: require('./Action'),
ActionGoal: require('./ActionGoal'),
ActionFeedback: require('./ActionFeedback'),
ActionResult: require('./ActionResult')
};

0 comments on commit afa5e4a

Please sign in to comment.