Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

Commit 52aecaa

Browse files
FlovaFlova
authored
Cleanup lowlevel (#136)
2 parents e82d34b + f7bff6e commit 52aecaa

32 files changed

+101
-326
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
a5a1b5cb51afa766e7c9f72fbba2f79a858641c2
33
975eb13a66bcf2e50525886453b40dd48b3b168f
44
874863ef235c3713aa1f50b507cb9017afdba0f5
5+
45e252ecd15849f7794de05dae7cbea0382a48a1
6+
ba13aadddd9356fc92d6fb998aafe59c485b468b
7+
45e252ecd15849f7794de05dae7cbea0382a48a1

‎Jenkinsfile‎

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

‎bitbots_buttons/.rdmanifest‎

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

‎bitbots_buttons/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ find_package(backward_ros REQUIRED)
1212
find_package(bitbots_docs REQUIRED)
1313
find_package(bitbots_msgs REQUIRED)
1414
find_package(bitbots_localization REQUIRED)
15-
find_package(humanoid_league_msgs REQUIRED)
1615
find_package(rclcpp REQUIRED)
1716
find_package(std_srvs REQUIRED)
1817
find_package(test_msgs REQUIRED)
@@ -23,7 +22,6 @@ ament_target_dependencies(button_node
2322
backward_ros
2423
bitbots_msgs
2524
bitbots_localization
26-
humanoid_league_msgs
2725
rclcpp
2826
std_msgs
2927
std_srvs
@@ -41,7 +39,6 @@ ament_export_dependencies(std_msgs)
4139
ament_export_dependencies(ament_cmake)
4240
ament_export_dependencies(bitbots_docs)
4341
ament_export_dependencies(bitbots_msgs)
44-
ament_export_dependencies(humanoid_league_msgs)
4542
ament_export_dependencies(std_msgs)
4643
ament_export_include_directories(${INCLUDE_DIRS})
4744

‎bitbots_buttons/package.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717

1818
<depend>backward_ros</depend>
1919
<depend>bitbots_docs</depend>
20-
<depend>bitbots_msgs</depend>
2120
<depend>bitbots_localization</depend>
22-
<depend>humanoid_league_msgs</depend>
21+
<depend>bitbots_msgs</depend>
2322
<depend>rclcpp</depend>
2423
<depend>std_msgs</depend>
2524
<depend>std_srvs</depend>

‎bitbots_buttons/src/button_node.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <signal.h>
22

33
#include <bitbots_localization/srv/reset_filter.hpp>
4+
#include <bitbots_msgs/msg/audio.hpp>
45
#include <bitbots_msgs/msg/buttons.hpp>
56
#include <bitbots_msgs/srv/manual_penalize.hpp>
6-
#include <humanoid_league_msgs/msg/audio.hpp>
77
#include <rclcpp/experimental/executors/events_executor/events_executor.hpp>
88
#include <rclcpp/rclcpp.hpp>
99
#include <std_msgs/msg/bool.hpp>
@@ -41,7 +41,7 @@ class ButtonNode : public rclcpp::Node {
4141
button3_time_ = 0.0;
4242

4343
// --- Initialize Topics ---
44-
speak_pub_ = this->create_publisher<humanoid_league_msgs::msg::Audio>("/speak", 1);
44+
speak_pub_ = this->create_publisher<bitbots_msgs::msg::Audio>("/speak", 1);
4545
shoot_publisher_ = this->create_publisher<std_msgs::msg::Bool>("/shoot_button", 1);
4646

4747
if (manual_penalty_mode_) {
@@ -176,7 +176,7 @@ class ButtonNode : public rclcpp::Node {
176176
* Helper method to send a message for text-to-speech output
177177
*/
178178
if (speak_) {
179-
humanoid_league_msgs::msg::Audio msg = humanoid_league_msgs::msg::Audio();
179+
bitbots_msgs::msg::Audio msg = bitbots_msgs::msg::Audio();
180180
msg.text = text;
181181
msg.priority = 100;
182182
speak_pub_->publish(msg);
@@ -199,7 +199,7 @@ class ButtonNode : public rclcpp::Node {
199199
double button2_time_;
200200
double button3_time_;
201201

202-
rclcpp::Publisher<humanoid_league_msgs::msg::Audio>::SharedPtr speak_pub_;
202+
rclcpp::Publisher<bitbots_msgs::msg::Audio>::SharedPtr speak_pub_;
203203
rclcpp::Publisher<std_msgs::msg::Bool>::SharedPtr shoot_publisher_;
204204
rclcpp::Client<bitbots_msgs::srv::ManualPenalize>::SharedPtr manual_penalize_client_;
205205
rclcpp::Client<std_srvs::srv::Empty>::SharedPtr foot_zero_client_;

‎bitbots_ros_control/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ find_package(controller_manager REQUIRED)
1616
find_package(diagnostic_msgs REQUIRED)
1717
find_package(dynamixel_workbench_toolbox REQUIRED)
1818
find_package(hardware_interface REQUIRED)
19-
find_package(humanoid_league_msgs REQUIRED)
2019
find_package(pluginlib REQUIRED)
2120
find_package(rclcpp REQUIRED)
2221
find_package(realtime_tools REQUIRED)
@@ -62,7 +61,6 @@ ament_target_dependencies(ros_control
6261
diagnostic_msgs
6362
dynamixel_workbench_toolbox
6463
hardware_interface
65-
humanoid_league_msgs
6664
pluginlib
6765
rclcpp
6866
realtime_tools
@@ -85,7 +83,6 @@ ament_target_dependencies(pressure_converter
8583
diagnostic_msgs
8684
dynamixel_workbench_toolbox
8785
hardware_interface
88-
humanoid_league_msgs
8986
pluginlib
9087
rclcpp
9188
realtime_tools
@@ -105,7 +102,6 @@ ament_export_dependencies(controller_interface)
105102
ament_export_dependencies(controller_manager)
106103
ament_export_dependencies(dynamixel_workbench_toolbox)
107104
ament_export_dependencies(hardware_interface)
108-
ament_export_dependencies(humanoid_league_msgs)
109105
ament_export_dependencies(pluginlib)
110106
ament_export_dependencies(realtime_tools)
111107
ament_export_dependencies(std_msgs)

‎bitbots_ros_control/config/analyzers.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ analyzers:
88
startswith: [ 'DS']
99
timeout: 0.2
1010
find_and_remove_prefix: ['DS']
11-
#Pressure:
12-
# type: diagnostic_aggregator/GenericAnalyzer
13-
# path: Pressure
14-
# startswith: ['PS']
15-
# timeout: 0.2
16-
# find_and_remove_prefix: ['PS']
1711
Core:
1812
type: diagnostic_aggregator/GenericAnalyzer
1913
path: Core
@@ -43,4 +37,10 @@ analyzers:
4337
path: System
4438
startswith: ['SYSTEM']
4539
timeout: 1.0
46-
find_and_remove_prefix: ['SYSTEM']
40+
find_and_remove_prefix: ['SYSTEM']
41+
#Pressure:
42+
# type: diagnostic_aggregator/GenericAnalyzer
43+
# path: Pressure
44+
# startswith: ['PS']
45+
# timeout: 0.2
46+
# find_and_remove_prefix: ['PS']

‎bitbots_ros_control/include/bitbots_ros_control/bitfoot_hardware_interface.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <bitbots_ros_control/hardware_interface.hpp>
88
#include <diagnostic_msgs/msg/diagnostic_array.hpp>
99
#include <diagnostic_msgs/msg/diagnostic_status.hpp>
10-
#include <humanoid_league_msgs/msg/audio.hpp>
1110
#include <rclcpp/rclcpp.hpp>
1211
#include <string>
1312

‎bitbots_ros_control/include/bitbots_ros_control/button_hardware_interface.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <diagnostic_msgs/msg/diagnostic_array.hpp>
1010
#include <diagnostic_msgs/msg/diagnostic_status.hpp>
1111
#include <hardware_interface/sensor_interface.hpp>
12-
#include <humanoid_league_msgs/msg/audio.hpp>
1312
#include <rclcpp/rclcpp.hpp>
1413
#include <string>
1514

0 commit comments

Comments
 (0)