Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Use Naze hardware revision when initialising mma845. Cleanup ADXL345

Browse source 
initialisation.
This commit is contained in:
Dominic Clifton 2014-10-16 00:56:02 +01:00
parent 50391f2c8e
commit 8f9a553a9e
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/accgyro_mma845x.c
View file

@ -84,10 +84,6 @@ bool mma8452Detect(acc_t *acc)
bool ack = false; bool ack = false;
uint8_t sig = 0; uint8_t sig = 0;
// Not supported with this frequency
if (hse_value == 12000000)
return false;
ack = i2cRead(MMA8452_ADDRESS, MMA8452_WHO_AM_I, 1, &sig); ack = i2cRead(MMA8452_ADDRESS, MMA8452_WHO_AM_I, 1, &sig);
if (!ack || (sig != MMA8452_DEVICE_SIGNATURE && sig != MMA8451_DEVICE_SIGNATURE)) if (!ack || (sig != MMA8452_DEVICE_SIGNATURE && sig != MMA8451_DEVICE_SIGNATURE))
return false; return false;

18
src/main/sensors/initialisation.c
View file

@ -219,16 +219,15 @@ retry:
acc_params.dataRate = 800; // unused currently acc_params.dataRate = 800; // unused currently
#ifdef NAZE #ifdef NAZE
if (hardwareRevision < NAZE32_REV5 && adxl345Detect(&acc_params, &acc)) { if (hardwareRevision < NAZE32_REV5 && adxl345Detect(&acc_params, &acc)) {
accHardware = ACC_ADXL345;
accAlign = CW270_DEG; accAlign = CW270_DEG;
}
#else #else
if (adxl345Detect(&acc_params, &acc)) { if (adxl345Detect(&acc_params, &acc)) {
accHardware = ACC_ADXL345;
}
#endif #endif
if (accHardwareToUse == ACC_ADXL345) accHardware = ACC_ADXL345;
break; accHardware = ACC_ADXL345;
if (accHardwareToUse == ACC_ADXL345)
break;
}
; // fallthrough ; // fallthrough
#endif #endif
#ifdef USE_ACC_MPU6050 #ifdef USE_ACC_MPU6050
@ -245,11 +244,14 @@ retry:
#endif #endif
#ifdef USE_ACC_MMA8452 #ifdef USE_ACC_MMA8452
case ACC_MMA8452: // MMA8452 case ACC_MMA8452: // MMA8452
if (mma8452Detect(&acc)) {
accHardware = ACC_MMA8452;
#ifdef NAZE #ifdef NAZE
// Not supported with this frequency
if (hardwareRevision < NAZE32_REV5 && mma8452Detect(&acc)) {
accAlign = CW90_DEG; accAlign = CW90_DEG;
#else
if (mma8452Detect(&acc)) {
#endif #endif
accHardware = ACC_MMA8452;
if (accHardwareToUse == ACC_MMA8452) if (accHardwareToUse == ACC_MMA8452)
break; break;
} }