mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-26 09:45:37 +03:00
Merge Cleanup for old CC3D INT Code
more merge errors CC3D
This commit is contained in:
parent
eb138dc601
commit
086e383602
2 changed files with 0 additions and 33 deletions
|
@ -210,33 +210,6 @@ void MPU_DATA_READY_EXTI_Handler(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//// Hack for cc3d
|
|
||||||
void EXTI3_IRQHandler(void)
|
|
||||||
{
|
|
||||||
if (EXTI_GetITStatus(mpuIntExtiConfig->exti_line) == RESET) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
EXTI_ClearITPendingBit(mpuIntExtiConfig->exti_line);
|
|
||||||
|
|
||||||
mpuDataReady = true;
|
|
||||||
|
|
||||||
#ifdef DEBUG_MPU_DATA_READY_INTERRUPT
|
|
||||||
// Measure the delta in micro seconds between calls to the interrupt handler
|
|
||||||
static uint32_t lastCalledAt = 0;
|
|
||||||
static int32_t callDelta = 0;
|
|
||||||
|
|
||||||
uint32_t now = micros();
|
|
||||||
callDelta = now - lastCalledAt;
|
|
||||||
|
|
||||||
//UNUSED(callDelta);
|
|
||||||
debug[0] = callDelta;
|
|
||||||
|
|
||||||
lastCalledAt = now;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
//// Hack for cc3d
|
|
||||||
|
|
||||||
void configureMPUDataReadyInterruptHandling(void)
|
void configureMPUDataReadyInterruptHandling(void)
|
||||||
{
|
{
|
||||||
#ifdef USE_MPU_DATA_READY_SIGNAL
|
#ifdef USE_MPU_DATA_READY_SIGNAL
|
||||||
|
|
|
@ -251,12 +251,6 @@ static void mpu6000AccAndGyroInit(void) {
|
||||||
spiSetDivisor(MPU6000_SPI_INSTANCE, SPI_18MHZ_CLOCK_DIVIDER); // 18 MHz SPI clock
|
spiSetDivisor(MPU6000_SPI_INSTANCE, SPI_18MHZ_CLOCK_DIVIDER); // 18 MHz SPI clock
|
||||||
delayMicroseconds(1);
|
delayMicroseconds(1);
|
||||||
|
|
||||||
#ifdef USE_MPU_DATA_READY_SIGNAL
|
|
||||||
// Set MPU Data Ready Signal
|
|
||||||
mpu6000WriteRegister(MPU6000_INT_ENABLE , MPU_RF_DATA_RDY_EN);
|
|
||||||
delayMicroseconds(1);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
mpuSpi6000InitDone = true;
|
mpuSpi6000InitDone = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue