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

Copter: fixed startup order of setting mavlink system ID

This commit is contained in:
Andrew Tridgell 2016-10-17 09:19:08 +11:00
parent 33bff3c79c
commit c01a7718c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArduCopter/system.cpp
View File

@ -112,6 +112,9 @@ void Copter::init_ardupilot()
GCS_MAVLINK::set_dataflash(&DataFlash); GCS_MAVLINK::set_dataflash(&DataFlash);
// identify ourselves correctly with the ground station
mavlink_system.sysid = g.sysid_this_mav;
// initialise serial ports // initialise serial ports
serial_manager.init(); serial_manager.init();
@ -158,9 +161,6 @@ void Copter::init_ardupilot()
&g.fs_batt_voltage, &g.fs_batt_mah, &ap.value); &g.fs_batt_voltage, &g.fs_batt_mah, &ap.value);
#endif #endif
// identify ourselves correctly with the ground station
mavlink_system.sysid = g.sysid_this_mav;
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
log_init(); log_init();
#endif #endif