Skip to content

Commit 6ffa922

Browse files
[.github] Remove core common_drivers COLCON_IGNORE in xs_humble CI (#84)
* Remove core common_drivers COLCON_IGNORE * Lint * Lint
1 parent 3a1ae1f commit 6ffa922

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

.github/workflows/xs-humble.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
- name: Prepare Workspace
4141
run: |
4242
rm src/interbotix_ros_core/interbotix_ros_xseries/COLCON_IGNORE || echo "File not found"
43+
rm src/interbotix_ros_core/interbotix_ros_common_drivers/COLCON_IGNORE || echo "File not found"
4344
rm src/interbotix_ros_toolboxes/interbotix_perception_toolbox/COLCON_IGNORE
4445
rm src/interbotix_ros_toolboxes/interbotix_io_toolbox/COLCON_IGNORE
4546
rm src/interbotix_ros_toolboxes/interbotix_common_toolbox/interbotix_moveit_interface/COLCON_IGNORE

interbotix_common_toolbox/interbotix_common_modules/interbotix_common_modules/common_robot/robot.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,12 @@ def __start(node: InterbotixRobotNode, daemon: bool = True) -> None:
9999
global __interbotix_execution_thread
100100
global __interbotix_executor
101101
__interbotix_executor = MultiThreadedExecutor()
102+
102103
def spin(node: InterbotixRobotNode) -> None:
103104
while rclpy.ok():
104105
__interbotix_executor.add_node(node=node)
105106
__interbotix_executor.spin()
107+
106108
__interbotix_execution_thread = Thread(target=spin, args=(node,), daemon=daemon)
107109
__interbotix_execution_thread.start()
108110

interbotix_common_toolbox/interbotix_gravity_compensation/include/interbotix_gravity_compensation/interbotix_gravity_compensation.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2727
// POSSIBILITY OF SUCH DAMAGE.
2828

29-
#ifndef INTERBOTIX_GRAVITY_COMPENSATION_HPP_
30-
#define INTERBOTIX_GRAVITY_COMPENSATION_HPP_
29+
#ifndef INTERBOTIX_GRAVITY_COMPENSATION__INTERBOTIX_GRAVITY_COMPENSATION_HPP_
30+
#define INTERBOTIX_GRAVITY_COMPENSATION__INTERBOTIX_GRAVITY_COMPENSATION_HPP_
3131

3232
#include <memory>
3333
#include <mutex>
@@ -196,4 +196,4 @@ class InterbotixGravityCompensation : public rclcpp::Node
196196
bool prepare_tree();
197197
};
198198

199-
#endif // INTERBOTIX_GRAVITY_COMPENSATION_HPP_
199+
#endif // INTERBOTIX_GRAVITY_COMPENSATION__INTERBOTIX_GRAVITY_COMPENSATION_HPP_

interbotix_xs_toolbox/interbotix_xs_modules/interbotix_xs_modules/xs_robot/gravity_compensation.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ def __init__(
4949
logging_level: LoggingSeverity = LoggingSeverity.INFO,
5050
node_name: str = 'interbotix_robot_manipulation',
5151
node: InterbotixRobotNode = None,
52-
args = None,
52+
args=None,
5353
) -> None:
5454
"""
5555
Construct the Interbotix Gravity Compensation Module.
5656
5757
:param robot_model: Interbotix Arm model (ex. 'wx250' or 'aloha_wx250s')
5858
:param robot_name: (optional) defaults to value given to 'robot_model'; this can be
59-
customized if controlling two of the same arms from one computer (like 'arm1/wx250s' and
60-
'arm2/wx250s')
59+
customized if controlling two of the same arms from one computer (like 'arm1/wx250s'
60+
and 'arm2/wx250s')
6161
:param topic_joint_states: (optional) the specific JointState topic output by the xs_sdk
6262
node
6363
:param logging_level: (optional) rclpy logging severity level. Can be DEBUG, INFO, WARN,
@@ -104,17 +104,13 @@ def __init__(self, core: InterbotixRobotXSCore) -> None:
104104
self.request = SetBool.Request()
105105

106106
def enable(self) -> None:
107-
"""
108-
Enable gravity compensation on the robot.
109-
"""
107+
"""Enable gravity compensation on the robot."""
110108
self.request.data = True
111109
self.core.get_node().wait_until_future_complete(
112110
self.client.call_async(self.request))
113111

114112
def disable(self) -> None:
115-
"""
116-
Disable gravity compensation on the robot.
117-
"""
113+
"""Disable gravity compensation on the robot."""
118114
self.request.data = False
119115
self.core.get_node().wait_until_future_complete(
120116
self.client.call_async(self.request))

0 commit comments

Comments
 (0)