From 0d89ca57ec681b5357139fda5ddb2005060176cd Mon Sep 17 00:00:00 2001 From: Yara Shahin <58101871+YaraShahin@users.noreply.github.com> Date: Mon, 29 Dec 2025 14:51:03 +0200 Subject: [PATCH 1/2] add BatteryStates msg (#250) (cherry picked from commit 20d59df5bff40688023e3f987cb0fbf9aaea740e) # Conflicts: # control_msgs/CMakeLists.txt --- control_msgs/CMakeLists.txt | 5 +++++ control_msgs/msg/BatteryStateArray.msg | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 control_msgs/msg/BatteryStateArray.msg diff --git a/control_msgs/CMakeLists.txt b/control_msgs/CMakeLists.txt index ab729df..3e620fb 100644 --- a/control_msgs/CMakeLists.txt +++ b/control_msgs/CMakeLists.txt @@ -13,6 +13,11 @@ find_package(trajectory_msgs REQUIRED) set(msg_files msg/AdmittanceControllerState.msg +<<<<<<< HEAD +======= + msg/BatteryStateArray.msg + msg/CANopenState.msg +>>>>>>> 20d59df (add BatteryStates msg (#250)) msg/DynamicInterfaceGroupValues.msg msg/DynamicInterfaceValues.msg msg/DynamicJointState.msg diff --git a/control_msgs/msg/BatteryStateArray.msg b/control_msgs/msg/BatteryStateArray.msg new file mode 100644 index 0000000..0d77041 --- /dev/null +++ b/control_msgs/msg/BatteryStateArray.msg @@ -0,0 +1,2 @@ +# This message publishes values for multiple batteries at once. +sensor_msgs/BatteryState[] battery_states From 8c3d5260444e66bec6747561a8a1a964551b143a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 31 Dec 2025 10:19:02 +0100 Subject: [PATCH 2/2] Update CMakeLists.txt --- control_msgs/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/control_msgs/CMakeLists.txt b/control_msgs/CMakeLists.txt index 5b1196d..f5fa8b6 100644 --- a/control_msgs/CMakeLists.txt +++ b/control_msgs/CMakeLists.txt @@ -13,11 +13,7 @@ find_package(trajectory_msgs REQUIRED) set(msg_files msg/AdmittanceControllerState.msg -<<<<<<< HEAD -======= msg/BatteryStateArray.msg - msg/CANopenState.msg ->>>>>>> 20d59df (add BatteryStates msg (#250)) msg/DynamicInterfaceGroupValues.msg msg/DynamicInterfaceValues.msg msg/DynamicJointState.msg