From ac6e7a1c6c62d12be6851e9ee7dfe823397d3914 Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Fri, 30 Apr 2021 10:26:29 +0300 Subject: [PATCH] FlightTaskManualAltitude: Fix double->float conversion in initialization This gives an error on some new compilers, e.g. riscv64-unknown-elf 10.2.0 Signed-off-by: Jukka Laitinen --- .../tasks/ManualAltitude/FlightTaskManualAltitude.hpp | 4 ++-- src/modules/mavlink/mavlink_receiver.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.hpp b/src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.hpp index 28ac362466..c4b14200a0 100644 --- a/src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.hpp +++ b/src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.hpp @@ -139,8 +139,8 @@ private: bool _terrain_follow{false}; /**< true when the vehicle is following the terrain height */ bool _terrain_hold{false}; /**< true when vehicle is controlling height above a static ground position */ - float _min_distance_to_ground{-INFINITY}; /**< min distance to ground constraint */ - float _max_distance_to_ground{INFINITY}; /**< max distance to ground constraint */ + float _min_distance_to_ground{(float)(-INFINITY)}; /**< min distance to ground constraint */ + float _max_distance_to_ground{(float)INFINITY}; /**< max distance to ground constraint */ /** * Distance to ground during terrain following. diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 315428adfa..d1c3326aca 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -2230,7 +2230,8 @@ MavlinkReceiver::handle_message_hil_gps(mavlink_message_t *msg) gps.vel_n_m_s = (float)(hil_gps.vn) / 100.0f; // cm/s -> m/s gps.vel_e_m_s = (float)(hil_gps.ve) / 100.0f; // cm/s -> m/s gps.vel_d_m_s = (float)(hil_gps.vd) / 100.0f; // cm/s -> m/s - gps.cog_rad = ((hil_gps.cog == 65535) ? (float)NAN : matrix::wrap_2pi(math::radians(hil_gps.cog * 1e-2f))); // cdeg -> rad + gps.cog_rad = ((hil_gps.cog == 65535) ? (float)NAN : matrix::wrap_2pi(math::radians( + hil_gps.cog * 1e-2f))); // cdeg -> rad gps.vel_ned_valid = true; gps.timestamp_time_relative = 0;