dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup

This commit is contained in:
Lorenz Meier 2013-07-25 08:16:22 +02:00
parent 33e33d71b8 dc5bcdda76
commit a726ec632f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/commander/accelerometer_calibration.c
View File

@ -268,8 +268,8 @@ int detect_orientation(int mavlink_fd, int sub_sensor_combined) {
float accel_disp[3] = { 0.0f, 0.0f, 0.0f }; float accel_disp[3] = { 0.0f, 0.0f, 0.0f };
/* EMA time constant in seconds*/ /* EMA time constant in seconds*/
float ema_len = 0.2f; float ema_len = 0.2f;
/* set "still" threshold to 0.1 m/s^2 */ /* set "still" threshold to 0.25 m/s^2 */
float still_thr2 = pow(0.1f, 2); float still_thr2 = pow(0.25f, 2);
/* set accel error threshold to 5m/s^2 */ /* set accel error threshold to 5m/s^2 */
float accel_err_thr = 5.0f; float accel_err_thr = 5.0f;
/* still time required in us */ /* still time required in us */

2
src/modules/sensors/sensors.cpp
View File

@ -391,7 +391,7 @@ namespace sensors
#endif #endif
static const int ERROR = -1; static const int ERROR = -1;
Sensors *g_sensors; Sensors *g_sensors = nullptr;
} }
Sensors::Sensors() : Sensors::Sensors() :