Skip to content

Commit 7f90aeb

Browse files
RonaldsonBellandeRonaldsonBellande
authored
Merge pull request #23 from RonaldsonBellande/main
latest pushes
2 parents f7595df + e58fc1b commit 7f90aeb

File tree

8 files changed

+12
-121
lines changed

8 files changed

+12
-121
lines changed

‎README.md‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,10 @@
88

99
Welcome to the {BR&SRI} Humanoid Robot Intelligence Control System Demos repository! Here, we invite you to delve into the fascinating world of humanoid robotics, showcasing the innovative capabilities of our intelligent control system.
1010

11-
## 🔄 Run and Experiment with the build Bellande's Humanoid Robot
12-
13-
[![Bellande's Humanoid](https://img.shields.io/badge/Bellande's-Humanoid%20Robot%20Package-blue?style=for-the-badge&logo=ros&color=blue)](https://github.com/Robotics-Sensors/bellande_humanoid_robotics_package)
14-
15-
16-
## 📢 Work with Bellande Algorithms and Models through Bellande's API!
17-
18-
[![Bellande's Algorithm through Bellande API](https://img.shields.io/badge/Bellande's%20Algorithm%20through%20Bellande's%20API-Bellande%20API-blue?style=for-the-badge&logo=ros&color=blue)](https://github.com/Robotics-Sensors/Web-ROS-API)
19-
20-
---
21-
22-
## 🧑‍💼 Work with Bellande Models through Bellande Framework!
23-
24-
[![Bellande's Algorithm through Bellande API](https://img.shields.io/badge/Bellande's%20Models%20through%20Bellande's%20Framework-Bellande%20Framework-blue?style=for-the-badge&logo=ros&color=blue)](https://github.com/Robotics-Sensors/ROS-MODELS)
25-
26-
---
27-
2811
## 💻 Functionality To Switch from ROS to ROS2 Checkout The Below Repository
2912

3013
[![Toggle ROS Versions](https://img.shields.io/badge/Toggle%20ROS%20Versions-Explore%20ROS%20and%20ROS2%20migration-blue?style=for-the-badge&logo=ros&color=blue)](https://github.com/Robotics-Sensors/ros_extension/)
3114

32-
---
33-
3415
### 🚀 Key Repository Stats
3516

3617
- ![GitHub stars](https://img.shields.io/github/stars/Robotics-Sensors/humanoid_robot_intelligence_control_system_demos.svg?style=social) Starred by the community
@@ -75,7 +56,7 @@ The repository has recently undergone significant updates. Older commits and cod
7556

7657
### 🧑‍💼 Maintainer
7758

78-
Meet our dedicated author & maintainer, **Ronaldson Bellande**.
59+
Meet our dedicated maintainer, **Ronaldson Bellande**.
7960

8061
---
8162

‎humanoid_robot_intelligence_control_system_ball_detector/package.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ the License.
4444
<build_depend condition="$ROS_VERSION == 1">message_runtime</build_depend>
4545
<build_depend condition="$ROS_VERSION == 1">message_runtime</build_depend>
4646
<build_depend condition="$ROS_VERSION == 1">usb_cam</build_depend>
47-
<build_depend condition="$ROS_VERSION == 1">uvc_camera</build_depend>
4847

4948
<build_export_depend condition="$ROS_VERSION == 1">roscpp</build_export_depend>
5049
<build_export_depend condition="$ROS_VERSION == 1">roslib</build_export_depend>
@@ -61,7 +60,6 @@ the License.
6160
<build_export_depend condition="$ROS_VERSION == 1">message_runtime</build_export_depend>
6261
<build_export_depend condition="$ROS_VERSION == 1">message_runtime</build_export_depend>
6362
<build_export_depend condition="$ROS_VERSION == 1">usb_cam</build_export_depend>
64-
<build_export_depend condition="$ROS_VERSION == 1">uvc_camera</build_export_depend>
6563

6664
<exec_depend condition="$ROS_VERSION == 1">roscpp</exec_depend>
6765
<exec_depend condition="$ROS_VERSION == 1">roslib</exec_depend>
@@ -78,7 +76,6 @@ the License.
7876
<exec_depend condition="$ROS_VERSION == 1">message_runtime</exec_depend>
7977
<exec_depend condition="$ROS_VERSION == 1">message_runtime</exec_depend>
8078
<exec_depend condition="$ROS_VERSION == 1">usb_cam</exec_depend>
81-
<exec_depend condition="$ROS_VERSION == 1">uvc_camera</exec_depend>
8279

8380

8481
<buildtool_depend condition="$ROS_VERSION == 2">ament_cmake</buildtool_depend>
@@ -98,7 +95,6 @@ the License.
9895
<build_depend condition="$ROS_VERSION == 2">message_runtime</build_depend>
9996
<build_depend condition="$ROS_VERSION == 2">message_runtime</build_depend>
10097
<build_depend condition="$ROS_VERSION == 2">usb_cam</build_depend>
101-
<build_depend condition="$ROS_VERSION == 2">uvc_camera</build_depend>
10298

10399
<build_export_depend condition="$ROS_VERSION == 2">roscpp</build_export_depend>
104100
<build_export_depend condition="$ROS_VERSION == 2">roslib</build_export_depend>
@@ -115,7 +111,6 @@ the License.
115111
<build_export_depend condition="$ROS_VERSION == 2">message_runtime</build_export_depend>
116112
<build_export_depend condition="$ROS_VERSION == 2">message_runtime</build_export_depend>
117113
<build_export_depend condition="$ROS_VERSION == 2">usb_cam</build_export_depend>
118-
<build_export_depend condition="$ROS_VERSION == 2">uvc_camera</build_export_depend>
119114

120115
<exec_depend condition="$ROS_VERSION == 2">roscpp</exec_depend>
121116
<exec_depend condition="$ROS_VERSION == 2">roslib</exec_depend>
@@ -132,7 +127,5 @@ the License.
132127
<exec_depend condition="$ROS_VERSION == 2">message_runtime</exec_depend>
133128
<exec_depend condition="$ROS_VERSION == 2">message_runtime</exec_depend>
134129
<exec_depend condition="$ROS_VERSION == 2">usb_cam</exec_depend>
135-
<exec_depend condition="$ROS_VERSION == 2">uvc_camera</exec_depend>
136-
137130

138131
</package>

‎humanoid_robot_intelligence_control_system_bringup/launch/humanoid_robot_intelligence_control_system_bringup_visualization.launch‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<param name="robot_description" command="$(find xacro)/xacro.py '$(find humanoid_robot_intelligence_control_system_description)/urdf/humanoid_robot_intelligence_control_system.urdf.xacro'" />
3+
<param name="robot_description"
4+
command="$(find xacro)/xacro.py '$(find humanoid_robot_intelligence_control_system_description)/urdf/humanoid_robot_intelligence_control_system.urdf.xacro'" />
45

56
<!-- Send fake joint values and monitoring present joint angle -->
67
<node pkg="joint_state_publisher" type="joint_state_publisher" name="joint_state_publisher">
78
<param name="use_gui" value="TRUE" />
8-
<rosparam param="/source_list">[/humanoid_robot_intelligence_control_system/present_joint_states]</rosparam>
9+
<rosparam param="/source_list">
10+
[/humanoid_robot_intelligence_control_system/present_joint_states]</rosparam>
911
</node>
1012

1113
<!-- Combine joint values -->
1214
<node pkg="robot_state_publisher" type="state_publisher" name="robot_state_publisher">
13-
<remap from="/joint_states" to="/humanoid_robot_intelligence_control_system/present_joint_states" />
15+
<remap from="/joint_states"
16+
to="/humanoid_robot_intelligence_control_system/present_joint_states" />
1417
</node>
1518

1619
<!-- Show in Rviz -->
17-
<node pkg="rviz" type="rviz" name="rviz" args="-d $(find humanoid_robot_intelligence_control_system_bringup)/rviz/humanoid_robot_intelligence_control_system_bringup.rviz" />
20+
<node pkg="rviz" type="rviz" name="rviz"
21+
args="-d $(find humanoid_robot_intelligence_control_system_bringup)/rviz/humanoid_robot_intelligence_control_system_bringup.rviz" />
1822
</launch>

‎humanoid_robot_intelligence_control_system_demo/humanoid_robot_humanoid_robot_demo/CHANGELOG.rst‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎humanoid_robot_intelligence_control_system_demo/humanoid_robot_humanoid_robot_demo/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎humanoid_robot_intelligence_control_system_demo/humanoid_robot_humanoid_robot_demo/package.xml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎humanoid_robot_intelligence_control_system_demo/launch/face_detection_humanoid_robot.launch‎ renamed to ‎humanoid_robot_intelligence_control_system_demo/launch/face_detection.launch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<arg name="face_cascade_name_0"
44
default="$(find face_detection)/include/face_detection/HaarCascades/haarcascade_frontalface_alt.xml" />
55
<arg name="face_cascade_name_1"
6-
default="$(find face_detection)/include/face_detection//HaarCascades/haarcascade_frontalface_alt2.xml" />
6+
default="$(find face_detection)/include/face_detection/HaarCascades/haarcascade_frontalface_alt2.xml" />
77
<arg name="face_cascade_name_2"
8-
default="$(find face_detection)/include/face_detection//HaarCascades/haarcascade_frontalface_alt_tree.xml" />
8+
default="$(find face_detection)/include/face_detection/HaarCascades/haarcascade_frontalface_alt_tree.xml" />
99
<arg name="face_cascade_name_3"
10-
default="$(find face_detection)/include/face_detection//HaarCascades/haarcascade_frontalface_default.xml" />
10+
default="$(find face_detection)/include/face_detection/HaarCascades/haarcascade_frontalface_default.xml" />
1111
<arg name="face_cascade_name_4"
1212
default="$(find face_detection)/include/face_detection/lbpCascades/lbpcascade_frontalface.xml" />
1313

‎humanoid_robot_intelligence_control_system_demo/package.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ the License.
5151
humanoid_robot_intelligence_control_system_camera_setting_tool</build_depend>
5252
<build_depend condition="$ROS_VERSION == 1">
5353
humanoid_robot_intelligence_control_system_web_setting_tool</build_depend>
54-
<build_depend condition="$ROS_VERSION == 1">ros_madplay_player</build_depend>
55-
<build_depend condition="$ROS_VERSION == 1">face_detection</build_depend>
5654

5755
<build_export_depend condition="$ROS_VERSION == 1">roscpp</build_export_depend>
5856
<build_export_depend condition="$ROS_VERSION == 1">roslib</build_export_depend>
@@ -78,8 +76,6 @@ the License.
7876
humanoid_robot_intelligence_control_system_camera_setting_tool</build_export_depend>
7977
<build_export_depend condition="$ROS_VERSION == 1">
8078
humanoid_robot_intelligence_control_system_web_setting_tool</build_export_depend>
81-
<build_export_depend condition="$ROS_VERSION == 1">ros_madplay_player</build_export_depend>
82-
<build_export_depend condition="$ROS_VERSION == 1">face_detection</build_export_depend>
8379

8480
<exec_depend condition="$ROS_VERSION == 1">roscpp</exec_depend>
8581
<exec_depend condition="$ROS_VERSION == 1">roslib</exec_depend>
@@ -104,8 +100,6 @@ the License.
104100
humanoid_robot_intelligence_control_system_camera_setting_tool</exec_depend>
105101
<exec_depend condition="$ROS_VERSION == 1">
106102
humanoid_robot_intelligence_control_system_web_setting_tool</exec_depend>
107-
<exec_depend condition="$ROS_VERSION == 1">ros_madplay_player</exec_depend>
108-
<exec_depend condition="$ROS_VERSION == 1">face_detection</exec_depend>
109103

110104

111105
<buildtool_depend condition="$ROS_VERSION == 2">ament_cmake</buildtool_depend>
@@ -133,8 +127,6 @@ the License.
133127
humanoid_robot_intelligence_control_system_camera_setting_tool</build_depend>
134128
<build_depend condition="$ROS_VERSION == 2">
135129
humanoid_robot_intelligence_control_system_web_setting_tool</build_depend>
136-
<build_depend condition="$ROS_VERSION == 2">ros_madplay_player</build_depend>
137-
<build_depend condition="$ROS_VERSION == 2">face_detection</build_depend>
138130

139131
<build_export_depend condition="$ROS_VERSION == 2">roscpp</build_export_depend>
140132
<build_export_depend condition="$ROS_VERSION == 2">roslib</build_export_depend>
@@ -160,8 +152,6 @@ the License.
160152
humanoid_robot_intelligence_control_system_camera_setting_tool</build_export_depend>
161153
<build_export_depend condition="$ROS_VERSION == 2">
162154
humanoid_robot_intelligence_control_system_web_setting_tool</build_export_depend>
163-
<build_export_depend condition="$ROS_VERSION == 2">ros_madplay_player</build_export_depend>
164-
<build_export_depend condition="$ROS_VERSION == 2">face_detection</build_export_depend>
165155

166156
<exec_depend condition="$ROS_VERSION == 2">roscpp</exec_depend>
167157
<exec_depend condition="$ROS_VERSION == 2">roslib</exec_depend>
@@ -186,7 +176,5 @@ the License.
186176
humanoid_robot_intelligence_control_system_camera_setting_tool</exec_depend>
187177
<exec_depend condition="$ROS_VERSION == 2">
188178
humanoid_robot_intelligence_control_system_web_setting_tool</exec_depend>
189-
<exec_depend condition="$ROS_VERSION == 2">ros_madplay_player</exec_depend>
190-
<exec_depend condition="$ROS_VERSION == 2">face_detection</exec_depend>
191179

192180
</package>

0 commit comments

Comments
 (0)