Skip to content

Fix MSP_RESULT_NO_REPLY ignored in MSP-over-telemetry passthrough #11481

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

Merged
sensei-hacker merged 1 commit into from
Apr 9, 2026
+9 −4
Merged

Fix MSP_RESULT_NO_REPLY ignored in MSP-over-telemetry passthrough #11481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/main/telemetry/msp_shared.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,28 @@ void initSharedMsp(void)
mspPackage.responsePacket->buf.end = mspPackage.responseBuffer + sizeof(mspTxBuffer);
}

static void processMspPacket(void)
static bool processMspPacket(void)
{
mspPackage.responsePacket->cmd = 0;
mspPackage.responsePacket->result = 0;
mspPackage.responsePacket->buf.ptr = mspPackage.responseBuffer;
mspPackage.responsePacket->buf.end = mspPackage.responseBuffer + sizeof(mspTxBuffer);

mspPostProcessFnPtr mspPostProcessFn = NULL;
if (mspFcProcessCommand(mspPackage.requestPacket, mspPackage.responsePacket, &mspPostProcessFn) == MSP_RESULT_ERROR) {
const mspResult_e status = mspFcProcessCommand(mspPackage.requestPacket, mspPackage.responsePacket, &mspPostProcessFn);
if (status == MSP_RESULT_ERROR) {
sbufWriteU8(&mspPackage.responsePacket->buf, TELEMETRY_MSP_ERROR);
}
if (mspPostProcessFn) {
mspPostProcessFn(NULL);
}

if (status == MSP_RESULT_NO_REPLY) {
return false;
}

sbufSwitchToReader(&mspPackage.responsePacket->buf, mspPackage.responseBuffer);
return true;
}

void sendMspErrorResponse(uint8_t error, int16_t cmd)
Expand Down Expand Up @@ -194,8 +200,7 @@ bool handleMspFrame(uint8_t *const frameStart, const int payloadLength)
sbufAdvance(&mspPackage.requestFrame, payloadExpecting);
sbufWriteData(&requestPacket->buf, payload, payloadExpecting);
sbufSwitchToReader(&requestPacket->buf, mspPackage.requestBuffer);
processMspPacket();
return true;
return processMspPacket();
}

bool sendMspReply(uint8_t payloadSize, mspResponseFnPtr responseFn)
Expand Down
Loading