Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

FTP request opcode #865

Merged
merged 5 commits into from
Sep 10, 2014
Merged

FTP request opcode #865

merged 5 commits into from
Sep 10, 2014

Conversation

vooon
Copy link
Member

@vooon vooon commented Sep 9, 2014

QGC update for PX4/PX4-Autopilot#1357

@DonLakeFlyer
Copy link
Contributor

You need to update and pass the unit tests here as well. The TeamCity failures are all from the build not compiling because the unit test code was not updated to these changes.

@vooon
Copy link
Member Author

vooon commented Sep 10, 2014

Unit-tests passed:

********* Start testing of QGCUASFileManagerUnitTest *********
Config: Using QtTest library 5.2.1, Qt 5.2.1
PASS   : QGCUASFileManagerUnitTest::initTestCase()
QDEBUG : QGCUASFileManagerUnitTest::_ackTest() QGCUASFileManager: Error "Timeout waiting for ack" 
QDEBUG : QGCUASFileManagerUnitTest::_ackTest() QGCUASFileManager: Error "Bad sequence number on received message: expected(5) received(6)" 
PASS   : QGCUASFileManagerUnitTest::_ackTest()
QDEBUG : QGCUASFileManagerUnitTest::_noAckTest() QGCUASFileManager: Error "Timeout waiting for ack" 
PASS   : QGCUASFileManagerUnitTest::_noAckTest()
PASS   : QGCUASFileManagerUnitTest::_resetTest()
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() Testing failure mode: 1 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: Error "Timeout waiting for ack" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() Testing failure mode: 2 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() Testing failure mode: 3 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Ddir" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Ffoo" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Fbar" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: Error "Timeout waiting for ack" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() Testing failure mode: 4 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Ddir" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Ffoo" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Fbar" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() Testing failure mode: 5 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: Error "Bad sequence number on received message: expected(14) received(15)" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Ddir" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Ffoo" 
QDEBUG : QGCUASFileManagerUnitTest::_listTest() QGCUASFileManager: list entry "Fbar" 
PASS   : QGCUASFileManagerUnitTest::_listTest()
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 1 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Timeout waiting for ack" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 2 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 3 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 4 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 5 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Bad sequence number on received message: expected(23) received(24)" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 1 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Timeout waiting for ack" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 2 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 3 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Timeout waiting for ack: Sending Terminate command" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 4 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 5 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Bad sequence number on received message: expected(52) received(53)" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 1 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Timeout waiting for ack" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 2 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 3 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Timeout waiting for ack: Sending Terminate command" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 4 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Nak received, error: unknown error" 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() Testing failure mode: 5 
QDEBUG : QGCUASFileManagerUnitTest::_downloadTest() QGCUASFileManager: Error "Bad sequence number on received message: expected(83) received(84)" 
PASS   : QGCUASFileManagerUnitTest::_downloadTest()
PASS   : QGCUASFileManagerUnitTest::cleanupTestCase()
Totals: 7 passed, 0 failed, 0 skipped
********* Finished testing of QGCUASFileManagerUnitTest *********

DonLakeFlyer
DonLakeFlyer reviewed Sep 10, 2014
View reviewed changes
src/uas/QGCUASFileManager.cc

request->hdr.crc32 = crc32(request);
request->hdr.padding[0] = 0;
request->hdr.padding[1] = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to set padding to 0 since nobody should be looking at these values. You can remove these two lines. Worried that it will cause confusion.

@DonLakeFlyer
Copy link
Contributor

I'll merge both this and Firmware pulls once the padding = 0 lines are pulled out. Once again thanks for the pull requests.

DonLakeFlyer added a commit that referenced this pull request Sep 10, 2014
@DonLakeFlyer
Merge pull request #865 from vooon/ftp_opcode
3a98d38 
FTP request opcode
@DonLakeFlyer DonLakeFlyer merged commit 3a98d38 into mavlink:master Sep 10, 2014
@vooon vooon deleted the ftp_opcode branch September 10, 2014 19:52
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vooon @DonLakeFlyer