diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-01 11:11:11 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-01 11:11:11 +0100 |
| commit | 32b9834c52d900210bb7a998de79a459b7fdd478 (patch) | |
| tree | 3c6a5352a4c525a870986430da9b99d3f56a77b8 /src/modules | |
| parent | adc4c90cffad91bd60e0b0a5e35a4e8568f8362d (diff) | |
| parent | 2c337d9b456422b908b9be647de0fd4f6a920e21 (diff) | |
| download | px4-firmware-32b9834c52d900210bb7a998de79a459b7fdd478.tar.gz px4-firmware-32b9834c52d900210bb7a998de79a459b7fdd478.tar.bz2 px4-firmware-32b9834c52d900210bb7a998de79a459b7fdd478.zip | |
Merge remote-tracking branch 'px4/beta' into beta_mavlink
Diffstat (limited to 'src/modules')
| -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; |