From 2c9776861d374d77ed1ff90d142be6c6eab4d34d Mon Sep 17 00:00:00 2001 From: Michael Jakob Date: Fri, 12 Aug 2016 05:17:54 +0200 Subject: [PATCH 1/2] AlienFlight config fix --- src/main/target/ALIENFLIGHTF1/config.c | 12 ++++++------ src/main/target/ALIENFLIGHTF3/config.c | 12 ++++++------ src/main/target/ALIENFLIGHTF4/config.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/target/ALIENFLIGHTF1/config.c b/src/main/target/ALIENFLIGHTF1/config.c index b16a16444..b34f9d5a3 100644 --- a/src/main/target/ALIENFLIGHTF1/config.c +++ b/src/main/target/ALIENFLIGHTF1/config.c @@ -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 diff --git a/src/main/target/ALIENFLIGHTF3/config.c b/src/main/target/ALIENFLIGHTF3/config.c index 3aed5a3ce..650da37c1 100644 --- a/src/main/target/ALIENFLIGHTF3/config.c +++ b/src/main/target/ALIENFLIGHTF3/config.c @@ -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 diff --git a/src/main/target/ALIENFLIGHTF4/config.c b/src/main/target/ALIENFLIGHTF4/config.c index 5264a1673..b15623039 100644 --- a/src/main/target/ALIENFLIGHTF4/config.c +++ b/src/main/target/ALIENFLIGHTF4/config.c @@ -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 From d10e6a8f87a5536168fd440b244759f2b9b628b1 Mon Sep 17 00:00:00 2001 From: Michael Jakob Date: Fri, 12 Aug 2016 05:35:00 +0200 Subject: [PATCH 2/2] Fix maxthrottle value for brushed targets --- src/main/config/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/config.c b/src/main/config/config.c index fd7419620..07605b3f3 100755 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -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; }