mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
Fix for vinz' merge to pios_mpu6000 exti changes
This commit is contained in:
parent
a021659b75
commit
1721479a12
@ -400,21 +400,21 @@ uint32_t mpu6000_interval_us;
|
||||
uint32_t mpu6000_time_us;
|
||||
uint32_t mpu6000_transfer_size;
|
||||
|
||||
void PIOS_MPU6000_IRQHandler(void)
|
||||
bool PIOS_MPU6000_IRQHandler(void)
|
||||
{
|
||||
static uint32_t timeval;
|
||||
mpu6000_interval_us = PIOS_DELAY_DiffuS(timeval);
|
||||
timeval = PIOS_DELAY_GetRaw();
|
||||
|
||||
if(!mpu6000_configured)
|
||||
return;
|
||||
return false;
|
||||
|
||||
mpu6000_count = PIOS_MPU6000_FifoDepth();
|
||||
if(mpu6000_count < sizeof(struct pios_mpu6000_data))
|
||||
return;
|
||||
return false;
|
||||
|
||||
if(PIOS_MPU6000_ClaimBus() != 0)
|
||||
return;
|
||||
return false;
|
||||
|
||||
uint8_t mpu6000_send_buf[1+sizeof(struct pios_mpu6000_data)] = {PIOS_MPU6000_FIFO_REG | 0x80, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
uint8_t mpu6000_rec_buf[1+sizeof(struct pios_mpu6000_data)];
|
||||
@ -422,7 +422,7 @@ void PIOS_MPU6000_IRQHandler(void)
|
||||
if(PIOS_SPI_TransferBlock(dev->spi_id, &mpu6000_send_buf[0], &mpu6000_rec_buf[0], sizeof(mpu6000_send_buf), NULL) < 0) {
|
||||
PIOS_MPU6000_ReleaseBus();
|
||||
mpu6000_fails++;
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
PIOS_MPU6000_ReleaseBus();
|
||||
@ -433,7 +433,7 @@ void PIOS_MPU6000_IRQHandler(void)
|
||||
if (mpu6000_count >= (sizeof(data) * 2)) {
|
||||
mpu6000_fifo_backup++;
|
||||
if(PIOS_MPU6000_ClaimBus() != 0)
|
||||
return;
|
||||
return false;
|
||||
|
||||
uint8_t mpu6000_send_buf[1+sizeof(struct pios_mpu6000_data)] = {PIOS_MPU6000_FIFO_REG | 0x80, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
uint8_t mpu6000_rec_buf[1+sizeof(struct pios_mpu6000_data)];
|
||||
@ -441,7 +441,7 @@ void PIOS_MPU6000_IRQHandler(void)
|
||||
if(PIOS_SPI_TransferBlock(dev->spi_id, &mpu6000_send_buf[0], &mpu6000_rec_buf[0], sizeof(mpu6000_send_buf), NULL) < 0) {
|
||||
PIOS_MPU6000_ReleaseBus();
|
||||
mpu6000_fails++;
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
PIOS_MPU6000_ReleaseBus();
|
||||
|
Loading…
x
Reference in New Issue
Block a user