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

Merge pull request #7543 from dthubereng/add_mode_logic_to_msp

Browse source 
Add MODE_RANGES_EXTRA to MSP
This commit is contained in:
Michael Keller 2019-02-09 13:34:00 +13:00 • committed by GitHub
commit 4f7fa25b06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1031,6 +1031,18 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
}
break;
case MSP_MODE_RANGES_EXTRA:
sbufWriteU8(dst, MAX_MODE_ACTIVATION_CONDITION_COUNT); // prepend number of EXTRAs array elements
for (int i = 0; i < MAX_MODE_ACTIVATION_CONDITION_COUNT; i++) {
const modeActivationCondition_t *mac = modeActivationConditions(i);
const box_t *box = findBoxByBoxId(mac->modeId);
sbufWriteU8(dst, box->permanentId); // each element is aligned with MODE_RANGES by the permanentId
sbufWriteU8(dst, mac->modeLogic);
sbufWriteU8(dst, mac->linkedTo);
}
break;
case MSP_ADJUSTMENT_RANGES:
for (int i = 0; i < MAX_ADJUSTMENT_RANGE_COUNT; i++) {
const adjustmentRange_t *adjRange = adjustmentRanges(i);
@ -1723,7 +1735,12 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
mac->auxChannelIndex = sbufReadU8(src);
mac->range.startStep = sbufReadU8(src);
mac->range.endStep = sbufReadU8(src);
if (sbufBytesRemaining(src) != 0) {
mac->modeLogic = sbufReadU8(src);
i = sbufReadU8(src);
mac->linkedTo = findBoxByPermanentId(i)->boxId;
}
rcControlsInit();
} else {
return MSP_RESULT_ERROR;