Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

ROS 2 ouster os1 os0 #47

Merged
merged 38 commits into from
May 29, 2024
Merged

ROS 2 ouster os1 os0 #47

merged 38 commits into from
May 29, 2024

Conversation

delihus
Copy link
Contributor

@delihus delihus commented May 17, 2024

Unified XACRo for Ousters OS0 and OS1

Check after this:
#44

delihus and others added 30 commits April 17, 2024 12:07
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
Signed-off-by: Jakub Delicat <[email protected]>
@delihus delihus marked this pull request as draft May 17, 2024 08:16
@delihus delihus marked this pull request as ready for review May 23, 2024 13:17
Copy link
Contributor

@rafal-gorecki rafal-gorecki left a comment

Choose a reason for hiding this comment

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

One suggestion rest looks fine

@@ -71,18 +71,99 @@
/>
</xacro:if>

<xacro:if value="${type == 'LDR10'}">
Copy link
Contributor

@rafal-gorecki rafal-gorecki May 28, 2024

Choose a reason for hiding this comment

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

Probably all changes in this file can be reduced to:

  <xacro:property name="ouster_models_dict" value="${{
    'LDR10': 'os0_32',
    'LDR11': 'os0_64',
    'LDR12': 'os0_128',
    'LDR13': 'os1_32',
    'LDR14': 'os1_64',
    'LDR15': 'os1_128'
  }}" />

  <xacro:if value="${type in ouster_models_dict}">
    <xacro:include
      filename="$(find ros_components_description)/urdf/ouster.urdf.xacro"
      ns="lidar"
    />
    <xacro:lidar.ouster
      parent_link="${parent_link}"
      xyz="${xyz}"
      rpy="${rpy}"
      namespace="${robot_namespace}"
      device_namespace="${device_namespace}"
      model="${ouster_models_dict[type]}"
    />
  </xacro:if>

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great idea! Implemented

Signed-off-by: Jakub Delicat <[email protected]>
@rafal-gorecki rafal-gorecki merged commit 234c6ae into ros2 May 29, 2024
1 check passed
@rafal-gorecki rafal-gorecki deleted the ros2-ouster-os1-os0 branch May 29, 2024 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants