diff options
| author | Vladimir Ermakov <vooon341@gmail.com> | 2014-09-09 17:36:41 +0400 |
|---|---|---|
| committer | Vladimir Ermakov <vooon341@gmail.com> | 2014-09-09 17:36:41 +0400 |
| commit | 0d2e250d119a5a14c8757982c96b2afef09c4d0d (patch) | |
| tree | 05de495819b6702861b9f1f4a991961239ec72a9 /src/modules/mavlink/mavlink_ftp.h | |
| parent | e7ae13a58e83263973feab3630f90f077786fcc3 (diff) | |
| download | px4-firmware-0d2e250d119a5a14c8757982c96b2afef09c4d0d.tar.gz px4-firmware-0d2e250d119a5a14c8757982c96b2afef09c4d0d.tar.bz2 px4-firmware-0d2e250d119a5a14c8757982c96b2afef09c4d0d.zip | |
FTP: Remove CRC32 from protocol.
Extra crc not needed because mavlink already has crc16.
Diffstat (limited to 'src/modules/mavlink/mavlink_ftp.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_ftp.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/mavlink/mavlink_ftp.h b/src/modules/mavlink/mavlink_ftp.h index 85e175d44..ae7955ab7 100644 --- a/src/modules/mavlink/mavlink_ftp.h +++ b/src/modules/mavlink/mavlink_ftp.h @@ -77,8 +77,7 @@ public: uint8_t opcode; ///< Command opcode uint8_t size; ///< Size of data uint8_t req_opcode; ///< Request opcode returned in kRspAck, kRspNak message - uint8_t padding[2]; ///< 32 bit aligment padding - uint32_t crc32; ///< CRC for entire Request structure, with crc32 and padding set to 0 + uint16_t reserved[3]; ///< reserved area uint32_t offset; ///< Offsets for List and Read commands uint8_t data[]; ///< command data, varies by Opcode }; @@ -112,8 +111,7 @@ 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 - kErrCrc ///< CRC on Payload is incorrect + kErrUnknownCommand ///< Unknown command opcode }; private: @@ -135,8 +133,6 @@ private: void _lock_request_queue(void); void _unlock_request_queue(void); - uint32_t _payload_crc32(PayloadHeader *hdr); - char *_data_as_cstring(PayloadHeader* payload); static void _worker_trampoline(void *arg); |