diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-30 14:03:33 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-30 14:03:33 +0100 |
| commit | 36d556256f1ec8a9991d4a76df2833149fd9f02f (patch) | |
| tree | dba8be67b0dad2e838da2082eaee614ea7db4ce8 /apps/px4io | |
| parent | 234af06571fb69d0e91a9e72b16c33fd8f930227 (diff) | |
| parent | 668d1b330114fefc0ae7a6c476074f2c263c1476 (diff) | |
| download | px4-firmware-36d556256f1ec8a9991d4a76df2833149fd9f02f.tar.gz px4-firmware-36d556256f1ec8a9991d4a76df2833149fd9f02f.tar.bz2 px4-firmware-36d556256f1ec8a9991d4a76df2833149fd9f02f.zip | |
Merge branch '#111-px4io-integrated-mixing' into fixedwing_io_mixing
Diffstat (limited to 'apps/px4io')
| -rw-r--r-- | apps/px4io/mixer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/px4io/mixer.cpp b/apps/px4io/mixer.cpp index 2acd60ce3..3ad4ded33 100644 --- a/apps/px4io/mixer.cpp +++ b/apps/px4io/mixer.cpp @@ -235,11 +235,11 @@ mixer_handle_text(const void *buffer, size_t length) if (resid != mixer_text_length) { debug("used %u", mixer_text_length - resid); - /* copy any leftover text to the base of the buffer for re-use */ - if (resid > 0) - memcpy(&mixer_text[0], &mixer_text[mixer_text_length - resid], resid); + // copy any leftover text to the base of the buffer for re-use + // if (resid > 0) + // memcpy(&mixer_text[0], &mixer_text[mixer_text_length - resid], resid); - mixer_text_length = resid; + // mixer_text_length = resid; } break; |