aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-10-05 13:17:37 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-10-05 13:17:37 +0200
commitc6de36d683601a17bfa62d75da4ecb76e95360fe (patch)
tree431236c1e372c1ef7c9c821987d413925339d679 /src/modules/mavlink
parent7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa (diff)
parentc0eefc983a5bbe2faf05eb21daaf3514b767daa6 (diff)
downloadpx4-firmware-c6de36d683601a17bfa62d75da4ecb76e95360fe.tar.gz
px4-firmware-c6de36d683601a17bfa62d75da4ecb76e95360fe.tar.bz2
px4-firmware-c6de36d683601a17bfa62d75da4ecb76e95360fe.zip
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Diffstat (limited to 'src/modules/mavlink')
-rw-r--r--src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp b/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
index a5fb2117e..4caa820b6 100644
--- a/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
+++ b/src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
@@ -265,7 +265,7 @@ bool MavlinkFtpTest::_open_badfile_test(void)
MavlinkFTP::PayloadHeader *reply;
const char *dir = "/foo"; // non-existent file
- payload.opcode = MavlinkFTP::kCmdOpenFile;
+ payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header
@@ -295,7 +295,7 @@ bool MavlinkFtpTest::_open_terminate_test(void)
struct stat st;
const ReadTestCase *test = &_rgReadTestCases[i];
- payload.opcode = MavlinkFTP::kCmdOpenFile;
+ payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header
@@ -342,7 +342,7 @@ bool MavlinkFtpTest::_terminate_badsession_test(void)
MavlinkFTP::PayloadHeader *reply;
const char *file = _rgReadTestCases[0].file;
- payload.opcode = MavlinkFTP::kCmdOpenFile;
+ payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header
@@ -400,7 +400,7 @@ bool MavlinkFtpTest::_read_test(void)
// Test case data files are created for specific boundary conditions
ut_compare("Test case data files are out of date", test->length, st.st_size);
- payload.opcode = MavlinkFTP::kCmdOpenFile;
+ payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header
@@ -463,7 +463,7 @@ bool MavlinkFtpTest::_read_badsession_test(void)
MavlinkFTP::PayloadHeader *reply;
const char *file = _rgReadTestCases[0].file;
- payload.opcode = MavlinkFTP::kCmdOpenFile;
+ payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header