Browse Source

ArduCopter, AP_InertialSensor: restore mpu6k sample rate to 200hz but keep default filtering at 42hz.

mission-4.1.18
rmackay9 12 years ago
parent
commit
b4e5176e2a
  1. 4
      ArduCopter/ArduCopter.pde
  2. 2
      libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.cpp

4
ArduCopter/ArduCopter.pde

@ -193,7 +193,7 @@ DataFlash_APM1 DataFlash(&spi_semaphore); @@ -193,7 +193,7 @@ DataFlash_APM1 DataFlash(&spi_semaphore);
////////////////////////////////////////////////////////////////////////////////
// the rate we run the main loop at
////////////////////////////////////////////////////////////////////////////////
static const AP_InertialSensor::Sample_rate ins_sample_rate = AP_InertialSensor::RATE_100HZ;
static const AP_InertialSensor::Sample_rate ins_sample_rate = AP_InertialSensor::RATE_200HZ;
////////////////////////////////////////////////////////////////////////////////
// Sensors
@ -953,7 +953,7 @@ void loop() @@ -953,7 +953,7 @@ void loop()
// We want this to execute fast
// ----------------------------
num_samples = ins.num_samples_available();
if (num_samples >= 1) {
if (num_samples >= 2) {
#if DEBUG_FAST_LOOP == ENABLED
Log_Write_Data(DATA_FAST_LOOP, (int32_t)(timer - fast_loopTimer));

2
libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.cpp

@ -399,7 +399,7 @@ void AP_InertialSensor_MPU6000::hardware_init(Sample_rate sample_rate) @@ -399,7 +399,7 @@ void AP_InertialSensor_MPU6000::hardware_init(Sample_rate sample_rate)
case RATE_200HZ:
default:
rate = MPUREG_SMPLRT_200HZ;
default_filter = BITS_DLPF_CFG_98HZ;
default_filter = BITS_DLPF_CFG_42HZ;
break;
}

Loading…
Cancel
Save