diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-25 08:16:22 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-25 08:16:22 +0200 |
| commit | a726ec632f33bcc4bcbfc930207a2f6dcb005888 (patch) | |
| tree | 172ffff9bd7ee66a6edf0db2158c7b40987a66ba /src/modules | |
| parent | 33e33d71b8177fd3c1c9972e13d14184a5428e42 (diff) | |
| parent | dc5bcdda761e5f8f4f7f26a600f02df007ab1df6 (diff) | |
| download | px4-firmware-a726ec632f33bcc4bcbfc930207a2f6dcb005888.tar.gz px4-firmware-a726ec632f33bcc4bcbfc930207a2f6dcb005888.tar.bz2 px4-firmware-a726ec632f33bcc4bcbfc930207a2f6dcb005888.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/commander/accelerometer_calibration.c | 4 | ||||
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/commander/accelerometer_calibration.c b/src/modules/commander/accelerometer_calibration.c index dc653a079..6a304896a 100644 --- a/src/modules/commander/accelerometer_calibration.c +++ b/src/modules/commander/accelerometer_calibration.c @@ -268,8 +268,8 @@ int detect_orientation(int mavlink_fd, int sub_sensor_combined) { float accel_disp[3] = { 0.0f, 0.0f, 0.0f }; /* EMA time constant in seconds*/ float ema_len = 0.2f; - /* set "still" threshold to 0.1 m/s^2 */ - float still_thr2 = pow(0.1f, 2); + /* set "still" threshold to 0.25 m/s^2 */ + float still_thr2 = pow(0.25f, 2); /* set accel error threshold to 5m/s^2 */ float accel_err_thr = 5.0f; /* still time required in us */ diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index b2a6c6a79..5722d2fdf 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -391,7 +391,7 @@ namespace sensors #endif static const int ERROR = -1; -Sensors *g_sensors; +Sensors *g_sensors = nullptr; } Sensors::Sensors() : |