Merge pull request #16 from ctu-mrs/devel

added fluid dynamics, fixed compilation on ARM
ctu-mrs · Oct 5, 2023 · 3aebd55 · 3aebd55
2 parents 606952a + a741e26
commit 3aebd55
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/.github/workflows/ros_build_test.yml b/.github/workflows/ros_build_test.yml
@@ -0,0 +1,19 @@
+name: ros_build_test
+
+on:
+
+  push:
+    branches: [ devel ]
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  build:
+    uses: ctu-mrs/ci_scripts/.github/workflows/ros_build_test.yml@master
+    secrets:
+      PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -347,8 +347,9 @@ target_link_libraries(MrsGazeboCommonResources_FluidResistancePlugin
 
 # MotorSpeedRepublisherPlugin
 
-add_library(MrsGazeboCommonResources_MotorSpeedRepublisherPlugin
-  SHARED src/sensor_and_model_plugins/motor_speed_republisher.cpp
+add_library(MrsGazeboCommonResources_MotorSpeedRepublisherPlugin SHARED
+  src/sensor_and_model_plugins/motor_speed_republisher.cpp
+  ${SEN_PROTO_SRCS}
   )
 
 target_link_libraries(MrsGazeboCommonResources_MotorSpeedRepublisherPlugin

diff --git a/src/physics_plugins/motor_prop_model_plugin.cpp b/src/physics_plugins/motor_prop_model_plugin.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include "motor_prop_model.h"
+#include <motor_prop_model.h>
 #include <ignition/math.hh>
 
 namespace gazebo {