From ea587d585f78db89c5214b160cb0887d4e22a3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Mon, 18 Sep 2017 12:33:36 +0200 Subject: [PATCH] mavlink_ftp: add & handle kErrFailFileExists error This error definitions already existed in QGC --- src/modules/mavlink/mavlink_ftp.cpp | 5 +++++ src/modules/mavlink/mavlink_ftp.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/mavlink/mavlink_ftp.cpp b/src/modules/mavlink/mavlink_ftp.cpp index 5d45b963ad..35becd937c 100644 --- a/src/modules/mavlink/mavlink_ftp.cpp +++ b/src/modules/mavlink/mavlink_ftp.cpp @@ -261,6 +261,11 @@ out: payload->req_opcode = payload->opcode; payload->opcode = kRspNak; payload->size = 1; + + if (r_errno == EEXIST) { + errorCode = kErrFailFileExists; + } + payload->data[0] = errorCode; if (errorCode == kErrFailErrno) { diff --git a/src/modules/mavlink/mavlink_ftp.h b/src/modules/mavlink/mavlink_ftp.h index ef2152b3d4..5d4cb94643 100644 --- a/src/modules/mavlink/mavlink_ftp.h +++ b/src/modules/mavlink/mavlink_ftp.h @@ -117,7 +117,9 @@ public: kErrInvalidSession, ///< Session is not currently open kErrNoSessionsAvailable, ///< All available Sessions in use kErrEOF, ///< Offset past end of file for List and Read commands - kErrUnknownCommand ///< Unknown command opcode + kErrUnknownCommand, ///< Unknown command opcode + kErrFailFileExists, ///< File exists already + kErrFailFileProtected ///< File is write protected }; unsigned get_size();