Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00
Code Issues Wiki Activity

Merge branch 'master' into avs-automatic-servo-trim

Browse source 
# Conflicts:
#	src/main/build/debug.h
#	src/main/fc/settings.yaml
This commit is contained in:
Alexander van Saase 2021-05-04 10:05:23 +02:00
commit 1a6f96ce32
30 changed files with 325 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/fc/fc_msp_box.c
View file

@ -89,7 +89,7 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXLOITERDIRCHN, "LOITER CHANGE", 49 },
{ BOXMSPRCOVERRIDE, "MSP RC OVERRIDE", 50 },
{ BOXPREARM, "PREARM", 51 },
{ BOXFLIPOVERAFTERCRASH, "TURTLE", 52 },
{ BOXTURTLE, "TURTLE", 52 },
{ CHECKBOX_ITEM_COUNT, NULL, 0xFF }
};
@ -316,7 +316,7 @@ void initActiveBoxIds(void)
#ifdef USE_DSHOT
if(STATE(MULTIROTOR) && isMotorProtocolDshot())
activeBoxIds[activeBoxIdCount++] = BOXFLIPOVERAFTERCRASH;
activeBoxIds[activeBoxIdCount++] = BOXTURTLE;
#endif
}