aboutsummaryrefslogtreecommitdiff
path: root/apps/px4io
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-02-12 09:31:43 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-02-12 09:31:43 +0100
commit01ada7f74f38f84fd19b74313c21f3dd13ca420d (patch)
treede818964317b8232f51973760e5524b4576854a5 /apps/px4io
parent857fe5d405312508439a91493802e58e547d7940 (diff)
downloadpx4-firmware-01ada7f74f38f84fd19b74313c21f3dd13ca420d.tar.gz
px4-firmware-01ada7f74f38f84fd19b74313c21f3dd13ca420d.tar.bz2
px4-firmware-01ada7f74f38f84fd19b74313c21f3dd13ca420d.zip
Fixed mixer transmission between FMU and IO
Diffstat (limited to 'apps/px4io')
-rw-r--r--apps/px4io/i2c.c2
-rw-r--r--apps/px4io/protocol.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/px4io/i2c.c b/apps/px4io/i2c.c
index 93dfd21dd..235f8affa 100644
--- a/apps/px4io/i2c.c
+++ b/apps/px4io/i2c.c
@@ -77,7 +77,7 @@ static void i2c_tx_complete(void);
static DMA_HANDLE rx_dma;
static DMA_HANDLE tx_dma;
-static uint8_t rx_buf[64];
+static uint8_t rx_buf[68];
static unsigned rx_len;
static const uint8_t junk_buf[] = { 0xff, 0xff, 0xff, 0xff };
diff --git a/apps/px4io/protocol.h b/apps/px4io/protocol.h
index 54f2fa27c..6278e05d4 100644
--- a/apps/px4io/protocol.h
+++ b/apps/px4io/protocol.h
@@ -181,6 +181,7 @@
* This message adds text to the mixer text buffer; the text
* buffer is drained as the definitions are consumed.
*/
+#pragma pack(push, 1)
struct px4io_mixdata {
uint16_t f2i_mixer_magic;
#define F2I_MIXER_MAGIC 0x6d74
@@ -191,4 +192,5 @@ struct px4io_mixdata {
char text[0]; /* actual text size may vary */
};
+#pragma pack(pop)