diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-31 00:34:12 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-31 00:34:12 +0100 |
| commit | 1b82dbb58db9b7a279841714fe64c7830f71e290 (patch) | |
| tree | 5ec32cab9bc946aab205db9dc1fa73b43ac744c2 /apps/px4io | |
| parent | 36d556256f1ec8a9991d4a76df2833149fd9f02f (diff) | |
| parent | dbb841b0dcad55e36d221fc83ac7bab283438a94 (diff) | |
| download | px4-firmware-1b82dbb58db9b7a279841714fe64c7830f71e290.tar.gz px4-firmware-1b82dbb58db9b7a279841714fe64c7830f71e290.tar.bz2 px4-firmware-1b82dbb58db9b7a279841714fe64c7830f71e290.zip | |
Merge branch '#111-px4io-integrated-mixing' of github.com:PX4/Firmware 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 3ad4ded33..2acd60ce3 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; |