Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SITL: correct compilation on g++-7.5.0 

.cpp: In member function void SITL::ShipSim::send_report():
BB-WAF: /mnt/volume_nyc3_01/autotest/APM/APM/libraries/SITL/SIM_Ship.cpp:189:42: sorry, unimplemented: non-trivial designated initializers not supported
BB-WAF:          autopilot : MAV_AUTOPILOT_INVALID};
BB-WAF:                                           ^
BB-WAF: compilation terminated due to -Wfatal-errors.
BB-WAF:
BB-WAF: Waf: Leaving directory `/home/autotest/build/tmp/binaries.build/SITL_x86_64_linux_gnu'
This commit is contained in:
Peter Barker 2024-03-15 14:21:14 +11:00 committed by Andrew Tridgell
parent b316b3ab46
commit aefa41f22a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/SITL/SIM_Ship.cpp
View File

@ -185,8 +185,13 @@ void ShipSim::send_report(void)
last_heartbeat_ms = now; last_heartbeat_ms = now;
const mavlink_heartbeat_t heartbeat{ const mavlink_heartbeat_t heartbeat{
custom_mode: 0,
type : MAV_TYPE_SURFACE_BOAT, type : MAV_TYPE_SURFACE_BOAT,
autopilot : MAV_AUTOPILOT_INVALID}; autopilot : MAV_AUTOPILOT_INVALID,
base_mode: 0,
system_status: 0,
mavlink_version: 0,
};
mavlink_message_t msg; mavlink_message_t msg;
mavlink_msg_heartbeat_encode_status( mavlink_msg_heartbeat_encode_status(

8
libraries/SITL/SIM_Vicon.cpp
View File

@ -50,8 +50,12 @@ void Vicon::maybe_send_heartbeat()
last_heartbeat_ms = now; last_heartbeat_ms = now;
const mavlink_heartbeat_t heartbeat{ const mavlink_heartbeat_t heartbeat{
type : MAV_TYPE_GCS, custom_mode: 0,
autopilot : MAV_AUTOPILOT_INVALID, type : MAV_TYPE_GCS,
autopilot : MAV_AUTOPILOT_INVALID,
base_mode: 0,
system_status: 0,
mavlink_version: 0,
}; };
mavlink_msg_heartbeat_encode_status( mavlink_msg_heartbeat_encode_status(