rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6998 from mikeller/remove_unused_modes 

Remove unused BARO, GPS_HOME, GPS_HOLD modes.
This commit is contained in:
Michael Keller 2018-10-29 22:09:54 +13:00 committed by GitHub
parent b0705caf6a 7b7ddd099f
commit 0e7a4d6e11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/fc/rc_modes.c
View File

@ -47,8 +47,7 @@ static boxBitmask_t stickyModesEverDisabled;
static bool airmodeEnabled;
PG_REGISTER_ARRAY(modeActivationCondition_t, MAX_MODE_ACTIVATION_CONDITION_COUNT, modeActivationConditions,
PG_MODE_ACTIVATION_PROFILE, 1);
PG_REGISTER_ARRAY(modeActivationCondition_t, MAX_MODE_ACTIVATION_CONDITION_COUNT, modeActivationConditions, PG_MODE_ACTIVATION_PROFILE, 2);
bool IS_RC_MODE_ACTIVE(boxId_e boxId)
{

3
src/main/fc/rc_modes.h
View File

@ -33,9 +33,6 @@ typedef enum {
BOXANGLE,
BOXHORIZON,
BOXMAG,
BOXBARO,
BOXGPSHOME,
BOXGPSHOLD,
BOXHEADFREE,
BOXPASSTHRU,
BOXFAILSAFE,

9
src/main/fc/runtime_config.h
View File

@ -73,9 +73,9 @@ typedef enum {
ANGLE_MODE = (1 << 0),
HORIZON_MODE = (1 << 1),
MAG_MODE = (1 << 2),
BARO_MODE = (1 << 3),
GPS_HOME_MODE = (1 << 4),
GPS_HOLD_MODE = (1 << 5),
// BARO_MODE = (1 << 3),
// GPS_HOME_MODE = (1 << 4),
// GPS_HOLD_MODE = (1 << 5),
HEADFREE_MODE = (1 << 6),
// UNUSED_MODE = (1 << 7), // old autotune
PASSTHRU_MODE = (1 << 8),
@ -96,9 +96,6 @@ extern uint16_t flightModeFlags;
[BOXANGLE] = LOG2(ANGLE_MODE), \
[BOXHORIZON] = LOG2(HORIZON_MODE), \
[BOXMAG] = LOG2(MAG_MODE), \
[BOXBARO] = LOG2(BARO_MODE), \
[BOXGPSHOME] = LOG2(GPS_HOME_MODE), \
[BOXGPSHOLD] = LOG2( GPS_HOLD_MODE), \
[BOXHEADFREE] = LOG2(HEADFREE_MODE), \
[BOXPASSTHRU] = LOG2(PASSTHRU_MODE), \
[BOXFAILSAFE] = LOG2(FAILSAFE_MODE), \

6
src/main/interface/msp_box.c
View File

@ -49,15 +49,15 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT] = {
{ BOXARM, "ARM", 0 },
{ BOXANGLE, "ANGLE", 1 },
{ BOXHORIZON, "HORIZON", 2 },
{ BOXBARO, "BARO", 3 },
// { BOXBARO, "BARO", 3 },
{ BOXANTIGRAVITY, "ANTI GRAVITY", 4 },
{ BOXMAG, "MAG", 5 },
{ BOXHEADFREE, "HEADFREE", 6 },
{ BOXHEADADJ, "HEADADJ", 7 },
{ BOXCAMSTAB, "CAMSTAB", 8 },
// { BOXCAMTRIG, "CAMTRIG", 9 },
{ BOXGPSHOME, "GPS HOME", 10 },
{ BOXGPSHOLD, "GPS HOLD", 11 },
// { BOXGPSHOME, "GPS HOME", 10 },
// { BOXGPSHOLD, "GPS HOLD", 11 },
{ BOXPASSTHRU, "PASSTHRU", 12 },
{ BOXBEEPERON, "BEEPER", 13 },
// { BOXLEDMAX, "LEDMAX", 14 }, (removed)

4
src/main/io/ledstrip.c
View File

@ -149,7 +149,6 @@ static const modeColorIndexes_t defaultModeColors[] = {
[LED_MODE_HORIZON] = {{ COLOR_BLUE, COLOR_DARK_VIOLET, COLOR_YELLOW, COLOR_DEEP_PINK, COLOR_BLUE, COLOR_ORANGE }},
[LED_MODE_ANGLE] = {{ COLOR_CYAN, COLOR_DARK_VIOLET, COLOR_YELLOW, COLOR_DEEP_PINK, COLOR_BLUE, COLOR_ORANGE }},
[LED_MODE_MAG] = {{ COLOR_MINT_GREEN, COLOR_DARK_VIOLET, COLOR_ORANGE, COLOR_DEEP_PINK, COLOR_BLUE, COLOR_ORANGE }},
[LED_MODE_BARO] = {{ COLOR_LIGHT_BLUE, COLOR_DARK_VIOLET, COLOR_RED, COLOR_DEEP_PINK, COLOR_BLUE, COLOR_ORANGE }},
};
static const specialColorIndexes_t defaultSpecialColors[] = {
@ -436,9 +435,6 @@ static const struct {
{HEADFREE_MODE, LED_MODE_HEADFREE},
#ifdef USE_MAG
{MAG_MODE, LED_MODE_MAG},
#endif
#ifdef USE_BARO
{BARO_MODE, LED_MODE_BARO},
#endif
{HORIZON_MODE, LED_MODE_HORIZON},
{ANGLE_MODE, LED_MODE_ANGLE},

7
src/main/target/COLIBRI_RACE/i2c_bst.c
View File

@ -153,14 +153,11 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXARM, "ARM;", 0 },
{ BOXANGLE, "ANGLE;", 1 },
{ BOXHORIZON, "HORIZON;", 2 },
{ BOXBARO, "BARO;", 3 },
//{ BOXVARIO, "VARIO;", 4 },
{ BOXMAG, "MAG;", 5 },
{ BOXHEADFREE, "HEADFREE;", 6 },
{ BOXHEADADJ, "HEADADJ;", 7 },
{ BOXCAMSTAB, "CAMSTAB;", 8 },
{ BOXGPSHOME, "GPS HOME;", 10 },
{ BOXGPSHOLD, "GPS HOLD;", 11 },
{ BOXPASSTHRU, "PASSTHRU;", 12 },
{ BOXBEEPERON, "BEEPER;", 13 },
{ BOXLEDLOW, "LEDLOW;", 15 },
@ -294,13 +291,10 @@ static bool bstSlaveProcessFeedbackCommand(uint8_t bstRequest)
junk = 0;
tmp = IS_ENABLED(FLIGHT_MODE(ANGLE_MODE)) << BOXANGLE |
IS_ENABLED(FLIGHT_MODE(HORIZON_MODE)) << BOXHORIZON |
IS_ENABLED(FLIGHT_MODE(BARO_MODE)) << BOXBARO |
IS_ENABLED(FLIGHT_MODE(MAG_MODE)) << BOXMAG |
IS_ENABLED(FLIGHT_MODE(HEADFREE_MODE)) << BOXHEADFREE |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXHEADADJ)) << BOXHEADADJ |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXCAMSTAB)) << BOXCAMSTAB |
IS_ENABLED(FLIGHT_MODE(GPS_HOME_MODE)) << BOXGPSHOME |
IS_ENABLED(FLIGHT_MODE(GPS_HOLD_MODE)) << BOXGPSHOLD |
IS_ENABLED(FLIGHT_MODE(PASSTHRU_MODE)) << BOXPASSTHRU |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBEEPERON)) << BOXBEEPERON |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLEDLOW)) << BOXLEDLOW |
@ -863,7 +857,6 @@ bool writeFCModeToBST(void)
tmp = IS_ENABLED(ARMING_FLAG(ARMED)) |
IS_ENABLED(FLIGHT_MODE(ANGLE_MODE)) << 1 |
IS_ENABLED(FLIGHT_MODE(HORIZON_MODE)) << 2 |
IS_ENABLED(FLIGHT_MODE(BARO_MODE)) << 3 |
IS_ENABLED(FLIGHT_MODE(MAG_MODE)) << 4 |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXAIRMODE)) << 5 |
IS_ENABLED(FLIGHT_MODE(FAILSAFE_MODE)) << 7;

