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

Merge remote-tracking branch 'betaflight/betaflight' into development

Browse source 
# Conflicts:
#	src/main/config/config.c
#	src/main/io/serial_cli.c
This commit is contained in:
blckmn 2016-06-23 20:12:05 +10:00
commit cd9a97006f
10 changed files with 79 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,7 +169,7 @@ static uint32_t activeFeaturesLatch = 0;
static uint8_t currentControlRateProfileIndex = 0;
controlRateConfig_t *currentControlRateProfile;
static const uint8_t EEPROM_CONF_VERSION = 140;
static const uint8_t EEPROM_CONF_VERSION = 141;
static void resetAccelerometerTrims(flightDynamicsTrims_t *accelerometerTrims)
{
@ -182,9 +182,9 @@ static void resetPidProfile(pidProfile_t *pidProfile)
{
#if (defined(STM32F10X))
pidProfile->pidController = PID_CONTROLLER_MWREWRITE;
pidProfile->pidController = PID_CONTROLLER_INTEGER;
#else
pidProfile->pidController = PID_CONTROLLER_LUX_FLOAT;
pidProfile->pidController = PID_CONTROLLER_FLOAT;
#endif
pidProfile->P8[ROLL] = 45;
@ -221,6 +221,7 @@ static void resetPidProfile(pidProfile_t *pidProfile)
pidProfile->rollPitchItermIgnoreRate = 200;
pidProfile->yawItermIgnoreRate = 35;
pidProfile->dterm_lpf_hz = 50; // filtering ON by default
pidProfile->deltaMethod = DELTA_FROM_ERROR;
pidProfile->dynamic_pid = 1;
#ifdef GTUNE
@ -494,7 +495,7 @@ static void resetConf(void)
masterConfig.rxConfig.rssi_channel = 0;
masterConfig.rxConfig.rssi_scale = RSSI_SCALE_DEFAULT;
masterConfig.rxConfig.rssi_ppm_invert = 0;
masterConfig.rxConfig.rcSmoothing = 0; // TODO - Cleanup with next EEPROM changes
masterConfig.rxConfig.rcSmoothInterval = 0; // 0 is predefined
masterConfig.rxConfig.fpvCamAngleDegrees = 0;
#ifdef STM32F4
masterConfig.rxConfig.max_aux_channel = 99;