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 remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nicholas Sherlock 2014-12-18 18:17:59 +13:00
commit c85a172370
76 changed files with 22260 additions and 6512 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@ profile_t *currentProfile;
static uint8_t currentControlRateProfileIndex = 0;
controlRateConfig_t *currentControlRateProfile;
static const uint8_t EEPROM_CONF_VERSION = 85;
static const uint8_t EEPROM_CONF_VERSION = 86;
static void resetAccelerometerTrims(flightDynamicsTrims_t *accelerometerTrims)
{
@ -127,15 +127,15 @@ static void resetPidProfile(pidProfile_t *pidProfile)
pidProfile->P8[PIDALT] = 50;
pidProfile->I8[PIDALT] = 0;
pidProfile->D8[PIDALT] = 0;
pidProfile->P8[PIDPOS] = 11; // POSHOLD_P * 100;
pidProfile->P8[PIDPOS] = 15; // POSHOLD_P * 100;
pidProfile->I8[PIDPOS] = 0; // POSHOLD_I * 100;
pidProfile->D8[PIDPOS] = 0;
pidProfile->P8[PIDPOSR] = 20; // POSHOLD_RATE_P * 10;
pidProfile->I8[PIDPOSR] = 8; // POSHOLD_RATE_I * 100;
pidProfile->D8[PIDPOSR] = 45; // POSHOLD_RATE_D * 1000;
pidProfile->P8[PIDNAVR] = 14; // NAV_P * 10;
pidProfile->I8[PIDNAVR] = 20; // NAV_I * 100;
pidProfile->D8[PIDNAVR] = 80; // NAV_D * 1000;
pidProfile->P8[PIDPOSR] = 34; // POSHOLD_RATE_P * 10;
pidProfile->I8[PIDPOSR] = 14; // POSHOLD_RATE_I * 100;
pidProfile->D8[PIDPOSR] = 53; // POSHOLD_RATE_D * 1000;
pidProfile->P8[PIDNAVR] = 25; // NAV_P * 10;
pidProfile->I8[PIDNAVR] = 33; // NAV_I * 100;
pidProfile->D8[PIDNAVR] = 83; // NAV_D * 1000;
pidProfile->P8[PIDLEVEL] = 90;
pidProfile->I8[PIDLEVEL] = 10;
pidProfile->D8[PIDLEVEL] = 100;
@ -306,7 +306,7 @@ static void resetConf(void)
masterConfig.version = EEPROM_CONF_VERSION;
masterConfig.mixerConfiguration = MULTITYPE_QUADX;
featureClearAll();
#ifdef CJMCU
#if defined(CJMCU) || defined(SPARKY)
featureSet(FEATURE_RX_PPM);
#endif
featureSet(FEATURE_VBAT);
@ -334,6 +334,7 @@ static void resetConf(void)
resetTelemetryConfig(&masterConfig.telemetryConfig);
masterConfig.rxConfig.serialrx_provider = 0;
masterConfig.rxConfig.spektrum_sat_bind = 0;
masterConfig.rxConfig.midrc = 1500;
masterConfig.rxConfig.mincheck = 1100;
masterConfig.rxConfig.maxcheck = 1900;
@ -364,7 +365,8 @@ static void resetConf(void)
// gps/nav stuff
masterConfig.gpsConfig.provider = GPS_NMEA;
masterConfig.gpsConfig.sbasMode = SBAS_AUTO;
masterConfig.gpsConfig.gpsAutoConfig = GPS_AUTOCONFIG_ON;
masterConfig.gpsConfig.autoConfig = GPS_AUTOCONFIG_ON;
masterConfig.gpsConfig.autoBaud = GPS_AUTOBAUD_OFF;
#endif
resetSerialConfig(&masterConfig.serialConfig);