12
src/main/telemetry/ibus_shared.c
View File

@ -240,27 +240,15 @@ static uint16_t getMode()
if (FLIGHT_MODE(ANGLE_MODE)) {
flightMode = 0; //Stab
}
if (FLIGHT_MODE(BARO_MODE)) {
flightMode = 2; //AltHold
}
if (FLIGHT_MODE(PASSTHRU_MODE)) {
flightMode = 3; //Auto
}
if (FLIGHT_MODE(HEADFREE_MODE) || FLIGHT_MODE(MAG_MODE)) {
flightMode = 4; //Guided! (there in no HEAD, MAG so use Guided)
}
if (FLIGHT_MODE(GPS_HOLD_MODE) && FLIGHT_MODE(BARO_MODE)) {
flightMode = 5; //Loiter
}
if (FLIGHT_MODE(GPS_HOME_MODE)) {
flightMode = 6; //RTL
}
if (FLIGHT_MODE(HORIZON_MODE)) {
flightMode = 7; //Circle! (there in no horizon so use Circle)
}
if (FLIGHT_MODE(GPS_HOLD_MODE)) {
flightMode = 8; //PosHold
}
if (FLIGHT_MODE(FAILSAFE_MODE)) {
flightMode = 9; //Land
}

6
src/main/telemetry/ltm.c
View File

