diff --git a/requirements.txt b/requirements.txt index 44ff4bf..c70bf5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ opencv-python==4.8.1.78 typing-extensions>=4.4.0 -ultralytics==8.2.71 +ultralytics==8.2.79 super_gradients==3.7.1 lap==0.4.0 \ No newline at end of file diff --git a/yolov8_ros/yolov8_ros/yolov8_node.py b/yolov8_ros/yolov8_ros/yolov8_node.py index 55b5274..2434c01 100644 --- a/yolov8_ros/yolov8_ros/yolov8_node.py +++ b/yolov8_ros/yolov8_ros/yolov8_node.py @@ -103,18 +103,11 @@ def on_configure(self, state: LifecycleState) -> TransitionCallbackReturn: return TransitionCallbackReturn.SUCCESS - def enable_cb(self, request, response): - self.enable = request.data - response.success = True - return response - def on_activate(self, state: LifecycleState) -> TransitionCallbackReturn: self.get_logger().info(f"Activating {self.get_name()}") self.yolo = self.type_to_model[self.model_type](self.model) - - if "v10" not in self.model: - self.yolo.fuse() + self.yolo.fuse() # subs self._sub = self.create_subscription( @@ -152,6 +145,11 @@ def on_cleanup(self, state: LifecycleState) -> TransitionCallbackReturn: return TransitionCallbackReturn.SUCCESS + def enable_cb(self, request: SetBool.Request, response: SetBool.Response) -> SetBool.Response: + self.enable = request.data + response.success = True + return response + def parse_hypothesis(self, results: Results) -> List[Dict]: hypothesis_list = []