Merge pull request #982 from AlienWiiBF/AF_config

AlienFlight config fix (pointer problem caused the Alienflight FC's to get an hardware exeption)
This commit is contained in:
Martin Budden 2016-08-12 09:38:36 +01:00 committed by GitHub
commit 9ee9987ba4
4 changed files with 19 additions and 19 deletions

View File

@ -311,9 +311,9 @@ void resetEscAndServoConfig(escAndServoConfig_t *escAndServoConfig)
#ifdef BRUSHED_MOTORS
escAndServoConfig->minthrottle = 1000;
#else
escAndServoConfig->maxthrottle = 2000;
escAndServoConfig->minthrottle = 1070;
#endif
escAndServoConfig->maxthrottle = 2000;
escAndServoConfig->mincommand = 1000;
escAndServoConfig->servoCenterPulse = 1500;
}

View File

@ -77,12 +77,12 @@ void targetConfiguration(void)
masterConfig.motor_pwm_rate = 32000;
masterConfig.failsafeConfig.failsafe_delay = 2;
masterConfig.failsafeConfig.failsafe_off_delay = 0;
currentProfile->pidProfile.P8[ROLL] = 90;
currentProfile->pidProfile.I8[ROLL] = 44;
currentProfile->pidProfile.D8[ROLL] = 60;
currentProfile->pidProfile.P8[PITCH] = 90;
currentProfile->pidProfile.I8[PITCH] = 44;
currentProfile->pidProfile.D8[PITCH] = 60;
masterConfig.profile[0].pidProfile.P8[ROLL] = 90;
masterConfig.profile[0].pidProfile.I8[ROLL] = 44;
masterConfig.profile[0].pidProfile.D8[ROLL] = 60;
masterConfig.profile[0].pidProfile.P8[PITCH] = 90;
masterConfig.profile[0].pidProfile.I8[PITCH] = 44;
masterConfig.profile[0].pidProfile.D8[PITCH] = 60;
masterConfig.customMotorMixer[0] = (motorMixer_t){ 1.0f, -0.414178f, 1.0f, -1.0f }; // REAR_R
masterConfig.customMotorMixer[1] = (motorMixer_t){ 1.0f, -0.414178f, -1.0f, 1.0f }; // FRONT_R

View File

@ -85,12 +85,12 @@ void targetConfiguration(void) {
masterConfig.failsafeConfig.failsafe_off_delay = 0;
masterConfig.gyro_sync_denom = 2;
masterConfig.pid_process_denom = 1;
currentProfile->pidProfile.P8[ROLL] = 90;
currentProfile->pidProfile.I8[ROLL] = 44;
currentProfile->pidProfile.D8[ROLL] = 60;
currentProfile->pidProfile.P8[PITCH] = 90;
currentProfile->pidProfile.I8[PITCH] = 44;
currentProfile->pidProfile.D8[PITCH] = 60;
masterConfig.profile[0].pidProfile.P8[ROLL] = 90;
masterConfig.profile[0].pidProfile.I8[ROLL] = 44;
masterConfig.profile[0].pidProfile.D8[ROLL] = 60;
masterConfig.profile[0].pidProfile.P8[PITCH] = 90;
masterConfig.profile[0].pidProfile.I8[PITCH] = 44;
masterConfig.profile[0].pidProfile.D8[PITCH] = 60;
masterConfig.customMotorMixer[0] = (motorMixer_t){ 1.0f, -0.414178f, 1.0f, -1.0f }; // REAR_R
masterConfig.customMotorMixer[1] = (motorMixer_t){ 1.0f, -0.414178f, -1.0f, 1.0f }; // FRONT_R

View File

@ -85,12 +85,12 @@ void targetConfiguration(void) {
masterConfig.failsafeConfig.failsafe_off_delay = 0;
masterConfig.gyro_sync_denom = 1;
masterConfig.pid_process_denom = 1;
currentProfile->pidProfile.P8[ROLL] = 90;
currentProfile->pidProfile.I8[ROLL] = 44;
currentProfile->pidProfile.D8[ROLL] = 60;
currentProfile->pidProfile.P8[PITCH] = 90;
currentProfile->pidProfile.I8[PITCH] = 44;
currentProfile->pidProfile.D8[PITCH] = 60;
masterConfig.profile[0].pidProfile.P8[ROLL] = 90;
masterConfig.profile[0].pidProfile.I8[ROLL] = 44;
masterConfig.profile[0].pidProfile.D8[ROLL] = 60;
masterConfig.profile[0].pidProfile.P8[PITCH] = 90;
masterConfig.profile[0].pidProfile.I8[PITCH] = 44;
masterConfig.profile[0].pidProfile.D8[PITCH] = 60;
masterConfig.customMotorMixer[0] = (motorMixer_t){ 1.0f, -0.414178f, 1.0f, -1.0f }; // REAR_R
masterConfig.customMotorMixer[1] = (motorMixer_t){ 1.0f, -0.414178f, -1.0f, 1.0f }; // FRONT_R