diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-28 12:36:26 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-28 12:36:26 +0200 |
| commit | 3efffb68e7c816dbf21d143a1c39de93f1b5b400 (patch) | |
| tree | ac0545f1e2598092e22be0c2f0ce783bb760e763 /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | d113fcfc54c246f3d5ac22ad5485f7103aecab41 (diff) | |
| parent | 8a18cfa3869555389e7e9ff8f104d83f9c54cb43 (diff) | |
| download | px4-firmware-3efffb68e7c816dbf21d143a1c39de93f1b5b400.tar.gz px4-firmware-3efffb68e7c816dbf21d143a1c39de93f1b5b400.tar.bz2 px4-firmware-3efffb68e7c816dbf21d143a1c39de93f1b5b400.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/navigator/geofence.cpp
src/modules/navigator/mission.cpp
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 43222880e..0ac62d545 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -123,7 +123,7 @@ MavlinkReceiver::MavlinkReceiver(Mavlink *parent) : { // make sure the FTP server is started - (void)MavlinkFTP::getServer(); + (void)MavlinkFTP::get_server(); } MavlinkReceiver::~MavlinkReceiver() @@ -175,7 +175,7 @@ MavlinkReceiver::handle_message(mavlink_message_t *msg) break; case MAVLINK_MSG_ID_FILE_TRANSFER_PROTOCOL: - MavlinkFTP::getServer()->handle_message(_mavlink, msg); + MavlinkFTP::get_server()->handle_message(_mavlink, msg); break; default: |