From 00ca237886135aa6f5ba4ef45a3d88f98f1ad9bb Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Wed, 29 Oct 2014 23:56:28 +0000 Subject: [PATCH] Rename default_rateProfile_index to defaultRateProfileIndex. --- src/main/config/config.c | 8 ++++---- src/main/config/config_profile.h | 2 +- src/main/io/serial_cli.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/config/config.c b/src/main/config/config.c index fd106bb73..271d72239 100755 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -424,7 +424,7 @@ static void resetConf(void) } for (i = 1; i < MAX_PROFILE_COUNT; i++) { - masterConfig.profile[i].default_rateProfile_index = i % MAX_CONTROL_RATE_PROFILE_COUNT; + masterConfig.profile[i].defaultRateProfileIndex = i % MAX_CONTROL_RATE_PROFILE_COUNT; } } @@ -610,10 +610,10 @@ void readEEPROM(void) setProfile(masterConfig.current_profile_index); - if (currentProfile->default_rateProfile_index > MAX_CONTROL_RATE_PROFILE_COUNT - 1) // sanity check - currentProfile->default_rateProfile_index = 0; + if (currentProfile->defaultRateProfileIndex > MAX_CONTROL_RATE_PROFILE_COUNT - 1) // sanity check + currentProfile->defaultRateProfileIndex = 0; - setControlRateProfile(currentProfile->default_rateProfile_index); + setControlRateProfile(currentProfile->defaultRateProfileIndex); validateAndFixConfig(); activateConfig(); diff --git a/src/main/config/config_profile.h b/src/main/config/config_profile.h index 25b41d7b9..8062d5490 100644 --- a/src/main/config/config_profile.h +++ b/src/main/config/config_profile.h @@ -22,7 +22,7 @@ typedef struct profile_s { pidProfile_t pidProfile; - uint8_t default_rateProfile_index; + uint8_t defaultRateProfileIndex; int16_t mag_declination; // Get your magnetic decliniation from here : http://magnetic-declination.com/ // For example, -6deg 37min, = -637 Japan, format is [sign]dddmm (degreesminutes) default is zero. diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index fc3a79e8b..b556f96e4 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -314,7 +314,7 @@ const clivalue_t valueTable[] = { { "yaw_direction", VAR_INT8 | PROFILE_VALUE, &masterConfig.profile[0].mixerConfig.yaw_direction, -1, 1 }, { "tri_unarmed_servo", VAR_INT8 | PROFILE_VALUE, &masterConfig.profile[0].mixerConfig.tri_unarmed_servo, 0, 1 }, - { "default_rate_profile", VAR_UINT8 | PROFILE_VALUE , &masterConfig.profile[0].default_rateProfile_index, 0, MAX_CONTROL_RATE_PROFILE_COUNT - 1 }, + { "default_rate_profile", VAR_UINT8 | PROFILE_VALUE , &masterConfig.profile[0].defaultRateProfileIndex, 0, MAX_CONTROL_RATE_PROFILE_COUNT - 1 }, { "rc_rate", VAR_UINT8 | CONTROL_RATE_VALUE, &masterConfig.controlRateProfiles[0].rcRate8, 0, 250 }, { "rc_expo", VAR_UINT8 | CONTROL_RATE_VALUE, &masterConfig.controlRateProfiles[0].rcExpo8, 0, 100 }, { "thr_mid", VAR_UINT8 | CONTROL_RATE_VALUE, &masterConfig.controlRateProfiles[0].thrMid8, 0, 100 },