Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Blackbox fields selection on GUI #7896

Merged
merged 4 commits into from
Mar 14, 2022
Merged

Blackbox fields selection on GUI #7896

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1509a7
blackbox fields gui
kernel-machine Mar 13, 2022
40299f8
Merge branch 'master' into blackbox_fields_gui
kernel-machine Mar 13, 2022
fa8550f
equal instead >=
kernel-machine Mar 13, 2022
85e5aff
Merge remote-tracking branch 'origin/blackbox_fields_gui' into blackb…
kernel-machine Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/fc/fc_msp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,7 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
sbufWriteU8(dst, blackboxConfig()->device);
sbufWriteU16(dst, blackboxConfig()->rate_num);
sbufWriteU16(dst, blackboxConfig()->rate_denom);
sbufWriteU32(dst,blackboxConfig()->includeFlags);
#else
sbufWriteU8(dst, 0); // Blackbox not supported
sbufWriteU8(dst, 0);
Expand Down Expand Up @@ -2327,10 +2328,11 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
#ifdef USE_BLACKBOX
case MSP2_SET_BLACKBOX_CONFIG:
// Don't allow config to be updated while Blackbox is logging
if ((dataSize == 5) && blackboxMayEditConfig()) {
if ((dataSize >= 9) && blackboxMayEditConfig()) {
blackboxConfigMutable()->device = sbufReadU8(src);
blackboxConfigMutable()->rate_num = sbufReadU16(src);
blackboxConfigMutable()->rate_denom = sbufReadU16(src);
blackboxConfigMutable()->includeFlags = sbufReadU32(src);
} else
return MSP_RESULT_ERROR;
break;
Expand Down