Merge branch 'ign-sensors6' into aditya/named_frames_imu

gazebosim · Mar 3, 2022 · dd33604 · dd33604
2 parents 3f42ba6 + 2614d1d
commit dd33604
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,3 +23,5 @@ jobs:
       - name: Compile and test
         id: ci
         uses: ignition-tooling/action-ignition-ci@focal
+        with:
+          cpplint-enabled: true
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -27,6 +27,7 @@ if (MSVC)
   # TODO(louise) Remove this once warnings are suppressed in ign-rendering
   set_source_files_properties(
       ${rendering_sources}
+      SegmentationCameraSensor.cc
     COMPILE_FLAGS "/wd4251"
   )
 endif()

diff --git a/test/integration/air_pressure.cc b/test/integration/air_pressure.cc
@@ -192,8 +192,8 @@ TEST_F(AirPressureSensorTest, SensorReadings)
   EXPECT_DOUBLE_EQ(vertRef, sensor->ReferenceAltitude());
   EXPECT_DOUBLE_EQ(vertRef, sensorNoise->ReferenceAltitude());
 
-  sensor->SetPose(sensorNoise->Pose() +
-      ignition::math::Pose3d(0, 0, 1.5, 0, 0, 0));
+  sensor->SetPose(
+      ignition::math::Pose3d(0, 0, 1.5, 0, 0, 0) * sensorNoise->Pose());
 
   // verify msg received on the topic
   WaitForMessageTestHelper<ignition::msgs::FluidPressure> msgHelper(topic);