1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00

Merge branch 'multiwii-master'

Conflicts:
	src/board.h
	src/buzzer.c
	src/config.c
	src/drivers/serial_common.h
	src/drivers/system_common.c
	src/drv_gpio.h
	src/drv_pwm.c
	src/drv_timer.c
	src/drv_uart.c
	src/flight_imu.c
	src/mw.c
	src/rx_sbus.c
	src/sensors.c
	src/serial_cli.c
This commit is contained in:
Dominic Clifton 2014-05-11 18:17:40 +01:00
commit b3ee895f97
6 changed files with 3510 additions and 3499 deletions

View file

@ -92,7 +92,7 @@ static void resetPidProfile(pidProfile_t *pidProfile)
}
void resetGpsProfile(gpsProfile_t *gpsProfile)
{
{
gpsProfile->gps_wp_radius = 200;
gpsProfile->gps_lpf = 20;
gpsProfile->nav_slew_rate = 30;
@ -103,7 +103,7 @@ void resetGpsProfile(gpsProfile_t *gpsProfile)
}
void resetBarometerConfig(barometerConfig_t *barometerConfig)
{
{
barometerConfig->baro_sample_count = 21;
barometerConfig->baro_noise_lpf = 0.6f;
barometerConfig->baro_cf_vel = 0.985f;