From 6099bb0a46e3c8b80c9eae5ca47ba138c32e9154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Wiegmann?= Date: Wed, 22 Jan 2025 15:00:14 +0100 Subject: [PATCH 1/4] Fix duplicate entriy in msg --- bitbots_msgs/action/Dynup.action | 3 --- 1 file changed, 3 deletions(-) diff --git a/bitbots_msgs/action/Dynup.action b/bitbots_msgs/action/Dynup.action index 939261314..6e5620f2f 100644 --- a/bitbots_msgs/action/Dynup.action +++ b/bitbots_msgs/action/Dynup.action @@ -9,9 +9,6 @@ string DIRECTION_RISE = "rise" string DIRECTION_DESCEND = "descend" string DIRECTION_WALKREADY = "walkready" -# Requests from the HCM have higher prio and are published to a different topic -bool from_hcm - --- # Result definition bool successful From e79dc85ef4fd89494e370f9191093beea0c91a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Wiegmann?= Date: Wed, 22 Jan 2025 15:38:48 +0100 Subject: [PATCH 2/4] Add bitbots tf buffer to sync includes --- sync_includes_wolfgang_nuc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync_includes_wolfgang_nuc.yaml b/sync_includes_wolfgang_nuc.yaml index 7c2e24c43..9f8005637 100644 --- a/sync_includes_wolfgang_nuc.yaml +++ b/sync_includes_wolfgang_nuc.yaml @@ -15,7 +15,6 @@ include: - bitbots_parameter_blackboard - bitbots_robot_description - bitbots_teleop - - bitbots_tf_buffer - bitbots_tts - bitbots_utils - system_monitor @@ -51,6 +50,7 @@ include: - bio_ik - bio_ik_msgs - biped_interfaces + - bitbots_tf_buffer - dynamic_stack_decider - dynamixel-workbench - DynamixelSDK From 71a769cc8cb50d4568584e341fee4e5286a38768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Wiegmann?= Date: Wed, 22 Jan 2025 15:43:48 +0100 Subject: [PATCH 3/4] Fix typing issues in vision --- bitbots_vision/bitbots_vision/vision_modules/yoeo/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbots_vision/bitbots_vision/vision_modules/yoeo/utils.py b/bitbots_vision/bitbots_vision/vision_modules/yoeo/utils.py index 15a11301d..22c8ae311 100644 --- a/bitbots_vision/bitbots_vision/vision_modules/yoeo/utils.py +++ b/bitbots_vision/bitbots_vision/vision_modules/yoeo/utils.py @@ -5,7 +5,7 @@ import cv2 import numpy as np import rclpy -from jaxtyping import UInt8 +from jaxtyping import Float64, UInt8 logger = rclpy.logging.get_logger("yoeo_handler_utils") @@ -158,10 +158,10 @@ def get_info(self) -> ImagePreProcessorData: padding_bottom=self._padding_bottom, padding_left=self._padding_left, padding_right=self._padding_right, - max_dim=np.max(self._image_dimensions_HW), + max_dim=int(np.max(self._image_dimensions_HW)), ) - def process(self, image: UInt8[np.ndarray, "h w 3"]) -> UInt8[np.ndarray, "3 network_input_h network_input_w"]: + def process(self, image: UInt8[np.ndarray, "h w 3"]) -> Float64[np.ndarray, "3 network_input_h network_input_w"]: self._image_dimensions_HW = image.shape[:2] # type: ignore[assignment] self._calculate_paddings() From 19beac35cc9ceed3909ed9df616d669490ad3655 Mon Sep 17 00:00:00 2001 From: Florian Vahl <7vahl@informatik.uni-hamburg.de> Date: Wed, 22 Jan 2025 19:21:18 +0100 Subject: [PATCH 4/4] Revert "Fix duplicate entriy in msg" This reverts commit 6099bb0a46e3c8b80c9eae5ca47ba138c32e9154. --- bitbots_msgs/action/Dynup.action | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitbots_msgs/action/Dynup.action b/bitbots_msgs/action/Dynup.action index 6e5620f2f..939261314 100644 --- a/bitbots_msgs/action/Dynup.action +++ b/bitbots_msgs/action/Dynup.action @@ -9,6 +9,9 @@ string DIRECTION_RISE = "rise" string DIRECTION_DESCEND = "descend" string DIRECTION_WALKREADY = "walkready" +# Requests from the HCM have higher prio and are published to a different topic +bool from_hcm + --- # Result definition bool successful