From d3d08389f7ad1f153670b20a527ed458485859a0 Mon Sep 17 00:00:00 2001
From: borisbstyle <dreambb1982@gmail.com>
Date: Wed, 3 Feb 2016 01:53:12 +0100
Subject: [PATCH] Fix some compile errors

---
 src/main/drivers/bus_i2c_stm32f10x.c | 2 +-
 src/main/flight/imu.h                | 1 +
 src/main/io/serial_cli.c             | 6 +-----
 src/main/io/serial_msp.c             | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/drivers/bus_i2c_stm32f10x.c b/src/main/drivers/bus_i2c_stm32f10x.c
index 8e97dd9ec..c2a3a1873 100644
--- a/src/main/drivers/bus_i2c_stm32f10x.c
+++ b/src/main/drivers/bus_i2c_stm32f10x.c
@@ -84,7 +84,7 @@ void I2C2_EV_IRQHandler(void)
     i2c_ev_handler();
 }
 
-#define I2C_DEFAULT_TIMEOUT 30000
+//#define I2C_DEFAULT_TIMEOUT 30000
 static volatile uint16_t i2cErrorCount = 0;
 
 static volatile bool error = false;
diff --git a/src/main/flight/imu.h b/src/main/flight/imu.h
index dd06e45ff..c0b7d53fb 100644
--- a/src/main/flight/imu.h
+++ b/src/main/flight/imu.h
@@ -78,6 +78,7 @@ void imuConfigure(
     uint16_t throttle_correction_angle
 );
 
+float getCosTiltAngle(void);
 void calculateEstimatedAltitude(uint32_t currentTime);
 void imuUpdateAccelerometer(rollAndPitchTrims_t *accelerometerTrims);
 void imuUpdateGyroAndAttitude(void);
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 610b6aa92..20749fcec 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -157,10 +157,6 @@ static void cliFlashRead(char *cmdline);
 #endif
 #endif
 
-#ifdef USE_SERIAL_1WIRE
-static void cliUSB1Wire(char *cmdline);
-#endif
-
 #ifdef USE_SDCARD
 static void cliSdInfo(char *cmdline);
 #endif
@@ -1857,7 +1853,7 @@ void cliEnter(serialPort_t *serialPort)
     cliPort = serialPort;
     setPrintfSerialPort(cliPort);
     cliWriter = bufWriterInit(cliWriteBuffer, sizeof(cliWriteBuffer),
-                              serialWriteBufShim, serialPort);
+                             (bufWrite_t)serialWriteBufShim, serialPort);
 
     cliPrint("\r\nEntering CLI Mode, type 'exit' to return, or 'help'\r\n");
     cliPrompt();
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index 1af2f9022..35d43d224 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -2028,7 +2028,7 @@ void mspProcess(void)
         // Big enough to fit a MSP_STATUS in one write.
         uint8_t buf[sizeof(bufWriter_t) + 20];
         writer = bufWriterInit(buf, sizeof(buf),
-                               serialWriteBufShim, currentPort->port);
+                              (bufWrite_t)serialWriteBufShim, currentPort->port);
 
         while (serialRxBytesWaiting(mspSerialPort)) {
 
@@ -2117,7 +2117,7 @@ void sendMspTelemetry(void)
     setCurrentPort(mspTelemetryPort);
     uint8_t buf[sizeof(bufWriter_t) + 16];
     writer = bufWriterInit(buf, sizeof(buf),
-                           serialWriteBufShim, currentPort->port);
+                           (bufWrite_t)serialWriteBufShim, currentPort->port);
 
     processOutCommand(mspTelemetryCommandSequence[sequenceIndex]);
     tailSerialReply();