diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-01 16:44:30 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-01 16:44:30 +0400 |
| commit | c47ef70dd9437b190265934e70641f8674bb3e18 (patch) | |
| tree | 6c381d4cce7f848c73e40188f0617d6cc321ac12 | |
| parent | 1b8004cd8ecf7824584aac9e7fed447714feb716 (diff) | |
| parent | 32b9834c52d900210bb7a998de79a459b7fdd478 (diff) | |
| download | px4-firmware-c47ef70dd9437b190265934e70641f8674bb3e18.tar.gz px4-firmware-c47ef70dd9437b190265934e70641f8674bb3e18.tar.bz2 px4-firmware-c47ef70dd9437b190265934e70641f8674bb3e18.zip | |
Merge branch 'beta_mavlink' into beta_mavlink2
| -rw-r--r-- | src/modules/sdlog2/logbuffer.c | 3 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/sdlog2/logbuffer.c b/src/modules/sdlog2/logbuffer.c index b3243f7b5..6a29d7e5c 100644 --- a/src/modules/sdlog2/logbuffer.c +++ b/src/modules/sdlog2/logbuffer.c @@ -1,7 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: Anton Babushkin <anton.babushkin@me.com> + * Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 68e6a7469..1365d9e70 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1,8 +1,6 @@ /**************************************************************************** * * Copyright (c) 2012-2014 PX4 Development Team. All rights reserved. - * Author: Lorenz Meier <lm@inf.ethz.ch> - * Anton Babushkin <anton.babushkin@me.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -451,6 +449,7 @@ static void *logwriter_thread(void *arg) n = available; } + lseek(log_fd, 0, SEEK_CUR); n = write(log_fd, read_ptr, n); should_wait = (n == available) && !is_part; |