@ -175,14 +175,8 @@ static void ltm_sframe(void)
uint8_t lt_statemode;
if (FLIGHT_MODE(PASSTHRU_MODE))
lt_flightmode = 0;
else if (FLIGHT_MODE(GPS_HOME_MODE))
lt_flightmode = 13;
else if (FLIGHT_MODE(GPS_HOLD_MODE))
lt_flightmode = 9;
else if (FLIGHT_MODE(HEADFREE_MODE))
lt_flightmode = 4;
else if (FLIGHT_MODE(BARO_MODE))
lt_flightmode = 8;
else if (FLIGHT_MODE(ANGLE_MODE))
lt_flightmode = 2;
else if (FLIGHT_MODE(HORIZON_MODE))

9
src/main/telemetry/mavlink.c
View File

@ -502,15 +502,6 @@ void mavlinkSendHUDAndHeartbeat(void)
mavCustomMode = 0; //Stabilize
mavModes |= MAV_MODE_FLAG_STABILIZE_ENABLED;
}
if (FLIGHT_MODE(BARO_MODE)) {
mavCustomMode = 2; //Alt Hold
}
if (FLIGHT_MODE(GPS_HOME_MODE)) {
mavCustomMode = 6; //Return to Launch
}
if (FLIGHT_MODE(GPS_HOLD_MODE)) {
mavCustomMode = 16; //Position Hold (Earlier called Hybrid)
}
uint8_t mavSystemState = 0;
if (ARMING_FLAG(ARMED)) {

9
src/main/telemetry/smartport.c
View File

@ -698,16 +698,7 @@ void processSmartPortTelemetry(smartPortPayload_t *payload, volatile bool *clear
if (FLIGHT_MODE(MAG_MODE)) {
tmpi += 100;
}
if (FLIGHT_MODE(BARO_MODE)) {
tmpi += 200;
}
if (FLIGHT_MODE(GPS_HOLD_MODE)) {
tmpi += 1000;
}
if (FLIGHT_MODE(GPS_HOME_MODE)) {
tmpi += 2000;
}
if (FLIGHT_MODE(HEADFREE_MODE)) {
tmpi += 4000;
}