Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Merge upstream

Browse source 
Conflict in src/main/sensors/battery.c from blackbox logging of
amperage. Merged changes in so that blackbox can log the current meter
ADC raw value.
This commit is contained in:
tracernz 2015-01-25 19:51:59 +13:00
commit 496d706097
78 changed files with 1596 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/config/config.c
View file

@ -25,6 +25,8 @@
#include "common/color.h"
#include "common/axis.h"
#include "common/maths.h"
#include "flight/flight.h"
#include "drivers/sensor.h"
@ -613,10 +615,12 @@ void activateConfig(void)
imuRuntimeConfig.acc_unarmedcal = currentProfile->acc_unarmedcal;;
imuRuntimeConfig.small_angle = masterConfig.small_angle;
configureImu(
configureIMU(
&imuRuntimeConfig,
&currentProfile->pidProfile,
&currentProfile->accDeadband
&currentProfile->accDeadband,
currentProfile->accz_lpf_cutoff,
currentProfile->throttle_correction_angle
);
configureAltitudeHold(
@ -626,9 +630,6 @@ void activateConfig(void)
&masterConfig.escAndServoConfig
);
calculateThrottleAngleScale(currentProfile->throttle_correction_angle);
calculateAccZLowPassFilterRCTimeConstant(currentProfile->accz_lpf_cutoff);
#ifdef BARO
useBarometerConfig(&currentProfile->barometerConfig);
#endif