Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00
Code Issues Wiki Activity

Merge pull request #9875 from mikeller/move_box_init_to_activate_config

Browse source 
Moved calculation of available boxes into 'activateConfig()' to avoid a reboot.
This commit is contained in:
Michael Keller 2020-06-03 07:06:33 +12:00 • committed by GitHub
commit 9eb97ea78d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/config/config.c
View file

@ -60,6 +60,8 @@
#include "io/serial.h"
#include "io/vtx.h"
#include "msp/msp_box.h"
#include "osd/osd.h"
#include "pg/adc.h"
@ -181,6 +183,8 @@ static void activateConfig(void)
#if defined(USE_LED_STRIP_STATUS_MODE)
reevaluateLedConfig();
#endif
initActiveBoxIds();
}
static void adjustFilterLimit(uint16_t *parm, uint16_t resetValue)

1
src/main/msp/msp.c
View file

@ -3596,5 +3596,4 @@ void mspFcProcessReply(mspPacket_t *reply)
void mspInit(void)
{
initActiveBoxIds();
}

4
src/main/msp/msp_box.c
View file

@ -125,8 +125,10 @@ const box_t *findBoxByPermanentId(uint8_t permanentId)
static bool activeBoxIdGet(boxId_e boxId)
{
if (boxId > sizeof(activeBoxIds) * 8)
if (boxId > sizeof(activeBoxIds) * 8) {
return false;
}
return bitArrayGet(&activeBoxIds, boxId);
}