Skip to content

Commit

Permalink
Changed defaults
Browse files Browse the repository at this point in the history
My tune for RCExplorer Baby
  • Loading branch information
lkaino committed Apr 9, 2017
1 parent fb49852 commit bf500bf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/main/fc/cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ const clivalue_t valueTable[] = {
{ "tri_servo_feedback", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &triMixerConfig()->tri_servo_feedback, .config.lookup = { TABLE_SERVO_FEEDBACK }},
{ "tri_motor_acc_yaw_correction",VAR_UINT16| MASTER_VALUE, &triMixerConfig()->tri_motor_acc_yaw_correction, .config.minmax = { 0, TRI_MOTOR_ACC_CORRECTION_MAX }},
{ "tri_motor_acceleration", VAR_FLOAT | MASTER_VALUE, &triMixerConfig()->tri_motor_acceleration, .config.minmax = { 0.01f, 1.0f }},
{ "tri_dynamic_yaw_boost", VAR_UINT16 | MASTER_VALUE, &triMixerConfig()->tri_yaw_boost, .config.minmax = { 0, 700}},
{ "tri_yaw_boost", VAR_UINT16 | MASTER_VALUE, &triMixerConfig()->tri_yaw_boost, .config.minmax = { 0, 700}},
{ "tri_dynamic_yaw_maxthrottle",VAR_UINT16 | MASTER_VALUE, &triMixerConfig()->tri_dynamic_yaw_maxthrottle, .config.minmax = { 0, 100}},
#endif

Expand Down
34 changes: 17 additions & 17 deletions src/main/fc/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ static void resetControlRateConfig(controlRateConfig_t *controlRateConfig)

static void resetPidProfile(pidProfile_t *pidProfile)
{
pidProfile->P8[ROLL] = 44;
pidProfile->P8[ROLL] = 24;
pidProfile->I8[ROLL] = 40;
pidProfile->D8[ROLL] = 20;
pidProfile->P8[PITCH] = 58;
pidProfile->D8[ROLL] = 27;
pidProfile->P8[PITCH] = 39;
pidProfile->I8[PITCH] = 50;
pidProfile->D8[PITCH] = 22;
pidProfile->P8[YAW] = 70;
pidProfile->I8[YAW] = 45;
pidProfile->D8[YAW] = 20;
pidProfile->D8[PITCH] = 20;
pidProfile->P8[YAW] = 107;
pidProfile->I8[YAW] = 40;
pidProfile->D8[YAW] = 105;
pidProfile->P8[PIDALT] = 50;
pidProfile->I8[PIDALT] = 0;
pidProfile->D8[PIDALT] = 0;
Expand Down Expand Up @@ -186,7 +186,7 @@ static void resetPidProfile(pidProfile_t *pidProfile)
pidProfile->levelAngleLimit = 55;
pidProfile->levelSensitivity = 55;
pidProfile->setpointRelaxRatio = 20;
pidProfile->dtermSetpointWeight = 100;
pidProfile->dtermSetpointWeight = 150;
pidProfile->yawRateAccelLimit = 10.0f;
pidProfile->rateAccelLimit = 0.0f;
pidProfile->itermThrottleThreshold = 350;
Expand Down Expand Up @@ -251,7 +251,7 @@ void resetLedStripConfig(ledStripConfig_t *ledStripConfig)
void resetServoConfig(servoConfig_t *servoConfig)
{
servoConfig->servoCenterPulse = 1500;
servoConfig->servoPwmRate = 50;
servoConfig->servoPwmRate = 300;

int servoIndex = 0;
for (int i = 0; i < USABLE_TIMER_CHANNEL_COUNT && servoIndex < MAX_SUPPORTED_SERVOS; i++) {
Expand All @@ -264,15 +264,15 @@ void resetServoConfig(servoConfig_t *servoConfig)

void resetTriMixerConfig(triMixerConfig_t *triMixerConfig)
{
triMixerConfig->tri_motor_acc_yaw_correction = 27;
triMixerConfig->tri_motor_acc_yaw_correction = 26;
triMixerConfig->tri_motor_acceleration = 0.18f;
triMixerConfig->tri_servo_feedback = DEFAULT_SERVO_FEEDBACK_SOURCE;
triMixerConfig->tri_servo_max_adc = 0;
triMixerConfig->tri_servo_mid_adc = 0;
triMixerConfig->tri_servo_min_adc = 0;
triMixerConfig->tri_tail_motor_thrustfactor = 138;
triMixerConfig->tri_tail_motor_thrustfactor = 54; // Default for RCExplorer Baby tricopter
triMixerConfig->tri_tail_servo_speed = 300; // Default for BMS-210DMH at 5V
triMixerConfig->tri_yaw_boost = 300;
triMixerConfig->tri_yaw_boost = 240;
triMixerConfig->tri_dynamic_yaw_maxthrottle = 38;
}
#endif
Expand Down Expand Up @@ -653,8 +653,8 @@ void resetSerialConfig(serialConfig_t *serialConfig)

void resetRcControlsConfig(rcControlsConfig_t *rcControlsConfig)
{
rcControlsConfig->deadband = 0;
rcControlsConfig->yaw_deadband = 0;
rcControlsConfig->deadband = 9;
rcControlsConfig->yaw_deadband = 9;
rcControlsConfig->alt_hold_deadband = 40;
rcControlsConfig->alt_hold_fast_change = 1;
}
Expand All @@ -664,7 +664,7 @@ void resetMixerConfig(mixerConfig_t *mixerConfig)
#ifdef TARGET_DEFAULT_MIXER
mixerConfig->mixerMode = TARGET_DEFAULT_MIXER;
#else
mixerConfig->mixerMode = MIXER_QUADX;
mixerConfig->mixerMode = MIXER_TRI;
#endif
mixerConfig->yaw_motor_direction = 1;
}
Expand Down Expand Up @@ -814,13 +814,13 @@ void createDefaultConfig(master_t *config)
config->pidConfig.pid_process_denom = 1;
#elif defined(USE_GYRO_SPI_MPU6000) || defined(USE_GYRO_SPI_MPU6500) || defined(USE_GYRO_SPI_ICM20689)
config->gyroConfig.gyro_sync_denom = 1;
config->pidConfig.pid_process_denom = 4;
config->pidConfig.pid_process_denom = 2;
#else
config->gyroConfig.gyro_sync_denom = 4;
config->pidConfig.pid_process_denom = 2;
#endif
config->gyroConfig.gyro_soft_lpf_type = FILTER_PT1;
config->gyroConfig.gyro_soft_lpf_hz = 90;
config->gyroConfig.gyro_soft_lpf_hz = 100;
config->gyroConfig.gyro_soft_notch_hz_1 = 400;
config->gyroConfig.gyro_soft_notch_cutoff_1 = 300;
config->gyroConfig.gyro_soft_notch_hz_2 = 200;
Expand Down

0 comments on commit bf500bf

Please sign in to comment.