Merge branch 'HEAD'

Author: roman-dvorak

FG_run.py

@@ -75,13 +75,13 @@
 if fgmodelsdir is None:
     fgmodelsdir='./models'
 
-#get FGFS EXTRA PARAMS 
+#get FGFS EXTRA PARAMS
 fgargsex=os.getenv("FG_ARGS_EX")
 print(fgargsex)
 if fgargsex is None:
     fgargsex=" ".join(exparameters);
 
-#get FGFS ADD PARAMS 
+#get FGFS ADD PARAMS
 fgargsadd=os.getenv("FG_ARGS_ADD")
 print(fgargsadd)
 if fgargsadd is None:
@@ -138,6 +138,7 @@
     "--aircraft=" + model,
     "--fg-aircraft=" + fgmodelsdir,
     "--telnet="+str(15400+px4id),
+    "--timeofday=noon",
     "--generic=socket,out,100,127.0.0.1,"+str(15200+px4id)+",udp,FGtoPX4",
     "--generic=socket,in,100,,"+str(15300+px4id)+",udp,PX4toFG",
     "--model-hz=120",

cmake/FindMAVLink.cmake

@@ -49,8 +49,8 @@ find_path(_MAVLINK_INCLUDE_DIR
 
 # look specifically for the ROS version if no other was found
 find_path(_MAVLINK_INCLUDE_DIR
-   NAMES mavlink/v1.0/mavlink_types.h mavlink/v2.0/mavlink_types.h
-   PATH_SUFFIXES include
+   NAMES mavlink_types.h
+   PATH_SUFFIXES include/mavlink
    PATHS /opt/ros/${ROS_DISTRO}/
    )
 

src/fg_communicator.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2020 ThunderFly s.r.o.. All rights reserved.
+ *   Copyright (c) 2020-2022 ThunderFly s.r.o.. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/fg_communicator.h

@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2020 ThunderFly s.r.o.. All rights reserved.
+ *   Copyright (c) 2020-2022 ThunderFly s.r.o.. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/vehicle_state.h

@@ -45,8 +45,8 @@
 
 #include <random>
 
-#include <mavlink/v2.0/common/mavlink.h>
-#include <Eigen/Geometry> 
+#include <common/mavlink.h>
+#include <Eigen/Geometry>
 
 using namespace Eigen;
 
@@ -148,11 +148,11 @@ class VehicleState
     double pressure_alt;
     double diff_pressure;
 
-    
+
     Quaterniond lastFGBodyRot;
     double lastFGTime;
 
-    
+
 };
 
 #endif