Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fall and wave detection ROS nodes #423

Merged
merged 44 commits into from
Apr 20, 2023
Merged

Fall and wave detection ROS nodes #423

merged 44 commits into from
Apr 20, 2023

Conversation

tsampazk
Copy link
Collaborator

@tsampazk tsampazk commented Mar 29, 2023

Overhauled fall detection ROS1/2 nodes to work both by subscribing to an image topic and running pose estimation internally (original mode) and by subscribing to a pose topic and only running fall detection (new mode). Performance stuff is not added in this PR, but will get merged together with #419, i expect some conflicts as the merge is not straightforward, but i will handle it when it comes up.

Added wave detection ROS1/2 nodes that work similar to the new fall detection nodes. The wave detection method used is similar to the one used in the Lightweight OpenPose wave detection demo. Performance is added in this PR as the node is new.

Additionally added a new method to_ros_box to ROS1/2 bridges to be able to convert single bboxes.

TODO:

  • ROS2 fall detection readme update
  • ROS1 wave detection readme update
  • ROS2 wave detection node
  • ROS2 wave detection readme update

@thomaspeyrucain

@tsampazk tsampazk added the test sources Run style checks label Mar 29, 2023
@tsampazk tsampazk self-assigned this Mar 29, 2023
@tsampazk tsampazk marked this pull request as ready for review April 4, 2023 11:16
Copy link
Collaborator

@stefaniapedrazzi stefaniapedrazzi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Everything seems fine.
I just have a couple of very minor comments.

@tsampazk
Copy link
Collaborator Author

Thanks for the review @stefaniapedrazzi, i applied your suggestions and i will now resolve the conflicts that arose by merging the performance PR. I will also add the performance stuff to the fall detection nodes.

@tsampazk tsampazk added test sources Run style checks and removed test sources Run style checks labels Apr 12, 2023
Copy link
Collaborator

@stefaniapedrazzi stefaniapedrazzi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Copy link
Collaborator

@passalis passalis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@tsampazk tsampazk merged commit 3eeeb94 into develop Apr 20, 2023
@tsampazk tsampazk deleted the fall-wave-ros-nodes branch April 20, 2023 10:21
lucamarchionni pushed a commit to lucamarchionni/opendr that referenced this pull request Jun 10, 2024
* Overhauled fall detection node to be able to run on pose messages

* Added to_ros_box in bridge, needed for overhauled fall detection node

* Updated fall detection node section

* Minor fix ros1 fall node

* Added to_rox_box in ros2 bridge

* Updated ros2 fall detection node

* Initial version of ros1 wave detection node

* Renamed class

* Added performance to ros1 wave detection node

* Minor fixes in fall_detection_node.py

* Refactored wave_detection_node.py to work similar to fall detection node

* Applied minor fixes to ros2 fall_detection_node.py

* Removed unused import

* Fall detection ros1 - visualization mode now publishes bboxes too

* Fall detection ros2 - visualization mode now publishes bboxes too, fixed bug

* Fall detection ros1 doc minor updates

* Fall detection ros2 doc updated for newly updated node

* Wave detection ros1, added missing docstring and wave detection messages are published in both modes

* Added wave detection entry in node index list

* Added wave detection section entry and fixed minor thing in fall detection section

* Fixed broken link

* Added ros2 wave detection node entry in setup.py

* Added new ros2 wave detection node

* Fixed broken link

* Added wave detection entry in node index list

* Added wave detection section entry and fixed minor thing in fall detection section

* Removed unused import

* Fixed default ctor argument and simplified if/else as suggested by review

* Fixed default ctor argument as suggested by review

* Fixed default ctor argument as suggested by review

* Fixes as suggested by review

* Re-arranged docstring to match actual order of arguments

* Added performance to fall detection ROS1 node

* Fixed performance topic name

* Added performance topic arg entries for wave and fall detection nodes

* Re-arranged docstring to match actual order of arguments

* Added performance to fall detection ROS2 node

* Added performance topic arg entries for wave and fall detection nodes

* Fixed wrong publisher argument in ros2 wave/fall nodes

* Fixed fall_detection_node.py performance measurement

* Fixed wave_detection_node.py performance measurement

* Fixed ROS2 fall_detection_node.py performance measurement

* Fixed ROS2 wave_detection_node.py performance measurement
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
test sources Run style checks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants