diff options
| author | Trent Lukaczyk <aerialhedgehog@gmail.com> | 2015-02-05 20:19:04 -0800 |
|---|---|---|
| committer | Trent Lukaczyk <aerialhedgehog@gmail.com> | 2015-02-05 20:19:04 -0800 |
| commit | 531eaa231486c6af46394f6842d420447cb0ee0e (patch) | |
| tree | e7a90d8c50d700a2b7aff05c5a545162810d4967 /src/drivers/l3gd20/l3gd20.cpp | |
| parent | 6798aee13a5bb885966960cdba6ab57b14278ab0 (diff) | |
| parent | 7e6198b3dd517e1158431c8344c5912a6c28b363 (diff) | |
| download | px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.gz px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.bz2 px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/drivers/l3gd20/l3gd20.cpp')
| -rw-r--r-- | src/drivers/l3gd20/l3gd20.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drivers/l3gd20/l3gd20.cpp b/src/drivers/l3gd20/l3gd20.cpp index f583bced4..547bb6868 100644 --- a/src/drivers/l3gd20/l3gd20.cpp +++ b/src/drivers/l3gd20/l3gd20.cpp @@ -784,8 +784,9 @@ L3GD20::set_samplerate(unsigned frequency) { uint8_t bits = REG1_POWER_NORMAL | REG1_Z_ENABLE | REG1_Y_ENABLE | REG1_X_ENABLE; - if (frequency == 0) + if (frequency == 0 || frequency == GYRO_SAMPLERATE_DEFAULT) { frequency = _is_l3g4200d ? 800 : 760; + } /* * Use limits good for H or non-H models. Rates are slightly different |