fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 23:31:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase changes on upstream master

Browse Source 
This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:43 +01:00
committed by Julian Oes
parent 2938d23c6c
commit 014f15d8b0
28 changed files with 254 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
+13 -1
View File
@@ -61,10 +61,12 @@ static int writer_main(int argc, char *argv[])
int fd = px4_open(TESTDEV, PX4_F_WRONLY);
int fd = px4_open(TESTDEV, PX4_F_WRONLY);
if (fd < 0) {
PX4_INFO("Writer: Open failed %d %d", fd, px4_errno);
return -px4_errno;
}
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
int ret;
int i = 0;
@@ -92,6 +94,12 @@ static int writer_main(int argc, char *argv[])
class PrivData
{
PrivData() : _read_offset(0) {}
~PrivData() {}
size_t _read_offset;
};
public:
PrivData() : _read_offset(0) {}
~PrivData() {}
@@ -321,12 +329,16 @@ int VCDevExample::main()
(char *const *)NULL);
ret = 0;
PX4_INFO("TEST: BLOCKING POLL ---------------");
if (do_poll(fd, -1, 3, 0)) {
ret = 1;
goto fail2;
PX4_INFO("TEST: ZERO TIMEOUT POLL -----------");
if(do_poll(fd, 0, 3, 0)) {
ret = 1;
goto fail2;
goto fail2;
}
PX4_INFO("TEST: ZERO TIMEOUT POLL -----------");