Fix some compile errors
This commit is contained in:
parent
9859bbfcae
commit
d3d08389f7
|
@ -84,7 +84,7 @@ void I2C2_EV_IRQHandler(void)
|
||||||
i2c_ev_handler();
|
i2c_ev_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
#define I2C_DEFAULT_TIMEOUT 30000
|
//#define I2C_DEFAULT_TIMEOUT 30000
|
||||||
static volatile uint16_t i2cErrorCount = 0;
|
static volatile uint16_t i2cErrorCount = 0;
|
||||||
|
|
||||||
static volatile bool error = false;
|
static volatile bool error = false;
|
||||||
|
|
|
@ -78,6 +78,7 @@ void imuConfigure(
|
||||||
uint16_t throttle_correction_angle
|
uint16_t throttle_correction_angle
|
||||||
);
|
);
|
||||||
|
|
||||||
|
float getCosTiltAngle(void);
|
||||||
void calculateEstimatedAltitude(uint32_t currentTime);
|
void calculateEstimatedAltitude(uint32_t currentTime);
|
||||||
void imuUpdateAccelerometer(rollAndPitchTrims_t *accelerometerTrims);
|
void imuUpdateAccelerometer(rollAndPitchTrims_t *accelerometerTrims);
|
||||||
void imuUpdateGyroAndAttitude(void);
|
void imuUpdateGyroAndAttitude(void);
|
||||||
|
|
|
@ -157,10 +157,6 @@ static void cliFlashRead(char *cmdline);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_SERIAL_1WIRE
|
|
||||||
static void cliUSB1Wire(char *cmdline);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_SDCARD
|
#ifdef USE_SDCARD
|
||||||
static void cliSdInfo(char *cmdline);
|
static void cliSdInfo(char *cmdline);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1857,7 +1853,7 @@ void cliEnter(serialPort_t *serialPort)
|
||||||
cliPort = serialPort;
|
cliPort = serialPort;
|
||||||
setPrintfSerialPort(cliPort);
|
setPrintfSerialPort(cliPort);
|
||||||
cliWriter = bufWriterInit(cliWriteBuffer, sizeof(cliWriteBuffer),
|
cliWriter = bufWriterInit(cliWriteBuffer, sizeof(cliWriteBuffer),
|
||||||
serialWriteBufShim, serialPort);
|
(bufWrite_t)serialWriteBufShim, serialPort);
|
||||||
|
|
||||||
cliPrint("\r\nEntering CLI Mode, type 'exit' to return, or 'help'\r\n");
|
cliPrint("\r\nEntering CLI Mode, type 'exit' to return, or 'help'\r\n");
|
||||||
cliPrompt();
|
cliPrompt();
|
||||||
|
|
|
@ -2028,7 +2028,7 @@ void mspProcess(void)
|
||||||
// Big enough to fit a MSP_STATUS in one write.
|
// Big enough to fit a MSP_STATUS in one write.
|
||||||
uint8_t buf[sizeof(bufWriter_t) + 20];
|
uint8_t buf[sizeof(bufWriter_t) + 20];
|
||||||
writer = bufWriterInit(buf, sizeof(buf),
|
writer = bufWriterInit(buf, sizeof(buf),
|
||||||
serialWriteBufShim, currentPort->port);
|
(bufWrite_t)serialWriteBufShim, currentPort->port);
|
||||||
|
|
||||||
while (serialRxBytesWaiting(mspSerialPort)) {
|
while (serialRxBytesWaiting(mspSerialPort)) {
|
||||||
|
|
||||||
|
@ -2117,7 +2117,7 @@ void sendMspTelemetry(void)
|
||||||
setCurrentPort(mspTelemetryPort);
|
setCurrentPort(mspTelemetryPort);
|
||||||
uint8_t buf[sizeof(bufWriter_t) + 16];
|
uint8_t buf[sizeof(bufWriter_t) + 16];
|
||||||
writer = bufWriterInit(buf, sizeof(buf),
|
writer = bufWriterInit(buf, sizeof(buf),
|
||||||
serialWriteBufShim, currentPort->port);
|
(bufWrite_t)serialWriteBufShim, currentPort->port);
|
||||||
|
|
||||||
processOutCommand(mspTelemetryCommandSequence[sequenceIndex]);
|
processOutCommand(mspTelemetryCommandSequence[sequenceIndex]);
|
||||||
tailSerialReply();
|
tailSerialReply();
|
||||||
|
|
Loading…
Reference in New Issue