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

Separation of boxId and permanentId.

Browse source
This commit is contained in:
jflyper 2018-02-16 10:22:50 +09:00
parent 1bcfa5ddb0
commit 18d5a373c0
7 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/interface/msp_box.c
View file

@ -270,15 +270,20 @@ void initActiveBoxIds(void)
// Turn BOXUSERx only if pinioBox facility monitors them, as the facility is the only BOXUSERx observer.
// Note that pinioBoxConfig can be set to monitor any box.
for (int i = 0; i < PINIO_COUNT; i++) {
switch(pinioBoxConfig()->boxId[i]) {
case BOXUSER1:
case BOXUSER2:
case BOXUSER3:
case BOXUSER4:
BME(pinioBoxConfig()->boxId[i]);
break;
default:
break;
if (pinioBoxConfig()->permanentId[i] != PERMANENT_ID_NONE) {
const box_t *box = findBoxByPermanentId(pinioBoxConfig()->permanentId[i]);
if (box) {
switch(box->boxId) {
case BOXUSER1:
case BOXUSER2:
case BOXUSER3:
case BOXUSER4:
BME(box->boxId);
break;
default:
break;
}
}
}
}
#endif

2
src/main/interface/msp_box.h
View file

@ -25,6 +25,8 @@ typedef struct box_s {
const uint8_t permanentId; // permanent ID used to identify BOX. This ID is unique for one function, DO NOT REUSE IT
} box_t;
#define PERMANENT_ID_NONE 255
const box_t *findBoxByBoxId(boxId_e boxId);
const box_t *findBoxByPermanentId(uint8_t permanentId);

2
src/main/interface/settings.c
View file

@ -874,7 +874,7 @@ const clivalue_t valueTable[] = {
#ifdef USE_PINIO
{ "pinio_config", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = PINIO_COUNT, PG_PINIO_CONFIG, offsetof(pinioConfig_t, config) },
#ifdef USE_PINIOBOX
{ "pinio_box", VAR_INT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = PINIO_COUNT, PG_PINIOBOX_CONFIG, offsetof(pinioBoxConfig_t, boxId) },
{ "pinio_box", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = PINIO_COUNT, PG_PINIOBOX_CONFIG, offsetof(pinioBoxConfig_t, permanentId) },
#endif
#endif
};