diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-06-28 11:11:26 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-06-28 11:11:26 +0400 |
| commit | 7b73df6440987f2fea3dcdce135c27e02d98bda6 (patch) | |
| tree | 9171eced3af23bc08baafea00d58347af3fe3bc4 /src/modules/sdlog2 | |
| parent | 1759f30e3aa4b2da25dcd0c836480f069d917a88 (diff) | |
| parent | 72694825de93e0998d39f1296bc830c3ec23933d (diff) | |
| download | px4-firmware-7b73df6440987f2fea3dcdce135c27e02d98bda6.tar.gz px4-firmware-7b73df6440987f2fea3dcdce135c27e02d98bda6.tar.bz2 px4-firmware-7b73df6440987f2fea3dcdce135c27e02d98bda6.zip | |
Merge branch 'att_control_der_fix' into seatbelt_multirotor
Diffstat (limited to 'src/modules/sdlog2')
| -rw-r--r-- | src/modules/sdlog2/logbuffer.c | 4 | ||||
| -rw-r--r-- | src/modules/sdlog2/logbuffer.h | 4 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 4 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2_format.h | 4 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/sdlog2/logbuffer.c b/src/modules/sdlog2/logbuffer.c index 2e1e4fd4d..b3243f7b5 100644 --- a/src/modules/sdlog2/logbuffer.c +++ b/src/modules/sdlog2/logbuffer.c @@ -1,7 +1,7 @@ /**************************************************************************** * * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: Anton Babushkin <rk3dov@gmail.com> + * Author: 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 @@ -37,7 +37,7 @@ * * Ring FIFO buffer for binary log data. * - * @author Anton Babushkin <rk3dov@gmail.com> + * @author Anton Babushkin <anton.babushkin@me.com> */ #include <string.h> diff --git a/src/modules/sdlog2/logbuffer.h b/src/modules/sdlog2/logbuffer.h index 31521f722..3a5e3a29f 100644 --- a/src/modules/sdlog2/logbuffer.h +++ b/src/modules/sdlog2/logbuffer.h @@ -1,7 +1,7 @@ /**************************************************************************** * * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: Anton Babushkin <rk3dov@gmail.com> + * Author: 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 @@ -37,7 +37,7 @@ * * Ring FIFO buffer for binary log data. * - * @author Anton Babushkin <rk3dov@gmail.com> + * @author Anton Babushkin <anton.babushkin@me.com> */ #ifndef SDLOG2_RINGBUFFER_H_ diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 69d87d92b..b5ee95447 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -2,7 +2,7 @@ * * Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved. * Author: Lorenz Meier <lm@inf.ethz.ch> - * Anton Babushkin <rk3dov@gmail.com> + * 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 @@ -40,7 +40,7 @@ * does the heavy SD I/O in a low-priority worker thread. * * @author Lorenz Meier <lm@inf.ethz.ch> - * @author Anton Babushkin <rk3dov@gmail.com> + * @author Anton Babushkin <anton.babushkin@me.com> */ #include <nuttx/config.h> diff --git a/src/modules/sdlog2/sdlog2_format.h b/src/modules/sdlog2/sdlog2_format.h index 59b91d90d..5c175ef7e 100644 --- a/src/modules/sdlog2/sdlog2_format.h +++ b/src/modules/sdlog2/sdlog2_format.h @@ -1,7 +1,7 @@ /**************************************************************************** * * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: Anton Babushkin <rk3dov@gmail.com> + * Author: 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 @@ -37,7 +37,7 @@ * * General log format structures and macro. * - * @author Anton Babushkin <rk3dov@gmail.com> + * @author Anton Babushkin <anton.babushkin@me.com> */ /* diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index ce1815c6b..17ec7993b 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -1,7 +1,7 @@ /**************************************************************************** * * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: Anton Babushkin <rk3dov@gmail.com> + * Author: 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 @@ -37,7 +37,7 @@ * * Log messages and structures definition. * - * @author Anton Babushkin <rk3dov@gmail.com> + * @author Anton Babushkin <anton.babushkin@me.com> */ #ifndef SDLOG2_MESSAGES_H_ |