Merge branch '#111-px4io-integrated-mixing' of github.com:PX4/Firmware into fixedwing_io_mixing

This commit is contained in:
Lorenz Meier
2012-12-31 00:34:12 +01:00
2 changed files with 31 additions and 29 deletions
+4 -4
View File
@@ -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;