mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-23 16:25:31 +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:
commit
b3ee895f97
6 changed files with 3510 additions and 3499 deletions
|
@ -456,7 +456,7 @@ int getEstimatedAltitude(void)
|
|||
|
||||
// set vario
|
||||
vario = applyDeadband(vel_tmp, 5);
|
||||
|
||||
|
||||
BaroPID = calculateBaroPid(vel_tmp, accZ_tmp, accZ_old);
|
||||
|
||||
accZ_old = accZ_tmp;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue